This commit is contained in:
Guenter Obiltschnig 2006-12-22 10:07:47 +00:00
Родитель 5dc1336af8
Коммит 13f73441e2
10 изменённых файлов: 256 добавлений и 72 удалений

117
MANIFEST
Просмотреть файл

@ -7,6 +7,7 @@ build/config/CYGWIN
build/config/Darwin
build/config/Darwin7
build/config/FreeBSD
build/config/GCCEMBEDLINUX
build/config/HP-UX
build/config/Linux
build/config/MinGW
@ -1339,6 +1340,122 @@ Net/testsuite/src/WinDriver.cpp
Net/testsuite/TestSuite.vmsbuild
Net/testsuite/TestSuite_vs71.vcproj
Net/testsuite/TestSuite_vs80.vcproj
NetSSL_OpenSSL
NetSSL_OpenSSL/doc
NetSSL_OpenSSL/doc/howtobuild.txt
NetSSL_OpenSSL/include
NetSSL_OpenSSL/include/Poco
NetSSL_OpenSSL/include/Poco/Net
NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h
NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h
NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h
NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h
NetSSL_OpenSSL/include/Poco/Net/Context.h
NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h
NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h
NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h
NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h
NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h
NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h
NetSSL_OpenSSL/include/Poco/Net/NetSSL.h
NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h
NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h
NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h
NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h
NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h
NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h
NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h
NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h
NetSSL_OpenSSL/include/Poco/Net/SSLException.h
NetSSL_OpenSSL/include/Poco/Net/SSLInitializer.h
NetSSL_OpenSSL/include/Poco/Net/SSLManager.h
NetSSL_OpenSSL/include/Poco/Net/Utility.h
NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h
NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h
NetSSL_OpenSSL/Makefile
NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.sln
NetSSL_OpenSSL/NetSSL_OpenSSL_vs71.vcproj
NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.sln
NetSSL_OpenSSL/NetSSL_OpenSSL_vs80.vcproj
NetSSL_OpenSSL/samples
NetSSL_OpenSSL/samples/download
NetSSL_OpenSSL/samples/download/any.pem
NetSSL_OpenSSL/samples/download/download.vmsbuild
NetSSL_OpenSSL/samples/download/download_vs71.vcproj
NetSSL_OpenSSL/samples/download/download_vs80.vcproj
NetSSL_OpenSSL/samples/download/Makefile
NetSSL_OpenSSL/samples/download/rootcert.pem
NetSSL_OpenSSL/samples/download/src
NetSSL_OpenSSL/samples/download/src/download.cpp
NetSSL_OpenSSL/samples/HTTPSTimeServer
NetSSL_OpenSSL/samples/HTTPSTimeServer/any.pem
NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.properties
NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.vmsbuild
NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs71.vcproj
NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs80.vcproj
NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile
NetSSL_OpenSSL/samples/HTTPSTimeServer/rootcert.pem
NetSSL_OpenSSL/samples/HTTPSTimeServer/src
NetSSL_OpenSSL/samples/HTTPSTimeServer/src/HTTPSTimeServer.cpp
NetSSL_OpenSSL/samples/Makefile
NetSSL_OpenSSL/samples/samples_vs71.sln
NetSSL_OpenSSL/samples/samples_vs80.sln
NetSSL_OpenSSL/src
NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp
NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp
NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp
NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp
NetSSL_OpenSSL/src/Context.cpp
NetSSL_OpenSSL/src/HTTPSClientSession.cpp
NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp
NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp
NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp
NetSSL_OpenSSL/src/KeyConsoleHandler.cpp
NetSSL_OpenSSL/src/KeyFileHandler.cpp
NetSSL_OpenSSL/src/PrivateKeyFactory.cpp
NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp
NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp
NetSSL_OpenSSL/src/SecureServerSocket.cpp
NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp
NetSSL_OpenSSL/src/SecureSocketImpl.cpp
NetSSL_OpenSSL/src/SecureStreamSocket.cpp
NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp
NetSSL_OpenSSL/src/SSLException.cpp
NetSSL_OpenSSL/src/SSLInitializer.cpp
NetSSL_OpenSSL/src/SSLManager.cpp
NetSSL_OpenSSL/src/Utility.cpp
NetSSL_OpenSSL/src/VerificationErrorArgs.cpp
NetSSL_OpenSSL/src/X509Certificate.cpp
NetSSL_OpenSSL/testsuite
NetSSL_OpenSSL/testsuite/any.pem
NetSSL_OpenSSL/testsuite/Makefile
NetSSL_OpenSSL/testsuite/rootcert.pem
NetSSL_OpenSSL/testsuite/src
NetSSL_OpenSSL/testsuite/src/Driver.cpp
NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp
NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.h
NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.cpp
NetSSL_OpenSSL/testsuite/src/HTTPSClientTestSuite.h
NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.cpp
NetSSL_OpenSSL/testsuite/src/HTTPSServerTest.h
NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.cpp
NetSSL_OpenSSL/testsuite/src/HTTPSServerTestSuite.h
NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp
NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.h
NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.cpp
NetSSL_OpenSSL/testsuite/src/HTTPSTestServer.h
NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.cpp
NetSSL_OpenSSL/testsuite/src/NetSSLTestSuite.h
NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp
NetSSL_OpenSSL/testsuite/src/TCPServerTest.h
NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.cpp
NetSSL_OpenSSL/testsuite/src/TCPServerTestSuite.h
NetSSL_OpenSSL/testsuite/src/WinDriver.cpp
NetSSL_OpenSSL/testsuite/testrunner.xml
NetSSL_OpenSSL/testsuite/TestSuite.vmsbuild
NetSSL_OpenSSL/testsuite/TestSuite.xml
NetSSL_OpenSSL/testsuite/TestSuite_vs71.vcproj
NetSSL_OpenSSL/testsuite/TestSuite_vs80.vcproj
NEWS
README
Util

Просмотреть файл

@ -15,64 +15,79 @@ ifndef POCO_PREFIX
export POCO_PREFIX=/usr/local
endif
.PHONY: all libs cppunit tests samples install
.PHONY: all libexecs cppunit tests samples install
all: libs tests samples
all: libexecs tests samples
INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
COMPONENTS = Foundation XML Util Net
COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL
cppunit:
$(MAKE) -C $(POCO_BASE)/CppUnit
install: libs
install: libexecs
mkdir -p $(INSTALLDIR)/include/Poco
mkdir -p $(INSTALLDIR)/lib
mkdir -p $(INSTALLDIR)/bin
for comp in $(COMPONENTS) ; do \
if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
cp -Rf $(POCO_BASE)/$$comp/include/* $(INSTALLDIR)/include/ ; \
fi ; \
if [ -d "$(POCO_BUILD)/$$comp/bin" ] ; then \
find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -Rf {} $(INSTALLDIR)/bin \; ; \
fi ; \
done
find $(POCO_BUILD)/lib -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/lib \;
.PHONY: Foundation-lib XML-lib Util-lib Net-lib
.PHONY: Foundation-tests XML-tests Util-tests Net-tests
.PHONY: Foundation-samples XML-samples Util-samples Net-samples
.PHONY: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec
.PHONY: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests
.PHONY: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples
libs: Foundation-lib XML-lib Util-lib Net-lib
tests: Foundation-tests XML-tests Util-tests Net-tests
samples: Foundation-samples XML-samples Util-samples Net-samples
libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec
tests: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests
samples: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples
Foundation-lib:
Foundation-libexec:
$(MAKE) -C $(POCO_BASE)/Foundation
Foundation-tests: Foundation-lib cppunit
Foundation-tests: Foundation-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Foundation/testsuite
Foundation-samples: Foundation-lib
Foundation-samples: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/Foundation/samples
XML-lib: Foundation-lib
XML-libexec: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/XML
XML-tests: XML-lib cppunit
XML-tests: XML-libexec cppunit
$(MAKE) -C $(POCO_BASE)/XML/testsuite
XML-samples: XML-lib
XML-samples: XML-libexec
$(MAKE) -C $(POCO_BASE)/XML/samples
Util-lib: Foundation-lib XML-lib
Util-libexec: Foundation-libexec XML-libexec
$(MAKE) -C $(POCO_BASE)/Util
Util-tests: Util-lib cppunit
Util-tests: Util-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Util/testsuite
Util-samples: Util-lib
Util-samples: Util-libexec
$(MAKE) -C $(POCO_BASE)/Util/samples
Net-lib: Foundation-lib
Net-libexec: Foundation-libexec
$(MAKE) -C $(POCO_BASE)/Net
Net-tests: Net-lib cppunit
Net-tests: Net-libexec cppunit
$(MAKE) -C $(POCO_BASE)/Net/testsuite
Net-samples: Net-lib
Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec
$(MAKE) -C $(POCO_BASE)/Net/samples
NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL
NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite
NetSSL_OpenSSL-samples: NetSSL_OpenSSL-libexec
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples

Просмотреть файл

@ -1 +1 @@
1.3b1 (2006-11-17)
1.3-20061222 (2006-12-22)

Просмотреть файл

@ -1,5 +1,5 @@
#
# $Id: //poco/1.3/build/config/Linux#1 $
# $Id: //poco/1.3/build/config/Linux#2 $
#
# Linux
#
@ -41,7 +41,7 @@ SHAREDLIBLINKEXT = .so
CFLAGS =
CFLAGS32 =
CFLAGS64 =
CXXFLAGS =
CXXFLAGS = -Wall -Wno-sign-compare
CXXFLAGS32 =
CXXFLAGS64 =
LINKFLAGS =

Просмотреть файл

@ -12,7 +12,7 @@
LINKMODE = STATIC
POCO_TARGET_OSNAME = Linux
POCO_TARGET_OSARCH = ARM
TOOL = arm-ssv1-linux
TOOL = /usr/local/arm-ssv1-linux/bin/arm-ssv1-linux
#
# Define Tools
@ -21,6 +21,7 @@ CC = $(TOOL)-gcc
CXX = $(TOOL)-g++
LINK = $(CXX)
STRIP = $(TOOL)-strip
STRIPDBG = $(TOOL)-strip
LIB = $(TOOL)-ar -cr
RANLIB = $(TOOL)-ranlib
SHLIB = $(CXX) -shared -Wl,-soname,$(notdir $@) -Wl,-rpath,$(dir $@) -o $@

Просмотреть файл

@ -1,5 +1,5 @@
#
# $Id: //poco/1.3/build/rules/exec#1 $
# $Id: //poco/1.3/build/rules/exec#2 $
#
# exec
#
@ -37,6 +37,8 @@ shared_release: bindirs $(EXEC_RELEASE_SHARED)
$(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)
$(CPYDBG)
$(STRIPDBGCMD)
$(EXEC_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o)
@echo "** Building executable (release)" $@

Просмотреть файл

@ -1,5 +1,5 @@
#
# $Id: //poco/1.3/build/rules/global#2 $
# $Id: //poco/1.3/build/rules/global#3 $
#
# global
#
@ -22,6 +22,11 @@ ifndef POCO_BASE
$(error POCO_BASE is not defined.)
endif
#
# Include some optional make configuration
#
sinclude $(POCO_BASE)/config.build
#
# Check for POCO_BUILD
#
@ -130,7 +135,7 @@ endif
#
# Compose compiler flags
#
COMMONFLAGS = -DPOCO_BUILD_HOST=$(HOSTNAME)
COMMONFLAGS = -DPOCO_BUILD_HOST=$(HOSTNAME) $(POCO_FLAGS)
CFLAGS += $(COMMONFLAGS) $(SYSFLAGS)
CXXFLAGS += $(COMMONFLAGS) $(SYSFLAGS)
LINKFLAGS += $(COMMONFLAGS) $(SYSFLAGS)
@ -172,6 +177,17 @@ else
STRIPCMD = $(STRIP) $@
endif
#
# Remote debugging support
#
ifeq ($(strip $(STRIPDBG)),)
CPYDBG =
STRIPDBGCMD =
else
CPYDBG = cp $@ $@x
STRIPDBGCMD = $(STRIP) $@x
endif
#
# Make CC and CXX environment vars
#

Просмотреть файл

@ -13,43 +13,59 @@ set OPENSSL_LIB=%OPENSSL_DIR%\lib\VC
set INCLUDE=%INCLUDE%;%OPENSSL_INCLUDE%
set LIB=%LIB%;%OPENSSL_LIB%
set POCOBASE=%CD%
cd CppUnit
devenv /useenv /rebuild debug_shared CppUnit_vs71.sln
devenv /useenv /rebuild release_shared CppUnit_vs71.sln
cd ..
cd %POCOBASE%
cd Foundation
devenv /useenv /rebuild debug_shared Foundation_vs71.sln
devenv /useenv /rebuild release_shared Foundation_vs71.sln
cd samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd ..
cd ..
cd %POCOBASE%
cd XML
devenv /useenv /rebuild debug_shared XML_vs71.sln
devenv /useenv /rebuild release_shared XML_vs71.sln
cd samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd ..
cd ..
cd %POCOBASE%
cd Util
devenv /useenv /rebuild debug_shared Util_vs71.sln
devenv /useenv /rebuild release_shared Util_vs71.sln
cd samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd ..
cd ..
cd %POCOBASE%
cd Net
devenv /useenv /rebuild debug_shared Net_vs71.sln
devenv /useenv /rebuild release_shared Net_vs71.sln
cd samples
cd %POCOBASE%
cd NetSSL_OpenSSL
devenv /useenv /rebuild debug_shared NetSSL_OpenSSL_vs71.sln
devenv /useenv /rebuild release_shared NetSSL_OpenSSL_vs71.sln
cd %POCOBASE%
cd Foundation/samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd ..
cd ..
cd %POCOBASE%
cd XML/samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd %POCOBASE%
cd Util/samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd %POCOBASE%
cd Net/samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd %POCOBASE%
cd NetSSL_OpenSSL/samples
devenv /useenv /rebuild debug_shared samples_vs71.sln
devenv /useenv /rebuild release_shared samples_vs71.sln
cd %POCOBASE%

Просмотреть файл

@ -13,43 +13,59 @@ set OPENSSL_LIB=%OPENSSL_DIR%\lib\VC
set INCLUDE=%INCLUDE%;%OPENSSL_INCLUDE%
set LIB=%LIB%;%OPENSSL_LIB%
set POCOBASE=%CD%
cd CppUnit
devenv /useenv /rebuild debug_shared CppUnit_vs80.sln
devenv /useenv /rebuild release_shared CppUnit_vs80.sln
cd ..
cd %POCOBASE%
cd Foundation
devenv /useenv /rebuild debug_shared Foundation_vs80.sln
devenv /useenv /rebuild release_shared Foundation_vs80.sln
cd samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd ..
cd ..
cd %POCOBASE%
cd XML
devenv /useenv /rebuild debug_shared XML_vs80.sln
devenv /useenv /rebuild release_shared XML_vs80.sln
cd samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd ..
cd ..
cd %POCOBASE%
cd Util
devenv /useenv /rebuild debug_shared Util_vs80.sln
devenv /useenv /rebuild release_shared Util_vs80.sln
cd samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd ..
cd ..
cd %POCOBASE%
cd Net
devenv /useenv /rebuild debug_shared Net_vs80.sln
devenv /useenv /rebuild release_shared Net_vs80.sln
cd samples
cd %POCOBASE%
cd NetSSL_OpenSSL
devenv /useenv /rebuild debug_shared NetSSL_OpenSSL_vs80.sln
devenv /useenv /rebuild release_shared NetSSL_OpenSSL_vs80.sln
cd %POCOBASE%
cd Foundation/samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd ..
cd ..
cd %POCOBASE%
cd XML/samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd %POCOBASE%
cd Util/samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd %POCOBASE%
cd Net/samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd %POCOBASE%
cd NetSSL_OpenSSL/samples
devenv /useenv /rebuild debug_shared samples_vs80.sln
devenv /useenv /rebuild release_shared samples_vs80.sln
cd %POCOBASE%

Просмотреть файл

@ -2,4 +2,5 @@ Foundation
XML
Util
Net
NetSSL_OpenSSL
CppUnit