From 50d31a1b1745fb7b6aa7ca2f1080bfff27ef161e Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Tue, 6 Oct 2015 15:41:53 +0200 Subject: [PATCH] configure: add options --minimal, --typical and --everything; Makefile: install target respects OMIT --- Makefile | 2 +- configure | 22 +++++++++++++++++++++- release/script/mkrelease | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f108dab76..23f1e36df 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ install: libexecs mkdir -p $(INSTALLDIR)/include/Poco mkdir -p $(INSTALLDIR)/lib mkdir -p $(INSTALLDIR)/bin - for comp in $(COMPONENTS) ; do \ + for comp in $(filter-out $(foreach f,$(OMIT),$f%),$(COMPONENTS)) ; do \ if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ cp -Rf $(POCO_BASE)/$$comp/include/* $(INSTALLDIR)/include/ ; \ fi ; \ diff --git a/configure b/configure index 52568a3fc..582eedd1b 100755 --- a/configure +++ b/configure @@ -40,6 +40,15 @@ Options: --no-samples Do not build samples. + --minimal + Build only Foundation, XML, JSON, Util and Net. + + --typical (default) + Build only Foundation, XML, JSON, Util, Net, Crypto, NetSSL, Data/SQLite and Zip. + + --everything + Build everything. + --no-wstring Compile with -DPOCO_NO_WSTRING. Useful if your C++ compiler does not support std::wstring @@ -126,7 +135,6 @@ cd $build tests=1 samples=1 flags="" -omit="" includepath="" librarypath="" odbclib="" @@ -134,6 +142,9 @@ odbcinclude="" unbundled="" static="" shared="" +omitMinimal="Crypto NetSSL_OpenSSL Zip Data Data/SQLite Data/ODBC Data/MySQL MongoDB PDF CppParser PageCompiler" +omitTypical="Data/ODBC Data/MySQL MongoDB PDF CppParser" +omit=$omitTypical # parse arguments while [ $# -ge 1 ]; do case "$1" in @@ -199,6 +210,15 @@ while [ $# -ge 1 ]; do unbundled=1 ;; + --minimal) + omit=$omitMinimal ;; + + --typical) + omit=$omitTypical ;; + + --everything) + omit="" ;; + --static) static=1 ;; diff --git a/release/script/mkrelease b/release/script/mkrelease index f4911e6df..3192c9b8f 100755 --- a/release/script/mkrelease +++ b/release/script/mkrelease @@ -241,7 +241,7 @@ install: libexecs mkdir -p $(INSTALLDIR)/include/Poco mkdir -p $(INSTALLDIR)/lib mkdir -p $(INSTALLDIR)/bin - for comp in $(COMPONENTS) ; do \ + for comp in $(filter-out $(foreach f,$(OMIT),$f%),$(COMPONENTS)) ; do \ if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ cp -Rf $(POCO_BASE)/$$comp/include/* $(INSTALLDIR)/include/ ; \ fi ; \