From 8c53f354e5dda769569afd20fb907efd37482806 Mon Sep 17 00:00:00 2001 From: Marian Krivos Date: Mon, 23 Apr 2012 10:51:39 +0000 Subject: [PATCH] added PDF module to gmake revision bump to 1.5.0 --- DLLVersion.rc | 4 ++-- Foundation/include/Poco/Version.h | 2 +- Makefile | 19 ++++++++++++++++--- libversion | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/DLLVersion.rc b/DLLVersion.rc index 08811521c..224e94602 100644 --- a/DLLVersion.rc +++ b/DLLVersion.rc @@ -4,8 +4,8 @@ #include "afxres.h" -#define POCO_VERSION 1,4,3,0 -#define POCO_VERSION_STR "1.4.3" +#define POCO_VERSION 1,5,0,0 +#define POCO_VERSION_STR "1.5.0" VS_VERSION_INFO VERSIONINFO FILEVERSION POCO_VERSION diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h index 6d81dc7ae..ae4c108a3 100644 --- a/Foundation/include/Poco/Version.h +++ b/Foundation/include/Poco/Version.h @@ -54,7 +54,7 @@ // Ax are alpha releases // Bx are beta releases // -#define POCO_VERSION 0x010404D1 +#define POCO_VERSION 0x010500D1 #endif // Foundation_Version_INCLUDED diff --git a/Makefile b/Makefile index 3055a78bc..321871ebe 100644 --- a/Makefile +++ b/Makefile @@ -44,9 +44,9 @@ install: libexecs find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; -libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec -tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests -samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples +libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec PDF-libexec +tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests +samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples .PHONY: $(libexecs) .PHONY: $(tests) @@ -155,6 +155,16 @@ PageCompiler-samples: PageCompiler-libexec PageCompiler/File2Page-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec $(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page +PDF-libexec: Foundation-libexec + $(MAKE) -C $(POCO_BASE)/PDF + +PDF-tests: PDF-libexec cppunit + $(MAKE) -C $(POCO_BASE)/PDF/testsuite + +PDF-samples: PDF-libexec + $(MAKE) -C $(POCO_BASE)/PDF/samples + + clean: $(MAKE) -C $(POCO_BASE)/Foundation clean $(MAKE) -C $(POCO_BASE)/Foundation/testsuite clean @@ -189,6 +199,9 @@ clean: $(MAKE) -C $(POCO_BASE)/PageCompiler clean $(MAKE) -C $(POCO_BASE)/PageCompiler/samples clean $(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page clean + $(MAKE) -C $(POCO_BASE)/PDF clean + $(MAKE) -C $(POCO_BASE)/PDF/testsuite clean + $(MAKE) -C $(POCO_BASE)/PDF/samples clean $(MAKE) -C $(POCO_BASE)/CppUnit clean distclean: diff --git a/libversion b/libversion index f0c2fe3ee..6802dd7b8 100644 --- a/libversion +++ b/libversion @@ -1 +1 @@ -12 +14