From 5354989f45faa1faa4252b3644b26f17d2df50c2 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 21 Aug 2015 14:12:27 +0200 Subject: [PATCH 01/20] add a newline for clarity Signed-off-by: FrancisANDRE --- Foundation/testsuite/src/CoreTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Foundation/testsuite/src/CoreTest.cpp b/Foundation/testsuite/src/CoreTest.cpp index bf8b03dce..fe1a73dca 100644 --- a/Foundation/testsuite/src/CoreTest.cpp +++ b/Foundation/testsuite/src/CoreTest.cpp @@ -194,7 +194,7 @@ void CoreTest::testEnvironment() catch (Exception&) { } - + std::cout << std::endl; std::cout << "OS Name: " << Environment::osName() << std::endl; std::cout << "OS Display Name: " << Environment::osDisplayName() << std::endl; std::cout << "OS Version: " << Environment::osVersion() << std::endl; From 462deab58bbd0db02b847f7d1af632b65b8d9091 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 21 Aug 2015 14:13:56 +0200 Subject: [PATCH 02/20] condition assert for POCO_NO_FPENVIRONMENT platform Signed-off-by: FrancisANDRE --- Foundation/testsuite/src/FPETest.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Foundation/testsuite/src/FPETest.cpp b/Foundation/testsuite/src/FPETest.cpp index 3d79b9a67..5f4fba2b8 100644 --- a/Foundation/testsuite/src/FPETest.cpp +++ b/Foundation/testsuite/src/FPETest.cpp @@ -88,21 +88,27 @@ void FPETest::testFlags() volatile double b = 0; volatile double c = div(a, b); +#if !defined(POCO_NO_FPENVIRONMENT) assert (FPE::isFlag(FPE::FP_DIVIDE_BY_ZERO)); +#endif assert (FPE::isInfinite(c)); FPE::clearFlags(); a = 1.23456789e210; b = 9.87654321e210; c = mult(a, b); +#if !defined(POCO_NO_FPENVIRONMENT) assert (FPE::isFlag(FPE::FP_OVERFLOW)); +#endif assertEqualDelta(c, c, 0); FPE::clearFlags(); a = 1.23456789e-99; b = 9.87654321e210; c = div(a, b); +#if !defined(POCO_NO_FPENVIRONMENT) assert (FPE::isFlag(FPE::FP_UNDERFLOW)); +#endif assertEqualDelta(c, c, 0); } @@ -118,7 +124,8 @@ void FPETest::testFlags() void FPETest::testRound() { -#if !defined(__osf__) && !defined(__VMS) +#if !defined(__osf__) && !defined(__VMS) && !defined(POCO_NO_FPENVIRONMENT) + FPE::setRoundingMode(FPE::FP_ROUND_TONEAREST); assert (FPE::getRoundingMode() == FPE::FP_ROUND_TONEAREST); { From d1a8c11f98a8d6ffd68ef919c2cbad702bb17d49 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 21 Aug 2015 14:15:13 +0200 Subject: [PATCH 03/20] skip SharedMemoryTest for DPOCO_NO_SHAREDMEMORY platform Signed-off-by: FrancisANDRE --- Foundation/testsuite/src/SharedMemoryTest.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Foundation/testsuite/src/SharedMemoryTest.cpp b/Foundation/testsuite/src/SharedMemoryTest.cpp index 1172239e1..3fc115ef4 100644 --- a/Foundation/testsuite/src/SharedMemoryTest.cpp +++ b/Foundation/testsuite/src/SharedMemoryTest.cpp @@ -89,8 +89,9 @@ CppUnit::Test* SharedMemoryTest::suite() { CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SharedMemoryTest"); +#if !defined(POCO_NO_SHAREDMEMORY) CppUnit_addTest(pSuite, SharedMemoryTest, testCreate); CppUnit_addTest(pSuite, SharedMemoryTest, testCreateFromFile); - +#endif return pSuite; } From 0926c9b752cb93cdce8657441a0d03b3788a4a75 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 21 Aug 2015 14:16:45 +0200 Subject: [PATCH 04/20] add command line arguments as [component] [test] for unit testing a single test. Signed-off-by: FrancisANDRE --- build/script/runtests.sh | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/build/script/runtests.sh b/build/script/runtests.sh index 501a2340b..5a1bc1787 100755 --- a/build/script/runtests.sh +++ b/build/script/runtests.sh @@ -4,17 +4,31 @@ # # A script for running the POCO testsuites. # -# usage: runtests +# usage: runtests [component] [test] # # If the environment variable EXCLUDE_TESTS is set, containing # a space-separated list of project names (as found in the # components file), these tests will be skipped. # -TESTRUNNER=./testrunner -TESTRUNNERARGS=-all +if [ "$POCO_BASE" = "" ] ; then + POCO_BASE=`pwd` +fi + +TESTRUNNER=./testrunner + +if [ "$1" = "" ] ; then + components=`cat $POCO_BASE/components` +else + components=$1 +fi + +if [ "$2" = "" ] ; then + TESTRUNNERARGS=-all +else + TESTRUNNERARGS=$2 +fi -components=`cat $POCO_BASE/components` if [ "$OSNAME" = "" ] ; then OSNAME=`uname` From 883800f56c5d0998964c88bd2cefb557082755d5 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 21 Aug 2015 14:18:37 +0200 Subject: [PATCH 05/20] Use Cygwin instead of CYGWIN for POCO_HOST_OSNAME. Setup OSARCH_64BITS to 1 for Cygwin x86_64 platform. Signed-off-by: FrancisANDRE --- build/rules/global | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build/rules/global b/build/rules/global index 0a582a1c5..f972e5ce6 100644 --- a/build/rules/global +++ b/build/rules/global @@ -68,7 +68,10 @@ endif # POCO_HOST_OSNAME = $(shell uname) ifeq ($(findstring CYGWIN,$(POCO_HOST_OSNAME)),CYGWIN) -POCO_HOST_OSNAME = CYGWIN +ifeq ($(findstring x86_64,$(POCO_HOST_OSNAME)),x86_64) +OSARCH_64BITS = 1 +endif +POCO_HOST_OSNAME = Cygwin endif ifeq ($(findstring MINGW,$(POCO_HOST_OSNAME)),MINGW) @@ -161,6 +164,9 @@ LIB64SUFFIX = $(if $(filter $(OSARCH),x86_64 sparc64 ppc64),64,) else ifneq ($(DEBIANISH),) LIB64SUFFIX = $(if $(filter $(OSARCH),x86_64 sparc64 ppc64),/x86_64-linux-gnu,) endif +ifeq ($(findstring Cygwin,$(POCO_HOST_OSNAME)),Cygwin) +LIB64SUFFIX = $(if $(filter $(OSARCH),x86_64),64,) +endif # Default static lib extension STATICLIBLINKEXT = .a From fc46b81e56bdafae83442e3bff2b9b7a70e1a760 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 21 Aug 2015 14:36:56 +0200 Subject: [PATCH 06/20] rename build/config/CYGWIN to build/config/Cygwin Signed-off-by: FrancisANDRE --- build/config/{CYGWIN => Cygwin} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/config/{CYGWIN => Cygwin} (100%) diff --git a/build/config/CYGWIN b/build/config/Cygwin similarity index 100% rename from build/config/CYGWIN rename to build/config/Cygwin From e37f63c823ae2e0120b4a4a1f3fcc85d0cdb1f10 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Fri, 21 Aug 2015 14:36:56 +0200 Subject: [PATCH 07/20] rename build/config/CYGWIN to build/config/Cygwin Signed-off-by: FrancisANDRE --- build/config/{CYGWIN => Cygwin} | 0 configure | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename build/config/{CYGWIN => Cygwin} (100%) diff --git a/build/config/CYGWIN b/build/config/Cygwin similarity index 100% rename from build/config/CYGWIN rename to build/config/Cygwin diff --git a/configure b/configure index 9815e9fa1..52568a3fc 100755 --- a/configure +++ b/configure @@ -224,7 +224,7 @@ if [ "$config" = "" ] ; then config=`uname` case "$config" in CYGWIN*) - config=CYGWIN ;; + config=Cygwin ;; MINGW*) config=MinGW ;; esac From 083ade81359c115b40855b6f3f5567f9a3dfee31 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 22 Aug 2015 09:21:11 +0200 Subject: [PATCH 08/20] fix proper syntax for testing one test Signed-off-by: FrancisANDRE --- build/script/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/script/runtests.sh b/build/script/runtests.sh index 5a1bc1787..38722b518 100755 --- a/build/script/runtests.sh +++ b/build/script/runtests.sh @@ -4,7 +4,7 @@ # # A script for running the POCO testsuites. # -# usage: runtests [component] [test] +# usage: runtests [component [test] ] # # If the environment variable EXCLUDE_TESTS is set, containing # a space-separated list of project names (as found in the From 293e7c91f7f03f3c032275c39a32fa476aab07c8 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 22 Aug 2015 09:54:29 +0200 Subject: [PATCH 09/20] use /dev/tty instead /dev/console on Cygwin otherwise a file acces check makes the test failing. Signed-off-by: FrancisANDRE --- Foundation/testsuite/src/FileTest.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Foundation/testsuite/src/FileTest.cpp b/Foundation/testsuite/src/FileTest.cpp index a9dfb1932..9b2117a11 100644 --- a/Foundation/testsuite/src/FileTest.cpp +++ b/Foundation/testsuite/src/FileTest.cpp @@ -228,7 +228,11 @@ void FileTest::testFileAttributes2() void FileTest::testFileAttributes3() { #if defined(POCO_OS_FAMILY_UNIX) +#if POCO_OS==POCO_OS_CYGWIN + File f("/dev/tty"); +#else File f("/dev/console"); +#endif #elif defined(POCO_OS_FAMILY_WINDOWS) && !defined(_WIN32_WCE) File f("CON"); #endif From 8cc9bda1e432d235f2e62450a7011c395e72a8ba Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sat, 22 Aug 2015 12:37:03 +0200 Subject: [PATCH 10/20] insert a empty line for clarity. Signed-off-by: FrancisANDRE --- build/rules/compile | 12 +++++++++++- build/rules/lib | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/build/rules/compile b/build/rules/compile index 1945e3ca2..e888c5784 100644 --- a/build/rules/compile +++ b/build/rules/compile @@ -36,34 +36,42 @@ $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_SHARED) $(OB $(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d @echo "** Compiling" $< "(debug, static)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ - + @echo " " + $(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d @echo "** Compiling" $< "(release, static)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ + @echo " " $(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d @echo "** Compiling" $< "(debug, static)" $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@ + @echo " " $(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d @echo "** Compiling" $< "(release, static)" $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@ + @echo " " $(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d @echo "** Compiling" $< "(debug, shared)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ + @echo " " $(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d @echo "** Compiling" $< "(release, shared)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ + @echo " " $(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d @echo "** Compiling" $< "(debug, shared)" $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ + @echo " " $(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d @echo "** Compiling" $< "(release, shared)" $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ + @echo " " # # Rules for creating dependency information @@ -72,10 +80,12 @@ $(DEPPATH)/%.d: $(SRCDIR)/%.cpp @echo "** Creating dependency info for" $^ $(MKDIR) $(DEPPATH) $(DEP) $(SRCDIR)/$(patsubst %.d,%.cpp,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CXXFLAGS) + @echo " " $(DEPPATH)/%.d: $(SRCDIR)/%.c @echo "** Creating dependency info for" $^ $(MKDIR) $(DEPPATH) $(DEP) $(SRCDIR)/$(patsubst %.d,%.c,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CFLAGS) + @echo " " depend: $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects))) diff --git a/build/rules/lib b/build/rules/lib index 8126f4af3..8944fbaf9 100644 --- a/build/rules/lib +++ b/build/rules/lib @@ -52,18 +52,21 @@ $(LIB_DEBUG_STATIC): $(foreach o,$(objects),$(OBJPATH_DEBUG_STATIC)/$(o).o) $(LIB) $@ $^ $(RANLIB) $@ $(postbuild) + @echo " " $(LIB_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o) @echo "** Building library (release)" $@ $(LIB) $@ $^ $(RANLIB) $@ $(postbuild) + @echo " " $(LIB_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building shared library (debug)" $@ $(SHLIB) $(SHLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(SHLIBLN) $(LIB_DEBUG_SHARED) $(LIB_DEBUG_SHARED_LINK) $(postbuild) + @echo " " $(LIB_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building shared library (release)" $@ @@ -71,6 +74,7 @@ $(LIB_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) $(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK) $(STRIPCMD) $(postbuild) + @echo " " # # Include the automatically generated dependency files From 09f5b06aaff90eb4925fa258eb392c5b40ad052a Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sun, 23 Aug 2015 11:29:45 +0200 Subject: [PATCH 11/20] add an empty line for clarity. Signed-off-by: FrancisANDRE --- build/rules/dylib | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/rules/dylib b/build/rules/dylib index b4fa9b951..ada7e46d5 100644 --- a/build/rules/dylib +++ b/build/rules/dylib @@ -55,21 +55,25 @@ $(DYLIB_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building dynamic library (debug, shared)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) + @echo " " $(DYLIB_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building dynamic library (release, shared)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(postbuild) + @echo " " $(DYLIB_S_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building dynamic library (debug, static)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) + @echo " " $(DYLIB_S_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building dynamic library (release, static)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(postbuild) + @echo " " # # Include the automatically generated dependency files From f0a618b5a6d7cf0e3d5ac63a509d7aafacb9f115 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sun, 23 Aug 2015 15:44:49 +0200 Subject: [PATCH 12/20] add $(POCO_BASE)/build/config/$(POCO_CONFIG) as a prerequisite Signed-off-by: FrancisANDRE --- build/rules/compile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build/rules/compile b/build/rules/compile index e888c5784..1a2d3f27e 100644 --- a/build/rules/compile +++ b/build/rules/compile @@ -33,42 +33,42 @@ $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_SHARED) $(OB # # Rules for compiling # -$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d +$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, static)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ @echo " " -$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d +$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, static)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ @echo " " -$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d +$(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, static)" $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@ @echo " " -$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d +$(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, static)" $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@ @echo " " -$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d +$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, shared)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ @echo " " -$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d +$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, shared)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ @echo " " -$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d +$(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, shared)" $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ @echo " " -$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d +$(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, shared)" $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ @echo " " From 6c2398226bd52f5dc04f428b51c10a9661ce7089 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Sun, 23 Aug 2015 15:45:45 +0200 Subject: [PATCH 13/20] insert an empty line for clarity Signed-off-by: FrancisANDRE --- build/rules/exec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/rules/exec b/build/rules/exec index d65d09b6d..db6cbc2ee 100644 --- a/build/rules/exec +++ b/build/rules/exec @@ -43,23 +43,27 @@ $(EXEC_DEBUG_STATIC): $(foreach o,$(objects),$(OBJPATH_DEBUG_STATIC)/$(o).o) @echo "** Building executable (debug)" $@ $(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) + @echo " " $(EXEC_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o) @echo "** Building executable (release)" $@ $(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(STRIPCMD) $(postbuild) + @echo " " $(EXEC_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building shared executable (debug)" $@ $(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) + @echo " " $(EXEC_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building shared executable (release)" $@ $(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(STRIPCMD) $(postbuild) + @echo " " # # Include the automatically generated dependency files From ac879caa46784e068efe985b47e7e7143fdc100e Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 24 Aug 2015 11:25:44 +0200 Subject: [PATCH 14/20] Cygwin supports Unix IPCs thru a system process started by /usr/sbin/cygserver. So, the flag -DPOCO_NO_SHAREDMEMORY can be removed. Signed-off-by: FrancisANDRE --- build/config/Cygwin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/config/Cygwin b/build/config/Cygwin index 177723ff5..4538cd69f 100644 --- a/build/config/Cygwin +++ b/build/config/Cygwin @@ -1,7 +1,7 @@ # # $Id$ # -# CYGWIN +# Cygwin # # Make settings for Cygwin on WinXP/gcc 3.4 # @@ -42,7 +42,7 @@ SHAREDLIBLINKEXT = .dll CFLAGS = CFLAGS32 = CFLAGS64 = -CXXFLAGS = -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -DPOCO_NO_SHAREDMEMORY -Wa,-mbig-obj +CXXFLAGS = -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -Wa,-mbig-obj CXXFLAGS32 = CXXFLAGS64 = LINKFLAGS = From 01d029f28240ba6b905b093eae1e4d468d61990d Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 24 Aug 2015 11:27:33 +0200 Subject: [PATCH 15/20] remove the LIBSUFFIX setup since the x86_64 directory serves already as discriminator. Signed-off-by: FrancisANDRE --- build/rules/global | 3 --- 1 file changed, 3 deletions(-) diff --git a/build/rules/global b/build/rules/global index f972e5ce6..0f4e08968 100644 --- a/build/rules/global +++ b/build/rules/global @@ -164,9 +164,6 @@ LIB64SUFFIX = $(if $(filter $(OSARCH),x86_64 sparc64 ppc64),64,) else ifneq ($(DEBIANISH),) LIB64SUFFIX = $(if $(filter $(OSARCH),x86_64 sparc64 ppc64),/x86_64-linux-gnu,) endif -ifeq ($(findstring Cygwin,$(POCO_HOST_OSNAME)),Cygwin) -LIB64SUFFIX = $(if $(filter $(OSARCH),x86_64),64,) -endif # Default static lib extension STATICLIBLINKEXT = .a From 56b6995a5b83c377c2799e89561e2fa8d995846b Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 24 Aug 2015 11:28:12 +0200 Subject: [PATCH 16/20] add separation line for BUILDING FOR WINDOWS CE. Signed-off-by: FrancisANDRE --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index 9d9520fc6..183ecdc30 100644 --- a/README +++ b/README @@ -153,6 +153,7 @@ message compiler may fail when building the Foundation library. BUILDING FOR WINDOWS CE +======================= Building for Windows CE is supported with Microsoft Visual Studio 2008. Unless you have the Digi JumpStart Windows CE 6.0 SDK installed, you'll From c7469d0ea1c599625efa07b78c3b5f23853bcb67 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 24 Aug 2015 11:36:38 +0200 Subject: [PATCH 17/20] remove the inserted line. Signed-off-by: FrancisANDRE --- build/rules/compile | 10 ---------- build/rules/dylib | 4 ---- build/rules/exec | 4 ---- build/rules/lib | 4 ---- 4 files changed, 22 deletions(-) diff --git a/build/rules/compile b/build/rules/compile index 1a2d3f27e..e8d94bd95 100644 --- a/build/rules/compile +++ b/build/rules/compile @@ -36,42 +36,34 @@ $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_SHARED) $(OB $(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, static)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ - @echo " " $(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, static)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(STATICOPT_CXX) -c $< -o $@ - @echo " " $(OBJPATH_DEBUG_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, static)" $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(STATICOPT_CC) -c $< -o $@ - @echo " " $(OBJPATH_RELEASE_STATIC)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, static)" $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(STATICOPT_CC) -c $< -o $@ - @echo " " $(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, shared)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(DEBUGOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ - @echo " " $(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.cpp $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, shared)" $(CXX) $(INCLUDE) $(CXXFLAGS) $(RELEASEOPT_CXX) $(SHAREDOPT_CXX) -c $< -o $@ - @echo " " $(OBJPATH_DEBUG_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(debug, shared)" $(CC) $(INCLUDE) $(CFLAGS) $(DEBUGOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ - @echo " " $(OBJPATH_RELEASE_SHARED)/%.o: $(SRCDIR)/%.c $(DEPPATH)/%.d $(POCO_BASE)/build/config/$(POCO_CONFIG) @echo "** Compiling" $< "(release, shared)" $(CC) $(INCLUDE) $(CFLAGS) $(RELEASEOPT_CC) $(SHAREDOPT_CC) -c $< -o $@ - @echo " " # # Rules for creating dependency information @@ -80,12 +72,10 @@ $(DEPPATH)/%.d: $(SRCDIR)/%.cpp @echo "** Creating dependency info for" $^ $(MKDIR) $(DEPPATH) $(DEP) $(SRCDIR)/$(patsubst %.d,%.cpp,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CXXFLAGS) - @echo " " $(DEPPATH)/%.d: $(SRCDIR)/%.c @echo "** Creating dependency info for" $^ $(MKDIR) $(DEPPATH) $(DEP) $(SRCDIR)/$(patsubst %.d,%.c,$(notdir $@)) $@ $(OBJPATH_DEBUG_STATIC) $(OBJPATH_RELEASE_STATIC) $(OBJPATH_DEBUG_SHARED) $(OBJPATH_RELEASE_SHARED) $(INCLUDE) $(CFLAGS) - @echo " " depend: $(addprefix $(DEPPATH)/,$(addsuffix .d,$(objects))) diff --git a/build/rules/dylib b/build/rules/dylib index ada7e46d5..b4fa9b951 100644 --- a/build/rules/dylib +++ b/build/rules/dylib @@ -55,25 +55,21 @@ $(DYLIB_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building dynamic library (debug, shared)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) - @echo " " $(DYLIB_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building dynamic library (release, shared)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(postbuild) - @echo " " $(DYLIB_S_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building dynamic library (debug, static)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) - @echo " " $(DYLIB_S_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building dynamic library (release, static)" $@ $(DYLIB) $(DYLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(postbuild) - @echo " " # # Include the automatically generated dependency files diff --git a/build/rules/exec b/build/rules/exec index db6cbc2ee..d65d09b6d 100644 --- a/build/rules/exec +++ b/build/rules/exec @@ -43,27 +43,23 @@ $(EXEC_DEBUG_STATIC): $(foreach o,$(objects),$(OBJPATH_DEBUG_STATIC)/$(o).o) @echo "** Building executable (debug)" $@ $(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) - @echo " " $(EXEC_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o) @echo "** Building executable (release)" $@ $(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(STRIPCMD) $(postbuild) - @echo " " $(EXEC_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building shared executable (debug)" $@ $(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(postbuild) - @echo " " $(EXEC_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building shared executable (release)" $@ $(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(STRIPCMD) $(postbuild) - @echo " " # # Include the automatically generated dependency files diff --git a/build/rules/lib b/build/rules/lib index 8944fbaf9..8126f4af3 100644 --- a/build/rules/lib +++ b/build/rules/lib @@ -52,21 +52,18 @@ $(LIB_DEBUG_STATIC): $(foreach o,$(objects),$(OBJPATH_DEBUG_STATIC)/$(o).o) $(LIB) $@ $^ $(RANLIB) $@ $(postbuild) - @echo " " $(LIB_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o) @echo "** Building library (release)" $@ $(LIB) $@ $^ $(RANLIB) $@ $(postbuild) - @echo " " $(LIB_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building shared library (debug)" $@ $(SHLIB) $(SHLIBFLAGS) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS) $(SHLIBLN) $(LIB_DEBUG_SHARED) $(LIB_DEBUG_SHARED_LINK) $(postbuild) - @echo " " $(LIB_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building shared library (release)" $@ @@ -74,7 +71,6 @@ $(LIB_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) $(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK) $(STRIPCMD) $(postbuild) - @echo " " # # Include the automatically generated dependency files From e0c38261b6d5d33ad02a1f69935e7c7493774bd6 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Mon, 24 Aug 2015 11:47:24 +0200 Subject: [PATCH 18/20] add specific Cygwin setup for running Foundation tests. Signed-off-by: FrancisANDRE --- build/script/runtests.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/script/runtests.sh b/build/script/runtests.sh index 38722b518..728c99bb5 100755 --- a/build/script/runtests.sh +++ b/build/script/runtests.sh @@ -10,6 +10,17 @@ # a space-separated list of project names (as found in the # components file), these tests will be skipped. # +# Cygwin specific setup. +# ---------------------- +# On Cygwin, Unix IPC are provided by a separate process daemon +# named cygserver, which should be started once before running any +# test from Foundation. +# 1/ Open a separate Cygwin terminal with Administrator privilege +# 2/ run the command: cygserver-configure +# 3/ Start the cygserver: nohup /usr/sbin/cygserver & +# 4/ close the separate terminal +# 5/ run the Foundation tests: build/script/runtests.sh Foundation +# if [ "$POCO_BASE" = "" ] ; then POCO_BASE=`pwd` From b0989b0828f7be3695f6771ca442402196fb8c63 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 27 Aug 2015 08:42:11 +0200 Subject: [PATCH 19/20] replace duplicate define for HP_ACC by the COMPAQ one for DEC CXX Signed-off-by: FrancisANDRE --- Foundation/include/Poco/Platform.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index 29660e25b..7330b3797 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -242,8 +242,8 @@ #define POCO_COMPILER_CBUILDER #elif defined (__DMC__) #define POCO_COMPILER_DMARS -#elif defined (__HP_aCC) - #define POCO_COMPILER_HP_ACC +#elif defined (__DECCXX) + #define POCO_COMPILER_COMPAC #elif (defined (__xlc__) || defined (__xlC__)) && defined(__IBMCPP__) #define POCO_COMPILER_IBM_XLC // IBM XL C++ #elif defined (__IBMCPP__) && defined(__COMPILER_VER__) From 7f01fbc3db348916f0908fa54dccfb762a32570d Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 27 Aug 2015 08:48:26 +0200 Subject: [PATCH 20/20] add std::string SharedLibrary::prefix() for building library name that complies with Cygwin standard. Signed-off-by: FrancisANDRE --- Foundation/include/Poco/SharedLibrary.h | 6 ++++++ Foundation/include/Poco/SharedLibrary_HPUX.h | 1 + Foundation/include/Poco/SharedLibrary_UNIX.h | 1 + Foundation/include/Poco/SharedLibrary_VMS.h | 1 + Foundation/include/Poco/SharedLibrary_VX.h | 1 + Foundation/include/Poco/SharedLibrary_WIN32.h | 1 + Foundation/include/Poco/SharedLibrary_WIN32U.h | 1 + Foundation/src/SharedLibrary.cpp | 6 ++++++ Foundation/src/SharedLibrary_HPUX.cpp | 6 ++++++ Foundation/src/SharedLibrary_UNIX.cpp | 18 ++++++++++++++---- Foundation/src/SharedLibrary_VMS.cpp | 6 ++++++ Foundation/src/SharedLibrary_VX.cpp | 6 ++++++ Foundation/src/SharedLibrary_WIN32.cpp | 6 ++++++ Foundation/src/SharedLibrary_WIN32U.cpp | 6 ++++++ 14 files changed, 62 insertions(+), 4 deletions(-) diff --git a/Foundation/include/Poco/SharedLibrary.h b/Foundation/include/Poco/SharedLibrary.h index d34349f64..e8a7b19da 100644 --- a/Foundation/include/Poco/SharedLibrary.h +++ b/Foundation/include/Poco/SharedLibrary.h @@ -118,6 +118,12 @@ public: /// specified in a call to load() or the /// constructor. + static std::string prefix(); + /// Returns the platform-specific filename prefix + /// for shared libraries. + /// Most platforms would return an empty string, but + /// on Cygwin, the "cyg" prefix will be returned. + static std::string suffix(); /// Returns the platform-specific filename suffix /// for shared libraries (including the period). diff --git a/Foundation/include/Poco/SharedLibrary_HPUX.h b/Foundation/include/Poco/SharedLibrary_HPUX.h index f77b02ae6..a25f825e5 100644 --- a/Foundation/include/Poco/SharedLibrary_HPUX.h +++ b/Foundation/include/Poco/SharedLibrary_HPUX.h @@ -38,6 +38,7 @@ protected: bool isLoadedImpl() const; void* findSymbolImpl(const std::string& name); const std::string& getPathImpl() const; + static std::string prefixImpl(); static std::string suffixImpl(); private: diff --git a/Foundation/include/Poco/SharedLibrary_UNIX.h b/Foundation/include/Poco/SharedLibrary_UNIX.h index ee968d1d2..a6eed76d1 100644 --- a/Foundation/include/Poco/SharedLibrary_UNIX.h +++ b/Foundation/include/Poco/SharedLibrary_UNIX.h @@ -43,6 +43,7 @@ protected: bool isLoadedImpl() const; void* findSymbolImpl(const std::string& name); const std::string& getPathImpl() const; + static std::string prefixImpl(); static std::string suffixImpl(); private: diff --git a/Foundation/include/Poco/SharedLibrary_VMS.h b/Foundation/include/Poco/SharedLibrary_VMS.h index 8cb701fcf..096cef6af 100644 --- a/Foundation/include/Poco/SharedLibrary_VMS.h +++ b/Foundation/include/Poco/SharedLibrary_VMS.h @@ -37,6 +37,7 @@ protected: bool isLoadedImpl() const; void* findSymbolImpl(const std::string& name); const std::string& getPathImpl() const; + static std::string prefixImpl(); static std::string suffixImpl(); private: diff --git a/Foundation/include/Poco/SharedLibrary_VX.h b/Foundation/include/Poco/SharedLibrary_VX.h index ef1502310..e76a3fcea 100644 --- a/Foundation/include/Poco/SharedLibrary_VX.h +++ b/Foundation/include/Poco/SharedLibrary_VX.h @@ -38,6 +38,7 @@ protected: bool isLoadedImpl() const; void* findSymbolImpl(const std::string& name); const std::string& getPathImpl() const; + static std::string prefixImpl(); static std::string suffixImpl(); private: diff --git a/Foundation/include/Poco/SharedLibrary_WIN32.h b/Foundation/include/Poco/SharedLibrary_WIN32.h index e949ab323..61550c2ad 100644 --- a/Foundation/include/Poco/SharedLibrary_WIN32.h +++ b/Foundation/include/Poco/SharedLibrary_WIN32.h @@ -37,6 +37,7 @@ protected: bool isLoadedImpl() const; void* findSymbolImpl(const std::string& name); const std::string& getPathImpl() const; + static std::string prefixImpl(); static std::string suffixImpl(); private: diff --git a/Foundation/include/Poco/SharedLibrary_WIN32U.h b/Foundation/include/Poco/SharedLibrary_WIN32U.h index f116ad341..66d447379 100644 --- a/Foundation/include/Poco/SharedLibrary_WIN32U.h +++ b/Foundation/include/Poco/SharedLibrary_WIN32U.h @@ -37,6 +37,7 @@ protected: bool isLoadedImpl() const; void* findSymbolImpl(const std::string& name); const std::string& getPathImpl() const; + static std::string prefixImpl(); static std::string suffixImpl(); private: diff --git a/Foundation/src/SharedLibrary.cpp b/Foundation/src/SharedLibrary.cpp index f847d9fb6..8ba80e9c4 100644 --- a/Foundation/src/SharedLibrary.cpp +++ b/Foundation/src/SharedLibrary.cpp @@ -104,6 +104,12 @@ const std::string& SharedLibrary::getPath() const } +std::string SharedLibrary::prefix() +{ + return prefixImpl(); +} + + std::string SharedLibrary::suffix() { return suffixImpl(); diff --git a/Foundation/src/SharedLibrary_HPUX.cpp b/Foundation/src/SharedLibrary_HPUX.cpp index a9998d460..25bc00460 100644 --- a/Foundation/src/SharedLibrary_HPUX.cpp +++ b/Foundation/src/SharedLibrary_HPUX.cpp @@ -83,6 +83,12 @@ const std::string& SharedLibraryImpl::getPathImpl() const } +std::string SharedLibraryImpl::prefixImpl() +{ + return ""; +} + + std::string SharedLibraryImpl::suffixImpl() { #if defined(_DEBUG) diff --git a/Foundation/src/SharedLibrary_UNIX.cpp b/Foundation/src/SharedLibrary_UNIX.cpp index 0153fabbe..663cb90b5 100644 --- a/Foundation/src/SharedLibrary_UNIX.cpp +++ b/Foundation/src/SharedLibrary_UNIX.cpp @@ -20,7 +20,7 @@ // Note: cygwin is missing RTLD_LOCAL, set it to 0 -#if defined(__CYGWIN__) && !defined(RTLD_LOCAL) +#if POCO_OS == POCO_OS_CYGWIN && !defined(RTLD_LOCAL) #define RTLD_LOCAL 0 #endif @@ -99,21 +99,31 @@ const std::string& SharedLibraryImpl::getPathImpl() const } +std::string SharedLibraryImpl::prefixImpl() +{ +#if POCO_OS == POCO_OS_CYGWIN + return "cyg"; +#else + return ""; +#endif +} + + std::string SharedLibraryImpl::suffixImpl() { -#if defined(__APPLE__) +#if POCO_OS == POCO_OS_MAC_OS_X #if defined(_DEBUG) return "d.dylib"; #else return ".dylib"; #endif -#elif defined(hpux) || defined(_hpux) +#elif POCO_OS == POCO_OS_HPUX #if defined(_DEBUG) return "d.sl"; #else return ".sl"; #endif -#elif defined(__CYGWIN__) +#elif POCO_OS == POCO_OS_CYGWIN #if defined(_DEBUG) return "d.dll"; #else diff --git a/Foundation/src/SharedLibrary_VMS.cpp b/Foundation/src/SharedLibrary_VMS.cpp index 3bd6ee0c0..92dac3d5b 100644 --- a/Foundation/src/SharedLibrary_VMS.cpp +++ b/Foundation/src/SharedLibrary_VMS.cpp @@ -106,6 +106,12 @@ const std::string& SharedLibraryImpl::getPathImpl() const } +std::string SharedLibraryImpl::prefixImpl() +{ + return ""; +} + + std::string SharedLibraryImpl::suffixImpl() { #if defined(_DEBUG) diff --git a/Foundation/src/SharedLibrary_VX.cpp b/Foundation/src/SharedLibrary_VX.cpp index 0901ff44a..573faeb76 100644 --- a/Foundation/src/SharedLibrary_VX.cpp +++ b/Foundation/src/SharedLibrary_VX.cpp @@ -128,6 +128,12 @@ const std::string& SharedLibraryImpl::getPathImpl() const } +std::string SharedLibraryImpl::prefixImpl() +{ + return ""; +} + + std::string SharedLibraryImpl::suffixImpl() { return ".out"; diff --git a/Foundation/src/SharedLibrary_WIN32.cpp b/Foundation/src/SharedLibrary_WIN32.cpp index ba7dabf2c..42751de1e 100644 --- a/Foundation/src/SharedLibrary_WIN32.cpp +++ b/Foundation/src/SharedLibrary_WIN32.cpp @@ -87,6 +87,12 @@ const std::string& SharedLibraryImpl::getPathImpl() const } +std::string SharedLibraryImpl::prefixImpl() +{ + return ""; +} + + std::string SharedLibraryImpl::suffixImpl() { #if defined(_DEBUG) diff --git a/Foundation/src/SharedLibrary_WIN32U.cpp b/Foundation/src/SharedLibrary_WIN32U.cpp index 650ac0513..2b50a0df6 100644 --- a/Foundation/src/SharedLibrary_WIN32U.cpp +++ b/Foundation/src/SharedLibrary_WIN32U.cpp @@ -98,6 +98,12 @@ const std::string& SharedLibraryImpl::getPathImpl() const } +std::string SharedLibraryImpl::prefixImpl() +{ + return ""; +} + + std::string SharedLibraryImpl::suffixImpl() { #if defined(_DEBUG)