Parcourir la source

updated CHANGELOG; CMake fixes for OS X; doc updates; release script improvements

Guenter Obiltschnig il y a 11 ans
Parent
commit
d247e1cf05

+ 1 - 0
CHANGELOG

@@ -57,6 +57,7 @@ Release 1.6.0 (2014-12-22)
 - Poco::URI: added new constructor to create URI from Path
 - Various documentation and style fixes
 - Removed support (project/solution files) for Visual Studio.NET 2003 and Visual Studio 2005.
+- Improved CMake support
 
 
 Release 1.5.4 (2014-10-14)

+ 13 - 8
CMakeLists.txt

@@ -71,21 +71,21 @@ include(PocoMacros)
 option(ENABLE_XML "Enable the XML" ON)
 option(ENABLE_JSON "Enable the JSON" ON)
 option(ENABLE_MONGODB "Enable MongoDB" ON)
-option(ENABLE_PDF "Enable PDF" ON)
+option(ENABLE_PDF "Enable PDF" OFF)
 option(ENABLE_UTIL "Enable Util" ON)
 option(ENABLE_NET "Enable Net" ON)
 option(ENABLE_NETSSL "Enable NetSSL" ON)
-option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" ON)
+option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" OFF)
 option(ENABLE_CRYPTO "Enable Crypto" ON)
 option(ENABLE_DATA "Enable Data" ON)
 option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON)
 option(ENABLE_DATA_MYSQL "Enable Data MySQL" ON)
 option(ENABLE_DATA_ODBC "Enable Data ODBC" ON)
-option(ENABLE_SEVENZIP "Enable SevenZip" ON)
+option(ENABLE_SEVENZIP "Enable SevenZip" OFF)
 option(ENABLE_ZIP "Enable Zip" ON)
-option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" ON)
-option(ENABLE_CPPPARSER "Enable C++ parser" ON)
-option(ENABLE_POCODOC "Enable Poco Documentation Generator" ON)
+option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" OFF)
+option(ENABLE_CPPPARSER "Enable C++ parser" OFF)
+option(ENABLE_POCODOC "Enable Poco Documentation Generator" OFF)
 option(ENABLE_PAGECOMPILER "Enable PageCompiler" ON)
 option(ENABLE_PAGECOMPILER_FILE2PAGE "Enable File2Page" ON)
 
@@ -137,8 +137,13 @@ endif(WIN32)
 if (UNIX AND NOT ANDROID )
   add_definitions( -DPOCO_OS_FAMILY_UNIX )
   # Standard 'must be' defines
-  add_definitions( -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64)
-  set(SYSLIBS  pthread dl rt)
+  if (APPLE)
+    add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64)
+    set(SYSLIBS  dl)
+  else (APPLE)
+    add_definitions( -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64)
+    set(SYSLIBS  pthread dl rt)
+  endif (APPLE)
 endif(UNIX AND NOT ANDROID )
 
 if (CMAKE_SYSTEM MATCHES "SunOS")

+ 1 - 2
Foundation/samples/CMakeLists.txt

@@ -16,5 +16,4 @@ add_subdirectory(grep)
 add_subdirectory(hmacmd5)
 add_subdirectory(inflate)
 add_subdirectory(md5)
-add_subdirectory(uuidgen
-)
+add_subdirectory(uuidgen)

+ 3 - 5
doc/00200-GettingStarted.page

@@ -292,7 +292,7 @@ available:
 
 As an alternative to the platform specific Makefiles and Solutions, CMake can be used
 to do build Poco. CMake is a cross platform Makefile generator that also supports 
-Microsoft Visual Studio and Apple XCode.
+Microsoft Visual Studio and Apple Xcode.
 Poco requires CMake 3.0 or higher. Static binaries for many platforms can be downloaded from http://www.cmake.org/
 
 CMake supports out of source builds and this is the recommended way to build Poco using CMake.
@@ -305,7 +305,7 @@ and you like to build Poco with the generated Makefiles just type the following
     $ cmake ..
     $ make
 
-This will build Poco in a subdirectory cmake_build. All files produced during build are located in this directory.
+This will build Poco in a subdirectory <*cmake_build*>. All files produced during build are located in this directory.
 
 CMake allows you to set some build time options. As an example: to disable the SevenZip support
 type the following command:
@@ -313,15 +313,13 @@ type the following command:
     $ cmake -DENABLE_SEVENZIP=OFF ..
 
 Similar options are available for other components (see: CMakeLists.txt).
-----
 
 
 !!!Tutorials And Sample Code
 
 Introductory documentation consisting of various documents and tutorials
 in the form of slide decks can be found at the
-[[http://pocoproject.org/documentation/ POCO C++ Libraries
-Documentation]] page.
+[[http://pocoproject.org/documentation/ POCO C++ Libraries Documentation]] page.
 
 Sample applications demonstrating the various features of the POCO C++
 Libraries are delivered with the source code. Every library's source

+ 3 - 0
doc/99100-ReleaseNotes.page

@@ -59,6 +59,7 @@ AAAIntroduction
   - Poco::URI: added new constructor to create URI from Path
   - Various documentation and style fixes
   - Removed support (project/solution files) for Visual Studio.NET 2003 and Visual Studio 2005.
+  - Improved CMake support
 
 
 !!Incompatible Changes and Possible Transition Issues
@@ -67,6 +68,8 @@ AAAIntroduction
     lead to diagnostic messages while compiling.
   - Support (project and solution files) for MS Visual Studio 2003 and 2005 has been
     removed; the oldest officially supported VS version is 2008 (MSVC version 9.0).
+  - MongoDB: The ObjectId class has a new constructor taking a std::string containing a 
+    hexadecimal representation of the object ID.
 
 
 !!!Release 1.5.4

+ 78 - 62
release/script/cpproj

@@ -30,27 +30,31 @@ if [ -d ${src}/include ] ; then
 	mkdir -p ${dst}/include
 	cp -R ${src}/include/* ${dst}/include
 fi
-cp ${src}/src/* ${dst}/src
-cp ${src}/*.sln ${dst}
-cp ${src}/*.vcproj ${dst}
-cp ${src}/*.vcxproj ${dst}
-cp ${src}/*.vcxproj.filters ${dst}
-cp ${src}/Makefile* ${dst}
-cp ${src}/*.make ${dst}
-cp ${src}/*.progen ${dst}
-if [ "`find ${src} -name '*.vmsbuild'`" != "" ] ; then
-	cp ${src}/*.vmsbuild ${dst}
-fi
+cp ${src}/src/* ${dst}/src >/dev/null 2>&1
+cp ${src}/*.sln ${dst} >/dev/null 2>&1
+cp ${src}/*.vcproj ${dst} >/dev/null 2>&1
+cp ${src}/*.vcxproj ${dst} >/dev/null 2>&1
+cp ${src}/*.vcxproj.filters ${dst} >/dev/null 2>&1
+cp ${src}/Makefile* ${dst} >/dev/null 2>&1
+cp ${src}/*.make ${dst} >/dev/null 2>&1
+cp ${src}/*.progen ${dst} >/dev/null 2>&1
+cp ${src}/CMakeLists.txt ${dst} >/dev/null 2>&1
+
 if [ "`find ${src} -name '*.vxbuild'`" != "" ] ; then
-	cp ${src}/*.vxbuild ${dst}
+	cp ${src}/*.vxbuild ${dst} >/dev/null 2>&1
 fi
 if [ "`find ${src} -name '*.bndlspec'`" != "" ] ; then
-	cp ${src}/*.bndlspec ${dst}
+	cp ${src}/*.bndlspec ${dst} >/dev/null 2>&1
 fi
 
 if [ -f ${src}/.project ] ; then
-	cp ${src}/.project ${dst}
-	cp ${src}/.cdtproject ${dst}
+	cp ${src}/.project ${dst} >/dev/null 2>&1
+	cp ${src}/.cdtproject ${dst} >/dev/null 2>&1
+fi
+
+if [ -d ${src}/cmake ] ; then
+	mkdir -p ${dst}/cmake
+	cp -R ${src}/cmake/* ${dst}/cmake >/dev/null 2>&1
 fi
 
 if [ -d ${src}/testsuite ] ; then
@@ -59,38 +63,42 @@ if [ -d ${src}/testsuite ] ; then
 
 	if [ -d ${src}/testsuite/data ] ; then
 		mkdir -p ${dst}/testsuite/data
-		cp -R ${src}/testsuite/data/* ${dst}/testsuite/data
+		cp -R ${src}/testsuite/data/* ${dst}/testsuite/data >/dev/null 2>&1
 	fi
 
 	if [ -d ${src}/testsuite/bundles ] ; then
 		mkdir -p ${dst}/testsuite/bundles
-		cp -R ${src}/testsuite/bundles/* ${dst}/testsuite/bundles
+		cp -R ${src}/testsuite/bundles/* ${dst}/testsuite/bundles >/dev/null 2>&1
 	fi
 
-	cp ${src}/testsuite/src/* ${dst}/testsuite/src
-	cp ${src}/testsuite/*.vcproj ${dst}/testsuite
-	cp ${src}/testsuite/*.vcxproj ${dst}/testsuite
-	cp ${src}/testsuite/*.vcxproj.filters ${dst}/testsuite
-	cp ${src}/testsuite/Makefile* ${dst}/testsuite
-	cp ${src}/testsuite/*.make ${dst}/testsuite
-	cp ${src}/testsuite/*.progen ${dst}/testsuite
-	if [ "`find ${src}/testsuite -name '*.vmsbuild'`" != "" ] ; then
-		cp ${src}/testsuite/*.vmsbuild ${dst}/testsuite
+	cp ${src}/testsuite/src/* ${dst}/testsuite/src >/dev/null 2>&1
+	cp ${src}/testsuite/*.vcproj ${dst}/testsuite >/dev/null 2>&1
+	cp ${src}/testsuite/*.vcxproj ${dst}/testsuite >/dev/null 2>&1
+	cp ${src}/testsuite/*.vcxproj.filters ${dst}/testsuite >/dev/null 2>&1
+	cp ${src}/testsuite/Makefile* ${dst}/testsuite >/dev/null 2>&1
+	cp ${src}/testsuite/*.make ${dst}/testsuite >/dev/null 2>&1
+	cp ${src}/testsuite/*.progen ${dst}/testsuite >/dev/null 2>&1
+	cp ${src}/testsuite/CMakeLists.txt ${dst}/testsuite >/dev/null 2>&1
+
+	if [ -d ${src}/testsuite/cmake ] ; then
+		mkdir -p ${dst}/testsuite/cmake
+		cp -R ${src}/testsuite/cmake/* ${dst}/testsuite/cmake >/dev/null 2>&1
 	fi
+
 	if [ "`find ${src}/testsuite -name '*.opt'`" != "" ] ; then
-		cp ${src}/testsuite/*.opt ${dst}/testsuite
+		cp ${src}/testsuite/*.opt ${dst}/testsuite >/dev/null 2>&1
 	fi
 	if [ "`find ${src}/testsuite -name '*.vxbuild'`" != "" ] ; then
-		cp ${src}/testsuite/*.vxbuild ${dst}/testsuite
+		cp ${src}/testsuite/*.vxbuild ${dst}/testsuite >/dev/null 2>&1
 	fi
 	if [ "`find ${src}/testsuite -name '*.properties'`" != "" ] ; then
-		cp ${src}/testsuite/*.properties ${dst}/testsuite
+		cp ${src}/testsuite/*.properties ${dst}/testsuite >/dev/null 2>&1
 	fi
 	if [ "`find ${src}/testsuite -name '*.xml'`" != "" ] ; then
-		cp ${src}/testsuite/*.xml ${dst}/testsuite
+		cp ${src}/testsuite/*.xml ${dst}/testsuite >/dev/null 2>&1
 	fi
 	if [ "`find ${src}/testsuite -name '*.pem'`" != "" ] ; then
-		cp ${src}/testsuite/*.pem ${dst}/testsuite
+		cp ${src}/testsuite/*.pem ${dst}/testsuite >/dev/null 2>&1
 	fi
 fi
 
@@ -102,16 +110,17 @@ for extradir in $extradirs ;
 do
 	if [ -d ${src}/${extradir} ] ; then
 		mkdir -p ${dst}/${extradir}
-		cp -R ${src}/${extradir}/* ${dst}/${extradir}
+		cp -R ${src}/${extradir}/* ${dst}/${extradir} >/dev/null 2>&1
 	fi
 done
 
 if [ -d ${src}/samples ] ; then
 	mkdir -p ${dst}/samples
 
-	cp ${src}/samples/*.sln ${dst}/samples
-	cp ${src}/samples/Makefile* ${dst}/samples
-	cp ${src}/samples/*.progen ${dst}/samples
+	cp ${src}/samples/*.sln ${dst}/samples >/dev/null 2>&1
+	cp ${src}/samples/Makefile* ${dst}/samples >/dev/null 2>&1
+	cp ${src}/samples/*.progen ${dst}/samples >/dev/null 2>&1
+	cp ${src}/samples/CMakeLists.txt ${dst}/samples >/dev/null 2>&1
 	
 	samples=`find ${src}/samples/* -type d -print -prune | sed "s:^.*/::"`
 	
@@ -121,89 +130,96 @@ if [ -d ${src}/samples ] ; then
 			mkdir -p ${dst}/samples/${sample}
 			if [ -d ${src}/samples/${sample}/src ] ; then
 				mkdir -p ${dst}/samples/${sample}/src
-				cp ${src}/samples/${sample}/src/* ${dst}/samples/${sample}/src
+				cp ${src}/samples/${sample}/src/* ${dst}/samples/${sample}/src >/dev/null 2>&1
 			fi
 
 			if [ -d ${src}/samples/${sample}/bundle ] ; then
 				mkdir -p ${dst}/samples/${sample}/bundle
-				cp -R ${src}/samples/${sample}/bundle/* ${dst}/samples/${sample}/bundle
+				cp -R ${src}/samples/${sample}/bundle/* ${dst}/samples/${sample}/bundle >/dev/null 2>&1
 			fi
 
 			if [ -d ${src}/samples/${sample}/res ] ; then
 				mkdir -p ${dst}/samples/${sample}/res
-				cp -R ${src}/samples/${sample}/res/* ${dst}/samples/${sample}/res
+				cp -R ${src}/samples/${sample}/res/* ${dst}/samples/${sample}/res >/dev/null 2>&1
 			fi
 
 			if [ -d ${src}/samples/${sample}/xml ] ; then
 				mkdir -p ${dst}/samples/${sample}/xml
-				cp -R ${src}/samples/${sample}/xml/* ${dst}/samples/${sample}/xml
+				cp -R ${src}/samples/${sample}/xml/* ${dst}/samples/${sample}/xml >/dev/null 2>&1
 			fi
 
 			if [ -d ${src}/samples/${sample}/media ] ; then
 				mkdir -p ${dst}/samples/${sample}/media
-				cp -R ${src}/samples/${sample}/media/* ${dst}/samples/${sample}/media
+				cp -R ${src}/samples/${sample}/media/* ${dst}/samples/${sample}/media >/dev/null 2>&1
+			fi
+			
+			cp ${src}/samples/${sample}/*.vcproj ${dst}/samples/${sample} >/dev/null 2>&1
+			cp ${src}/samples/${sample}/*.vcxproj ${dst}/samples/${sample} >/dev/null 2>&1
+			cp ${src}/samples/${sample}/*.vcxproj.filters ${dst}/samples/${sample} >/dev/null 2>&1
+			cp ${src}/samples/${sample}/Makefile* ${dst}/samples/${sample} >/dev/null 2>&1
+			cp ${src}/samples/${sample}/*.make ${dst}/samples/${sample} >/dev/null 2>&1
+			cp ${src}/samples/${sample}/*.progen ${dst}/samples/${sample} >/dev/null 2>&1
+			cp ${src}/samples/${sample}/CMakeLists.txt ${dst}/samples/${sample} >/dev/null 2>&1
+
+			if [ -d ${src}/samples/${sample}/cmake ] ; then
+				mkdir -p ${dst}/samples/${sample}/cmake
+				cp -R ${src}/samples/${sample}/cmake/* ${dst}/samples/${sample}/cmake >/dev/null 2>&1
 			fi
 			
-			cp ${src}/samples/${sample}/*.vcproj ${dst}/samples/${sample}
-			cp ${src}/samples/${sample}/*.vcxproj ${dst}/samples/${sample}
-			cp ${src}/samples/${sample}/*.vcxproj.filters ${dst}/samples/${sample}
-			cp ${src}/samples/${sample}/Makefile* ${dst}/samples/${sample}
-			cp ${src}/samples/${sample}/*.make ${dst}/samples/${sample}
-			cp ${src}/samples/${sample}/*.progen ${dst}/samples/${sample}
 			if [ "`find ${src}/samples/${sample}/ -name '*.vmsbuild'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.vmsbuild ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.vmsbuild ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.opt'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.opt ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.opt ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.vxbuild'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.vxbuild ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.vxbuild ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.properties'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.properties ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.properties ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.ini'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.ini ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.ini ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.xml'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.xml ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.xml ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.wsdl'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.wsdl ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.wsdl ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.pem'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.pem ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.pem ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			if [ "`find ${src}/samples/${sample}/ -name '*.bndlspec'`" != "" ] ; then
-				cp ${src}/samples/${sample}/*.bndlspec ${dst}/samples/${sample}
+				cp ${src}/samples/${sample}/*.bndlspec ${dst}/samples/${sample} >/dev/null 2>&1
 			fi
 			
 			if [ -d ${src}/samples/${sample}/include ] ; then
 				mkdir -p ${dst}/samples/${sample}/include
-				cp -R ${src}/samples/${sample}/include/* ${dst}/samples/${sample}/include
+				cp -R ${src}/samples/${sample}/include/* ${dst}/samples/${sample}/include >/dev/null 2>&1
 			fi	
 	
 			if [ -d ${src}/samples/${sample}/bin ] ; then
 				mkdir -p ${dst}/samples/${sample}/bin
 				if [ "`find ${src}/samples/${sample}/bin/ -name '*.properties'`" != "" ] ; then
-					cp ${src}/samples/${sample}/bin/*.properties ${dst}/samples/${sample}/bin
+					cp ${src}/samples/${sample}/bin/*.properties ${dst}/samples/${sample}/bin >/dev/null 2>&1
 				fi
 				if [ "`find ${src}/samples/${sample}/bin/ -name '*.ini'`" != "" ] ; then
-					cp ${src}/samples/${sample}/bin/*.ini ${dst}/samples/${sample}/bin
+					cp ${src}/samples/${sample}/bin/*.ini ${dst}/samples/${sample}/bin >/dev/null 2>&1
 				fi
 				if [ "`find ${src}/samples/${sample}/bin/ -name '*.xml'`" != "" ] ; then
-					cp ${src}/samples/${sample}/bin/*.xml ${dst}/samples/${sample}/bin
+					cp ${src}/samples/${sample}/bin/*.xml ${dst}/samples/${sample}/bin >/dev/null 2>&1
 				fi
 				if [ "`find ${src}/samples/${sample}/bin/ -name '*.wsdl'`" != "" ] ; then
-					cp ${src}/samples/${sample}/bin/*.wsdl ${dst}/samples/${sample}/bin
+					cp ${src}/samples/${sample}/bin/*.wsdl ${dst}/samples/${sample}/bin >/dev/null 2>&1
 				fi
 				if [ "`find ${src}/samples/${sample}/bin/ -name '*.pem'`" != "" ] ; then
-					cp ${src}/samples/${sample}/bin/*.pem ${dst}/samples/${sample}/bin
+					cp ${src}/samples/${sample}/bin/*.pem ${dst}/samples/${sample}/bin >/dev/null 2>&1
 				fi
 			fi
 		else
 			mkdir -p ${dst}/samples/${sample}
-			cp -R ${src}/samples/${sample}/* ${dst}/samples/${sample}
+			cp -R ${src}/samples/${sample}/* ${dst}/samples/${sample} >/dev/null 2>&1
 		fi
 	done
 fi

+ 46 - 44
release/script/mkrelease

@@ -79,6 +79,7 @@ mkdir -p ${target}
 mkdir -p ${target}/doc
 mkdir -p ${target}/contrib
 mkdir -p ${target}/patches
+mkdir -p ${target}/cmake
 
 
 #
@@ -98,6 +99,9 @@ cp ${POCO_BASE}/doc/*.page ${target}/doc
 cp -R ${POCO_BASE}/contrib/* ${target}/contrib
 cp -R ${POCO_BASE}/patches/* ${target}/patches
 
+cp -R ${POCO_BASE}/cmake/* ${target}/cmake
+cp ${POCO_BASE}/CMakeLists.txt ${target}
+
 
 #
 # build system
@@ -116,10 +120,8 @@ cp ${POCO_BASE}/build/script/makeldpath ${target}/build/script
 cp ${POCO_BASE}/build/script/shlibln ${target}/build/script
 cp ${POCO_BASE}/build/script/projname ${target}/build/script
 cp ${POCO_BASE}/build/script/vxprogen ${target}/build/script
-cp ${POCO_BASE}/build/vms/* ${target}/build/vms
 cp ${POCO_BASE}/buildwin.cmd ${target}
 cp ${POCO_BASE}/configure ${target}
-cp ${POCO_BASE}/buildvms.com ${target}
 cp ${POCO_BASE}/libversion ${target}
 
 if [ $internal = 1 ] ; then
@@ -140,28 +142,28 @@ mkdir -p ${target}/CppUnit/WinTestRunner/include/WinTestRunner
 mkdir -p ${target}/CppUnit/WinTestRunner/src
 mkdir -p ${target}/CppUnit/WinTestRunner/res
 
-cp ${POCO_BASE}/CppUnit/doc/* ${target}/CppUnit/doc
-cp ${POCO_BASE}/CppUnit/include/CppUnit/* ${target}/CppUnit/include/CppUnit
-cp ${POCO_BASE}/CppUnit/src/* ${target}/CppUnit/src
-cp ${POCO_BASE}/CppUnit/*.sln ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/*.vcproj ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/*.vcxproj ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/*.vcxproj.filters ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/*.vcxproj.user ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/Makefile ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/*.vmsbuild ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/*.vxbuild ${target}/CppUnit
-cp ${POCO_BASE}/CppUnit/*.progen ${target}/CppUnit
-
-cp ${POCO_BASE}/CppUnit/WinTestRunner/include/WinTestRunner/* ${target}/CppUnit/WinTestRunner/include/WinTestRunner
-cp ${POCO_BASE}/CppUnit/WinTestRunner/src/* ${target}/CppUnit/WinTestRunner/src
-cp ${POCO_BASE}/CppUnit/WinTestRunner/res/WinTestRunner.rc ${target}/CppUnit/WinTestRunner/res
-cp ${POCO_BASE}/CppUnit/WinTestRunner/res/Resource.h ${target}/CppUnit/WinTestRunner/res
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcproj ${target}/CppUnit/WinTestRunner
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj ${target}/CppUnit/WinTestRunner
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.filters ${target}/CppUnit/WinTestRunner
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.user ${target}/CppUnit/WinTestRunner
-cp ${POCO_BASE}/CppUnit/WinTestRunner/*.progen ${target}/CppUnit/WinTestRunner
+cp ${POCO_BASE}/CppUnit/doc/* ${target}/CppUnit/doc >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/include/CppUnit/* ${target}/CppUnit/include/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/src/* ${target}/CppUnit/src >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.sln ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.vcproj ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.vcxproj ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.vcxproj.filters ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.vcxproj.user ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/Makefile ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.vmsbuild ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.vxbuild ${target}/CppUnit >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/*.progen ${target}/CppUnit >/dev/null 2>&1
+
+cp ${POCO_BASE}/CppUnit/WinTestRunner/include/WinTestRunner/* ${target}/CppUnit/WinTestRunner/include/WinTestRunner >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/src/* ${target}/CppUnit/WinTestRunner/src >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/res/WinTestRunner.rc ${target}/CppUnit/WinTestRunner/res >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/res/Resource.h ${target}/CppUnit/WinTestRunner/res >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcproj ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.filters ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/*.vcxproj.user ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
+cp ${POCO_BASE}/CppUnit/WinTestRunner/*.progen ${target}/CppUnit/WinTestRunner >/dev/null 2>&1
 
 
 #
@@ -361,46 +363,46 @@ ENDOFSCRIPT
 
 
 #
-# Create Visual Studio 7.1 build script
+# Create Visual Studio 9 build script
 #
-cat >${target}/build_vs71.cmd <<'ENDOFSCRIPT'
+cat >${target}/build_vs90.cmd <<'ENDOFSCRIPT'
 @echo off
-if defined VS71COMNTOOLS (
-call "%VS71COMNTOOLS%\vsvars32.bat")
-buildwin 71 build shared both Win32 samples
+if defined VS90COMNTOOLS (
+call "%VS90COMNTOOLS%\vsvars32.bat")
+buildwin 90 build shared both Win32 samples
 ENDOFSCRIPT
 
 
 #
-# Create Visual Studio 8 build script
+# Create Visual Studio 10 build script
 #
-cat >${target}/build_vs80.cmd <<'ENDOFSCRIPT'
+cat >${target}/build_vs100.cmd <<'ENDOFSCRIPT'
 @echo off
-if defined VS80COMNTOOLS (
-call "%VS80COMNTOOLS%\vsvars32.bat")
-buildwin 80 build shared both Win32 samples
+if defined VS100COMNTOOLS (
+call "%VS100COMNTOOLS%\vsvars32.bat")
+buildwin 100 build shared both Win32 samples
 ENDOFSCRIPT
 
 
 #
-# Create Visual Studio 9 build script
+# Create Visual Studio 11 build script
 #
-cat >${target}/build_vs90.cmd <<'ENDOFSCRIPT'
+cat >${target}/build_vs110.cmd <<'ENDOFSCRIPT'
 @echo off
-if defined VS90COMNTOOLS (
-call "%VS90COMNTOOLS%\vsvars32.bat")
-buildwin 90 build shared both Win32 samples
+if defined VS110COMNTOOLS (
+call "%VS110COMNTOOLS%\vsvars32.bat")
+buildwin 110 build shared both Win32 samples
 ENDOFSCRIPT
 
 
 #
-# Create Visual Studio 10 build script
+# Create Visual Studio 12 build script
 #
-cat >${target}/build_vs100.cmd <<'ENDOFSCRIPT'
+cat >${target}/build_vs120.cmd <<'ENDOFSCRIPT'
 @echo off
-if defined VS100COMNTOOLS (
-call "%VS100COMNTOOLS%\vsvars32.bat")
-buildwin 100 build shared both Win32 samples
+if defined VS120COMNTOOLS (
+call "%VS120COMNTOOLS%\vsvars32.bat")
+buildwin 120 build shared both Win32 samples
 ENDOFSCRIPT