From 7781215f616e5d0dceca773b44ca61ee0b3099f2 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 17 Nov 2006 16:40:16 +0000 Subject: [PATCH] sources for 1.3 --- CHANGELOG | 26 +++++++++++- CONTRIBUTORS | 3 +- MANIFEST | 37 ++++++++++++++++- NEWS | 9 +--- README | 2 +- VERSION | 2 +- build/config/ARM-Linux | 3 +- build/config/CEGCCARM | 77 +++++++++++++++++++++++++++++++++++ build/config/CYGWIN | 3 +- build/config/Darwin | 3 +- build/config/Darwin7 | 3 +- build/config/FreeBSD | 3 +- build/config/HP-UX | 3 +- build/config/Linux | 3 +- build/config/MinGW | 3 +- build/config/OSF1 | 3 +- build/config/QNX | 3 +- build/config/SSV-LINUX | 73 +++++++++++++++++++++++++++++++++ build/config/SunOS | 3 +- build/rules/compile | 2 +- build/rules/dylib | 2 +- build/rules/exec | 4 +- build/rules/global | 11 ++++- build/rules/lib | 3 +- build/script/makedepend.SunCC | 2 +- build/script/makedepend.aCC | 2 +- build/script/makedepend.cxx | 2 +- build/script/makedepend.gcc | 2 +- build/script/makedepend.qcc | 2 +- build/script/makeldpath | 2 +- build/script/projname | 2 +- build/script/shlibln | 2 +- build/vms/build.com | 2 +- build/vms/pococc.com | 2 +- build/vms/pococxx.com | 2 +- build/vms/pocolib.com | 2 +- build/vms/pocolnk.com | 2 +- buildvms.com | 2 +- configure | 2 +- 39 files changed, 267 insertions(+), 47 deletions(-) create mode 100644 build/config/CEGCCARM create mode 100644 build/config/SSV-LINUX diff --git a/CHANGELOG b/CHANGELOG index 9d9fa89a1..754f1962b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,28 @@ This is the changelog file for POCO - the C++ Portable Components. +Release 1.3.0b1 (2006-11-17) +========================== + +- added HashMap, HashSet classes +- added Poco::Tuple +- added AbstractCache::getAllKeys(), improved performance of the get operation +- fixed AbstractCache::size() to do cache replacement before returning the size +- added additional match() method to RegularExpression and documented the fact that the simple + match() method internally sets RE_ANCHORED and RE_NOTEMPTY. +- added ExpirationDecorator template. Decorates data types so that they can be used with UniqueExpireCaches +- added operator ! to AutoPtr and SharedPtr +- Buffer uses std::size_t instead of int +- Exception::what() now returns exception name instead of message +- added poco_ndc_dbg() macro (same as poco_ndc(), but only enabled in debug builds) +- added Environment::get(name, defaultValue); +- Foundation.h now includes Config.h at the very beginning. +- added replace() and replaceInPlace() to Poco/String.h +- added AutoPtr::assign() and SharedPtr::assign() +- added operator () to AbstractEvent +- gcc Makefiles now strip release builds +- Void now has a == and != operator + + Release 1.2.5 (2006-10-23) ========================== @@ -76,7 +99,6 @@ Release 1.2.1 (2006-08-29) - fixed Config.h header (no more #undefs) - Release 1.2.0 (2006-08-29) ========================== @@ -543,4 +565,4 @@ building the libraries. -- -$Id: //poco/1.2/dist/CHANGELOG#13 $ +$Id: //poco/1.3/dist/CHANGELOG#1 $ diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d4c65b71a..da89e7974 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -4,7 +4,6 @@ Peter Schojer Claus Dabringer Andrew Marlow (public@marlowa.plus.com) Caleb Epstein (caleb.epstein@gmail.com) -Andrew J. P. Maclean (a.maclean@optusnet.com.au) -- -$Id: //poco/1.2/dist/CONTRIBUTORS#2 $ +$Id: //poco/1.3/dist/CONTRIBUTORS#1 $ diff --git a/MANIFEST b/MANIFEST index 3a6f6a37d..d51292373 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2,6 +2,7 @@ build build/config build/config/ARM-Linux +build/config/CEGCCARM build/config/CYGWIN build/config/Darwin build/config/Darwin7 @@ -11,6 +12,7 @@ build/config/Linux build/config/MinGW build/config/OSF1 build/config/QNX +build/config/SSV-LINUX build/config/SunOS build/rules build/rules/compile @@ -182,6 +184,7 @@ Foundation/include/Poco/EventLogChannel.h Foundation/include/Poco/Event_POSIX.h Foundation/include/Poco/Event_WIN32.h Foundation/include/Poco/Exception.h +Foundation/include/Poco/ExpirationDecorator.h Foundation/include/Poco/Expire.h Foundation/include/Poco/ExpireCache.h Foundation/include/Poco/ExpireLRUCache.h @@ -206,7 +209,10 @@ Foundation/include/Poco/FPEnvironment_DUMMY.h Foundation/include/Poco/FPEnvironment_SUN.h Foundation/include/Poco/FPEnvironment_WIN32.h Foundation/include/Poco/Glob.h +Foundation/include/Poco/Hash.h Foundation/include/Poco/HashFunction.h +Foundation/include/Poco/HashMap.h +Foundation/include/Poco/HashSet.h Foundation/include/Poco/HashStatistic.h Foundation/include/Poco/HashTable.h Foundation/include/Poco/HexBinaryDecoder.h @@ -217,6 +223,7 @@ Foundation/include/Poco/Instantiator.h Foundation/include/Poco/KeyValueArgs.h Foundation/include/Poco/Latin1Encoding.h Foundation/include/Poco/Latin9Encoding.h +Foundation/include/Poco/LinearHashTable.h Foundation/include/Poco/LineEndingConverter.h Foundation/include/Poco/LocalDateTime.h Foundation/include/Poco/LogFile.h @@ -237,6 +244,7 @@ Foundation/include/Poco/MD5Engine.h Foundation/include/Poco/MemoryPool.h Foundation/include/Poco/Message.h Foundation/include/Poco/MetaObject.h +Foundation/include/Poco/MetaProgramming.h Foundation/include/Poco/Mutex.h Foundation/include/Poco/Mutex_POSIX.h Foundation/include/Poco/Mutex_WIN32.h @@ -344,9 +352,14 @@ Foundation/include/Poco/Timespan.h Foundation/include/Poco/Timestamp.h Foundation/include/Poco/Timezone.h Foundation/include/Poco/Token.h +Foundation/include/Poco/Tuple.h +Foundation/include/Poco/TypeList.h Foundation/include/Poco/Types.h Foundation/include/Poco/UnbufferedStreamBuf.h Foundation/include/Poco/UnicodeConverter.h +Foundation/include/Poco/UniqueExpireCache.h +Foundation/include/Poco/UniqueExpireLRUCache.h +Foundation/include/Poco/UniqueExpireStrategy.h Foundation/include/Poco/URI.h Foundation/include/Poco/URIStreamFactory.h Foundation/include/Poco/URIStreamOpener.h @@ -557,6 +570,7 @@ Foundation/src/FPEnvironment_WIN32.cpp Foundation/src/get.c Foundation/src/Glob.cpp Foundation/src/gzio.c +Foundation/src/Hash.cpp Foundation/src/HashStatistic.cpp Foundation/src/HexBinaryDecoder.cpp Foundation/src/HexBinaryEncoder.cpp @@ -782,12 +796,20 @@ Foundation/testsuite/src/FPETest.cpp Foundation/testsuite/src/FPETest.h Foundation/testsuite/src/GlobTest.cpp Foundation/testsuite/src/GlobTest.h -Foundation/testsuite/src/HashTest.cpp -Foundation/testsuite/src/HashTest.h +Foundation/testsuite/src/HashingTestSuite.cpp +Foundation/testsuite/src/HashingTestSuite.h +Foundation/testsuite/src/HashMapTest.cpp +Foundation/testsuite/src/HashMapTest.h +Foundation/testsuite/src/HashSetTest.cpp +Foundation/testsuite/src/HashSetTest.h +Foundation/testsuite/src/HashTableTest.cpp +Foundation/testsuite/src/HashTableTest.h Foundation/testsuite/src/HexBinaryTest.cpp Foundation/testsuite/src/HexBinaryTest.h Foundation/testsuite/src/HMACEngineTest.cpp Foundation/testsuite/src/HMACEngineTest.h +Foundation/testsuite/src/LinearHashTableTest.cpp +Foundation/testsuite/src/LinearHashTableTest.h Foundation/testsuite/src/LineEndingConverterTest.cpp Foundation/testsuite/src/LineEndingConverterTest.h Foundation/testsuite/src/LocalDateTimeTest.cpp @@ -862,6 +884,8 @@ Foundation/testsuite/src/SharedPtrTest.cpp Foundation/testsuite/src/SharedPtrTest.h Foundation/testsuite/src/SimpleFileChannelTest.cpp Foundation/testsuite/src/SimpleFileChannelTest.h +Foundation/testsuite/src/SimpleHashTableTest.cpp +Foundation/testsuite/src/SimpleHashTableTest.h Foundation/testsuite/src/StopwatchTest.cpp Foundation/testsuite/src/StopwatchTest.h Foundation/testsuite/src/StreamConverterTest.cpp @@ -912,6 +936,12 @@ Foundation/testsuite/src/TimestampTest.cpp Foundation/testsuite/src/TimestampTest.h Foundation/testsuite/src/TimezoneTest.cpp Foundation/testsuite/src/TimezoneTest.h +Foundation/testsuite/src/TuplesTest.cpp +Foundation/testsuite/src/TuplesTest.h +Foundation/testsuite/src/UniqueExpireCacheTest.cpp +Foundation/testsuite/src/UniqueExpireCacheTest.h +Foundation/testsuite/src/UniqueExpireLRUCacheTest.cpp +Foundation/testsuite/src/UniqueExpireLRUCacheTest.h Foundation/testsuite/src/URIStreamOpenerTest.cpp Foundation/testsuite/src/URIStreamOpenerTest.h Foundation/testsuite/src/URITest.cpp @@ -940,6 +970,7 @@ Foundation/testsuite/TestSuite_vs80.vcproj libversion LICENSE Makefile +MANIFEST Net Net/include Net/include/Poco @@ -1007,6 +1038,7 @@ Net/include/Poco/Net/QuotedPrintableDecoder.h Net/include/Poco/Net/QuotedPrintableEncoder.h Net/include/Poco/Net/RawSocket.h Net/include/Poco/Net/RawSocketImpl.h +Net/include/Poco/Net/RemoteSyslogChannel.h Net/include/Poco/Net/ServerSocket.h Net/include/Poco/Net/ServerSocketImpl.h Net/include/Poco/Net/SMTPClientSession.h @@ -1176,6 +1208,7 @@ Net/src/QuotedPrintableDecoder.cpp Net/src/QuotedPrintableEncoder.cpp Net/src/RawSocket.cpp Net/src/RawSocketImpl.cpp +Net/src/RemoteSyslogChannel.cpp Net/src/ServerSocket.cpp Net/src/ServerSocketImpl.cpp Net/src/SMTPClientSession.cpp diff --git a/NEWS b/NEWS index f7e9ef383..279669077 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,3 @@ -Release 1.2.5 (2006-10-23) -========================== - -This release contains bugfixes and minor enchancements. -See the CHANGELOG for details. - - Release 1.2.0 (2006-08-29) ========================== @@ -124,4 +117,4 @@ Please refer to the README file for more information and instructions for building the libraries. -- -$Id: //poco/1.2/dist/NEWS#6 $ +$Id: //poco/1.3/dist/NEWS#1 $ diff --git a/README b/README index fcfa1b554..8a1a8f9f7 100644 --- a/README +++ b/README @@ -191,4 +191,4 @@ at . -- -$Id: //poco/1.2/dist/README#1 $ +$Id: //poco/1.3/dist/README#1 $ diff --git a/VERSION b/VERSION index 91b977e85..06ebd7a5d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.5 (2006-10-23) +1.3b1 (2006-11-17) diff --git a/build/config/ARM-Linux b/build/config/ARM-Linux index d1d2dde32..3e0ddfbc1 100644 --- a/build/config/ARM-Linux +++ b/build/config/ARM-Linux @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/ARM-Linux#1 $ +# $Id: //poco/1.3/build/config/ARM-Linux#1 $ # # ARM-Linux # @@ -27,6 +27,7 @@ LIB = arm-linux-ar -cr RANLIB = arm-linux-ranlib SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -Wl,-rpath,$(dir $@) -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = arm-linux-strip DEP = $(POCO_BASE)/build/script/makedepend.gcc SHELL = sh RM = rm -rf diff --git a/build/config/CEGCCARM b/build/config/CEGCCARM new file mode 100644 index 000000000..5b3f88722 --- /dev/null +++ b/build/config/CEGCCARM @@ -0,0 +1,77 @@ +# +# $Id: //poco/1.3/build/config/CEGCCARM#1 $ +# +# CYGWIN +# +# Make settings for Cygwin on WinXP/gcc 3.4 +# for cross compiling to WinCE ARM with CEGCC +# +# + +# +# General Settings +# +LINKMODE = SHARED +POCO_TARGET_OSNAME = WinCE +POCO_TARGET_OSARCH = ARM +TOOLPATH = /opt/cegcc +TOOL = /opt/cegcc/bin/arm-wince-cegcc- + +# +# Define Tools +# +CC = $(TOOL)gcc +CXX = $(TOOL)g++ +LINK = $(CXX) +LIB = $(TOOL)ar -cr +RANLIB = $(TOOL)ranlib +SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst ce,lib,$(notdir $@)).a -Wl,--export-all-symbols -Wl,--enable-auto-import +SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = $(TOOL)strip +DEP = $(POCO_BASE)/build/script/makedepend.gcc +SHELL = sh +RM = rm -rf +CP = cp +MKDIR = mkdir -p + +# +# Extension for Shared Libraries +# +LIBPREFIX = ce +SHAREDLIBEXT = .$(target_version).dll +SHAREDLIBLINKEXT = .dll + +# +# Compiler and Linker Flags +# +CFLAGS = +CFLAGS32 = +CFLAGS64 = +CXXFLAGS = +CXXFLAGS32 = +CXXFLAGS64 = +LINKFLAGS = +LINKFLAGS32 = +LINKFLAGS64 = +STATICOPT_CC = +STATICOPT_CXX = +STATICOPT_LINK = -static +SHAREDOPT_CC = +SHAREDOPT_CXX = +SHAREDOPT_LINK = +DEBUGOPT_CC = -g -D_DEBUG +DEBUGOPT_CXX = -g -D_DEBUG +DEBUGOPT_LINK = -g +RELEASEOPT_CC = -O2 -DNDEBUG +RELEASEOPT_CXX = -O2 -DNDEBUG +RELEASEOPT_LINK = -O2 + +# +# System Specific Flags +# +SYSFLAGS = -D_XOPEN_SOURCE=500 -DPOCO_NO_FPENVIRONMENT -DPOCO_OS_FAMILY_WINDOWS -DNOMINMAX -D_WIN32 -D_WIN32_WCE=0x0420 -D_WIN32_IE=0x0420 -DNO_GZCOMPRESS -DPOCO_WIN32_UTF8 -DUNICODE -DPOCO_DLL -DFoundation_EXPORTS + +# +# System Specific Libraries +# +SYSLIBS = -L$(TOOLPATH)/lib -L$(TOOLPATH)/arm-wince-cegcc/lib diff --git a/build/config/CYGWIN b/build/config/CYGWIN index 4f2039949..6739c4826 100644 --- a/build/config/CYGWIN +++ b/build/config/CYGWIN @@ -8,7 +8,7 @@ # # -# General Settings +# General Settings, note that strip doesn't do anything on Cygwin, thus empty # LINKMODE = SHARED @@ -22,6 +22,7 @@ LIB = ar -cr RANLIB = ranlib SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(notdir $@)).a -Wl,--export-all-symbols -Wl,--enable-auto-import SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = DEP = $(POCO_BASE)/build/script/makedepend.gcc SHELL = sh RM = rm -rf diff --git a/build/config/Darwin b/build/config/Darwin index a49f91d56..658c7e69e 100644 --- a/build/config/Darwin +++ b/build/config/Darwin @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/Darwin#1 $ +# $Id: //poco/1.3/build/config/Darwin#2 $ # # Darwin8 # @@ -22,6 +22,7 @@ RANLIB = ranlib SHLIB = $(CXX) -dynamiclib -Wl,-install_name,$@ -o $@ DYLIB = $(CXX) -dynamic -bundle -read_only_relocs suppress -Wl,-noprebind -Wl,-bind_at_load -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = DEP = $(POCO_BASE)/build/script/makedepend.gcc SHELL = sh RM = rm -rf diff --git a/build/config/Darwin7 b/build/config/Darwin7 index 4a2f138c9..d17046ce3 100644 --- a/build/config/Darwin7 +++ b/build/config/Darwin7 @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/Darwin7#1 $ +# $Id: //poco/1.3/build/config/Darwin7#1 $ # # Darwin # @@ -22,6 +22,7 @@ RANLIB = ranlib SHLIB = libtool -dynamic -flat_namespace -undefined suppress -noprebind -install_name $@ -o $@ DYLIB = ld -dynamic -bundle -read_only_relocs suppress -flat_namespace -undefined warning -noprebind -bind_at_load -o $@ /usr/lib/bundle1.o SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = strip DEP = $(POCO_BASE)/build/script/makedepend.gcc SHELL = sh RM = rm -rf diff --git a/build/config/FreeBSD b/build/config/FreeBSD index d8b6e5693..88bfc6004 100644 --- a/build/config/FreeBSD +++ b/build/config/FreeBSD @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/FreeBSD#1 $ +# $Id: //poco/1.3/build/config/FreeBSD#1 $ # # FreeBSD # @@ -23,6 +23,7 @@ RANLIB = ranlib SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -Wl,-rpath,$(dir $@) -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln DEP = $(POCO_BASE)/build/script/makedepend.gcc +STRIP = strip SHELL = sh RM = rm -rf CP = cp diff --git a/build/config/HP-UX b/build/config/HP-UX index 3debb8ff6..99265636f 100644 --- a/build/config/HP-UX +++ b/build/config/HP-UX @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/HP-UX#1 $ +# $Id: //poco/1.3/build/config/HP-UX#1 $ # # HP-UX # @@ -22,6 +22,7 @@ RANLIB = ranlib SHLIB = $(CXX) $(LINKFLAGS) -b -Wl,+h$(notdir $@) -o $@ -Wl,+s SHLIBLN = $(POCO_BASE)/build/script/shlibln DEP = $(POCO_BASE)/build/script/makedepend.aCC +STRIP = SHELL = sh RM = rm -rf CP = cp diff --git a/build/config/Linux b/build/config/Linux index 78fd805bb..9854f1e49 100644 --- a/build/config/Linux +++ b/build/config/Linux @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/Linux#1 $ +# $Id: //poco/1.3/build/config/Linux#1 $ # # Linux # @@ -22,6 +22,7 @@ LIB = ar -cr RANLIB = ranlib SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -Wl,-rpath,$(dir $@) -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = strip DEP = $(POCO_BASE)/build/script/makedepend.gcc SHELL = sh RM = rm -rf diff --git a/build/config/MinGW b/build/config/MinGW index bd1f8fdb9..545260e2e 100644 --- a/build/config/MinGW +++ b/build/config/MinGW @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/MinGW#1 $ +# $Id: //poco/1.3/build/config/MinGW#1 $ # # MinGW32 # @@ -23,6 +23,7 @@ LIB = ar -cr RANLIB = ranlib SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = strip DEP = $(POCO_BASE)/build/script/makedepend.gcc SHELL = sh RM = rm -rf diff --git a/build/config/OSF1 b/build/config/OSF1 index 1f28c3a27..6b1be5fbc 100644 --- a/build/config/OSF1 +++ b/build/config/OSF1 @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/OSF1#1 $ +# $Id: //poco/1.3/build/config/OSF1#1 $ # # OSF1 # @@ -21,6 +21,7 @@ LIB = ar -cr RANLIB = ranlib SHLIB = $(CXX) $(LINKFLAGS) -shared -o $@ -rpath $(LIBPATH) -soname $(notdir $@) SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = DEP = $(POCO_BASE)/build/script/makedepend.cxx SHELL = sh RM = rm -rf diff --git a/build/config/QNX b/build/config/QNX index d6ffc1644..98031149b 100644 --- a/build/config/QNX +++ b/build/config/QNX @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/QNX#1 $ +# $Id: //poco/1.3/build/config/QNX#1 $ # # QNX # @@ -22,6 +22,7 @@ LIB = ar -cr RANLIB = ranlib SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -Wl,-rpath,$(dir $@) -o $@ SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = DEP = $(POCO_BASE)/build/script/makedepend.qcc SHELL = sh RM = rm -rf diff --git a/build/config/SSV-LINUX b/build/config/SSV-LINUX new file mode 100644 index 000000000..a41d77373 --- /dev/null +++ b/build/config/SSV-LINUX @@ -0,0 +1,73 @@ +# +# $Id: //poco/Main/build/config/ARM-Linux#6 $ +# +# ARM-Linux +# +# Make settings for ARM Linux/gcc 2.95.3 (cross-compile, using STLport 4.6.2) +# + +# +# General Settings +# +LINKMODE = STATIC +POCO_TARGET_OSNAME = Linux +POCO_TARGET_OSARCH = ARM +TOOL = arm-ssv1-linux + +# +# Define Tools +# +CC = $(TOOL)-gcc +CXX = $(TOOL)-g++ +LINK = $(CXX) +STRIP = $(TOOL)-strip +LIB = $(TOOL)-ar -cr +RANLIB = $(TOOL)-ranlib +SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -Wl,-rpath,$(dir $@) -o $@ +SHLIBLN = $(POCO_BASE)/build/script/shlibln +DEP = $(POCO_BASE)/build/script/makedepend.gcc +SHELL = sh +RM = rm -rf +CP = cp +MKDIR = mkdir -p + +# +# Extension for Shared Libraries +# +SHAREDLIBEXT = .so.$(target_version) +SHAREDLIBLINKEXT = .so + +# +# Compiler and Linker Flags +# +CFLAGS = -Isrc +CFLAGS32 = +CFLAGS64 = +CXXFLAGS = +CXXFLAGS32 = +CXXFLAGS64 = +LINKFLAGS = +LINKFLAGS32 = +LINKFLAGS64 = +STATICOPT_CC = +STATICOPT_CXX = +STATICOPT_LINK = -static +SHAREDOPT_CC = -fPIC +SHAREDOPT_CXX = -fPIC +SHAREDOPT_LINK = -Wl,-rpath,$(LIBPATH) +DEBUGOPT_CC = -g -D_DEBUG +DEBUGOPT_CXX = -g -D_DEBUG +DEBUGOPT_LINK = -g +RELEASEOPT_CC = -O2 -DNDEBUG +RELEASEOPT_CXX = -O2 -DNDEBUG +RELEASEOPT_LINK = -O2 + +# +# System Specific Flags +# +SYSFLAGS = -I$(STLPORT_INCLUDE) -I$(OPENSSL_INCLUDE) -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_REENTRANT -D_THREAD_SAFE -DPOCO_NO_FPENVIRONMENT + +# +# System Specific Libraries +# +SYSLIBS = -lpthread -ldl diff --git a/build/config/SunOS b/build/config/SunOS index cb089aa19..689294310 100644 --- a/build/config/SunOS +++ b/build/config/SunOS @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/config/SunOS#2 $ +# $Id: //poco/1.3/build/config/SunOS#1 $ # # SunOS # @@ -21,6 +21,7 @@ LIB = $(CXX) -xar -o $@ RANLIB = ranlib SHLIB = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@) SHLIBLN = $(POCO_BASE)/build/script/shlibln +STRIP = DEP = $(POCO_BASE)/build/script/makedepend.SunCC SHELL = sh RM = rm -rf diff --git a/build/rules/compile b/build/rules/compile index 97ec319fb..9e3363793 100644 --- a/build/rules/compile +++ b/build/rules/compile @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/rules/compile#1 $ +# $Id: //poco/1.3/build/rules/compile#1 $ # # compiile # diff --git a/build/rules/dylib b/build/rules/dylib index a1d7f880d..fb8dd1de7 100644 --- a/build/rules/dylib +++ b/build/rules/dylib @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/rules/dylib#1 $ +# $Id: //poco/1.3/build/rules/dylib#1 $ # # dylib # diff --git a/build/rules/exec b/build/rules/exec index f86a6de71..13b976665 100644 --- a/build/rules/exec +++ b/build/rules/exec @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/rules/exec#1 $ +# $Id: //poco/1.3/build/rules/exec#1 $ # # exec # @@ -41,6 +41,7 @@ $(EXEC_DEBUG_STATIC): $(foreach o,$(objects),$(OBJPATH_DEBUG_STATIC)/$(o).o) $(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) $(EXEC_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) @echo "** Building shared executable (debug)" $@ @@ -49,6 +50,7 @@ $(EXEC_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o) $(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) # # Include the automatically generated dependency files diff --git a/build/rules/global b/build/rules/global index 6e9ba5464..a7795045e 100644 --- a/build/rules/global +++ b/build/rules/global @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/rules/global#1 $ +# $Id: //poco/1.3/build/rules/global#2 $ # # global # @@ -163,6 +163,15 @@ INCLUDE = -Iinclude $(foreach p,$(COMPONENTS),-I$(POCO_BASE)/$(p)/$(INCDIR)) # LIBRARY = -L$(LIBPATH) +# +# Strip Command definition +# +ifeq ($(strip $(STRIP)),) +STRIPCMD = +else +STRIPCMD = $(STRIP) $@ +endif + # # Make CC and CXX environment vars # diff --git a/build/rules/lib b/build/rules/lib index 0743dc5ed..912f2ef43 100644 --- a/build/rules/lib +++ b/build/rules/lib @@ -1,5 +1,5 @@ # -# $Id: //poco/1.2/build/rules/lib#1 $ +# $Id: //poco/1.3/build/rules/lib#1 $ # # lib # @@ -65,6 +65,7 @@ $(LIB_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o) @echo "** Building shared library (release)" $@ $(SHLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS) $(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK) + $(STRIPCMD) # # Include the automatically generated dependency files diff --git a/build/script/makedepend.SunCC b/build/script/makedepend.SunCC index 0b44906f5..b322c9b99 100755 --- a/build/script/makedepend.SunCC +++ b/build/script/makedepend.SunCC @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: //poco/1.2/build/script/makedepend.SunCC#1 $ +# $Id: //poco/1.3/build/script/makedepend.SunCC#1 $ # # makedepend.SunCC # diff --git a/build/script/makedepend.aCC b/build/script/makedepend.aCC index 56f424e72..7f3e44448 100755 --- a/build/script/makedepend.aCC +++ b/build/script/makedepend.aCC @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: //poco/1.2/build/script/makedepend.aCC#1 $ +# $Id: //poco/1.3/build/script/makedepend.aCC#1 $ # # makedepend.aCC # diff --git a/build/script/makedepend.cxx b/build/script/makedepend.cxx index 9fb7b247b..e7b1baba8 100755 --- a/build/script/makedepend.cxx +++ b/build/script/makedepend.cxx @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: //poco/1.2/build/script/makedepend.cxx#1 $ +# $Id: //poco/1.3/build/script/makedepend.cxx#1 $ # # makedepend.cxx # diff --git a/build/script/makedepend.gcc b/build/script/makedepend.gcc index 1c4248e46..b85237a58 100755 --- a/build/script/makedepend.gcc +++ b/build/script/makedepend.gcc @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: //poco/1.2/build/script/makedepend.gcc#1 $ +# $Id: //poco/1.3/build/script/makedepend.gcc#1 $ # # makedepend.gcc # diff --git a/build/script/makedepend.qcc b/build/script/makedepend.qcc index f3ef1b967..53953615f 100755 --- a/build/script/makedepend.qcc +++ b/build/script/makedepend.qcc @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: //poco/1.2/build/script/makedepend.qcc#1 $ +# $Id: //poco/1.3/build/script/makedepend.qcc#1 $ # # makedepend.gcc # diff --git a/build/script/makeldpath b/build/script/makeldpath index eb6e702fd..898008bf0 100755 --- a/build/script/makeldpath +++ b/build/script/makeldpath @@ -2,7 +2,7 @@ # # makeldpath # -# $Id: //poco/1.2/build/script/makeldpath#1 $ +# $Id: //poco/1.3/build/script/makeldpath#1 $ # # Create a LD_LIBRARY_PATH for all project libraries. # diff --git a/build/script/projname b/build/script/projname index 6854d2149..5d89b235c 100755 --- a/build/script/projname +++ b/build/script/projname @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: //poco/1.2/build/script/projname#1 $ +# $Id: //poco/1.3/build/script/projname#1 $ # # projname # diff --git a/build/script/shlibln b/build/script/shlibln index cce4f8fa8..af020dc37 100755 --- a/build/script/shlibln +++ b/build/script/shlibln @@ -1,6 +1,6 @@ #! /bin/sh # -# $Id: //poco/1.2/build/script/shlibln#1 $ +# $Id: //poco/1.3/build/script/shlibln#1 $ # # shlibln # diff --git a/build/vms/build.com b/build/vms/build.com index 9ce61a861..2d5076dc2 100644 --- a/build/vms/build.com +++ b/build/vms/build.com @@ -1,7 +1,7 @@ $ ! $ ! BUILD.COM $ ! -$ ! $Id: //poco/1.2/build/vms/build.com#1 $ +$ ! $Id: //poco/1.3/build/vms/build.com#1 $ $ ! $ ! OpenVMS build procedure $ ! diff --git a/build/vms/pococc.com b/build/vms/pococc.com index 5dd8ea9db..21ef81214 100644 --- a/build/vms/pococc.com +++ b/build/vms/pococc.com @@ -1,7 +1,7 @@ $ ! $ ! POCOCC.COM $ ! -$ ! $Id: //poco/1.2/build/vms/pococc.com#1 $ +$ ! $Id: //poco/1.3/build/vms/pococc.com#1 $ $ ! $ ! C compile procedure for Poco libraries $ ! diff --git a/build/vms/pococxx.com b/build/vms/pococxx.com index cca0db333..c4c82f040 100644 --- a/build/vms/pococxx.com +++ b/build/vms/pococxx.com @@ -1,7 +1,7 @@ $ ! $ ! POCOCXX.COM $ ! -$ ! $Id: //poco/1.2/build/vms/pococxx.com#1 $ +$ ! $Id: //poco/1.3/build/vms/pococxx.com#1 $ $ ! $ ! C++ compile procedure for Poco libraries $ ! diff --git a/build/vms/pocolib.com b/build/vms/pocolib.com index d8809e7cf..46111c834 100644 --- a/build/vms/pocolib.com +++ b/build/vms/pocolib.com @@ -1,7 +1,7 @@ $ ! $ ! POCOLIB.COM $ ! -$ ! $Id: //poco/1.2/build/vms/pocolib.com#1 $ +$ ! $Id: //poco/1.3/build/vms/pocolib.com#1 $ $ ! $ ! C++ library creation procedure for Poco libraries $ ! diff --git a/build/vms/pocolnk.com b/build/vms/pocolnk.com index 2d3744c3d..a4c836ba2 100644 --- a/build/vms/pocolnk.com +++ b/build/vms/pocolnk.com @@ -1,7 +1,7 @@ $ ! $ ! POCOLNK.COM $ ! -$ ! $Id: //poco/1.2/build/vms/pocolnk.com#1 $ +$ ! $Id: //poco/1.3/build/vms/pocolnk.com#1 $ $ ! $ ! C++ link procedure for Poco $ ! diff --git a/buildvms.com b/buildvms.com index 9a57bc1bd..94b5cb89b 100644 --- a/buildvms.com +++ b/buildvms.com @@ -1,7 +1,7 @@ $ ! $ ! BUILDVMS.COM $ ! -$ ! $Id: //poco/1.2/buildvms.com#1 $ +$ ! $Id: //poco/1.3/buildvms.com#1 $ $ ! $ ! OpenVMS build procedure $ ! diff --git a/configure b/configure index fd70eac4a..a4c49152a 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # # configure # -# $Id: //poco/1.2/dist/configure#3 $ +# $Id: //poco/1.3/dist/configure#1 $ # # Configuration script for POCO. #