From: helge Date: Sat, 27 Aug 2005 12:10:37 +0000 (+0000) Subject: added PCH support X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d2a88f9abf08bbb1a0b4769676467addebd403d;p=sope added PCH support git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1086 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- diff --git a/sope-core/ChangeLog b/sope-core/ChangeLog index 3483bb1f..0e7e8249 100644 --- a/sope-core/ChangeLog +++ b/sope-core/ChangeLog @@ -1,3 +1,7 @@ +2005-08-26 Helge Hess + + * all makefiles: add common.h as the precompiled header file + 2005-08-17 Helge Hess * added sope-core umbrella framework diff --git a/sope-core/EOControl/GNUmakefile b/sope-core/EOControl/GNUmakefile index 4257acca..4369b3f6 100644 --- a/sope-core/EOControl/GNUmakefile +++ b/sope-core/EOControl/GNUmakefile @@ -9,6 +9,7 @@ else FRAMEWORK_NAME = EOControl endif +libEOControl_PCH_FILE = common.h libEOControl_DLL_DEF = libEOControl.def libEOControl_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libEOControl_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) diff --git a/sope-core/EOCoreData/GNUmakefile b/sope-core/EOCoreData/GNUmakefile index f9fdc86b..cb2dd770 100644 --- a/sope-core/EOCoreData/GNUmakefile +++ b/sope-core/EOCoreData/GNUmakefile @@ -9,6 +9,7 @@ else FRAMEWORK_NAME = EOCoreData endif +libEOCoreData_PCH_FILE = common.h libEOCoreData_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libEOCoreData_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) diff --git a/sope-core/NGExtensions/ChangeLog b/sope-core/NGExtensions/ChangeLog index 4e09191a..b871e4f5 100644 --- a/sope-core/NGExtensions/ChangeLog +++ b/sope-core/NGExtensions/ChangeLog @@ -1,3 +1,9 @@ +2005-08-26 Helge Hess + + * added common.h files to support PCH compilation of subprojects (just + include the parent common.h and are not required for Xcode builds) + (v4.5.173) + 2005-08-20 Helge Hess * EOExt.subproj: code cleanups, added a README.txt (v4.5.172) diff --git a/sope-core/NGExtensions/EOExt.subproj/GNUmakefile b/sope-core/NGExtensions/EOExt.subproj/GNUmakefile index 860c8302..1e6ad7e6 100644 --- a/sope-core/NGExtensions/EOExt.subproj/GNUmakefile +++ b/sope-core/NGExtensions/EOExt.subproj/GNUmakefile @@ -5,6 +5,8 @@ include ../../common.make SUBPROJECT_NAME = EOExt +EOExt_PCH_FILE = common.h + EOExt_OBJC_FILES = \ EOCacheDataSource.m \ EOCompoundDataSource.m \ diff --git a/sope-core/NGExtensions/EOExt.subproj/common.h b/sope-core/NGExtensions/EOExt.subproj/common.h new file mode 100644 index 00000000..1898d06d --- /dev/null +++ b/sope-core/NGExtensions/EOExt.subproj/common.h @@ -0,0 +1 @@ +#include "../common.h" diff --git a/sope-core/NGExtensions/FdExt.subproj/GNUmakefile b/sope-core/NGExtensions/FdExt.subproj/GNUmakefile index 15ded15e..466eb9e4 100644 --- a/sope-core/NGExtensions/FdExt.subproj/GNUmakefile +++ b/sope-core/NGExtensions/FdExt.subproj/GNUmakefile @@ -5,6 +5,8 @@ include ../../common.make SUBPROJECT_NAME = FdExt +FdExt_PCH_FILE = common.h + FdExt_OBJC_FILES = \ NSArray+enumerator.m \ NSAutoreleasePool+misc.m \ diff --git a/sope-core/NGExtensions/FdExt.subproj/common.h b/sope-core/NGExtensions/FdExt.subproj/common.h new file mode 100644 index 00000000..1898d06d --- /dev/null +++ b/sope-core/NGExtensions/FdExt.subproj/common.h @@ -0,0 +1 @@ +#include "../common.h" diff --git a/sope-core/NGExtensions/GNUmakefile b/sope-core/NGExtensions/GNUmakefile index ab371783..4001556f 100644 --- a/sope-core/NGExtensions/GNUmakefile +++ b/sope-core/NGExtensions/GNUmakefile @@ -9,6 +9,7 @@ else FRAMEWORK_NAME = NGExtensions endif +libNGExtensions_PCH_FILE = common.h libNGExtensions_DLL_DEF = libNGExtensions.def libNGExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libNGExtensions_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) diff --git a/sope-core/NGExtensions/NGLogging.subproj/GNUmakefile b/sope-core/NGExtensions/NGLogging.subproj/GNUmakefile index 817dfece..e11b4099 100644 --- a/sope-core/NGExtensions/NGLogging.subproj/GNUmakefile +++ b/sope-core/NGExtensions/NGLogging.subproj/GNUmakefile @@ -5,6 +5,8 @@ include ../../common.make SUBPROJECT_NAME = NGLogging +NGLogging_PCH_FILE = common.h + NGLogging_OBJC_FILES += \ NGLogger.m \ NGLoggerManager.m \ diff --git a/sope-core/NGExtensions/NGLogging.subproj/common.h b/sope-core/NGExtensions/NGLogging.subproj/common.h new file mode 100644 index 00000000..1898d06d --- /dev/null +++ b/sope-core/NGExtensions/NGLogging.subproj/common.h @@ -0,0 +1 @@ +#include "../common.h" diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile b/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile index c18cb0d3..f42279c7 100644 --- a/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile +++ b/sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile @@ -5,6 +5,8 @@ include ../../common.make SUBPROJECT_NAME = NGRuleEngine +NGRuleEngine_PCH_FILE = common.h + NGRuleEngine_OBJC_FILES = \ NGRule.m \ NGRuleAssignment.m \ diff --git a/sope-core/NGExtensions/NGRuleEngine.subproj/common.h b/sope-core/NGExtensions/NGRuleEngine.subproj/common.h new file mode 100644 index 00000000..1898d06d --- /dev/null +++ b/sope-core/NGExtensions/NGRuleEngine.subproj/common.h @@ -0,0 +1 @@ +#include "../common.h" diff --git a/sope-core/NGExtensions/Version b/sope-core/NGExtensions/Version index b48bfcaa..2a3637f2 100644 --- a/sope-core/NGExtensions/Version +++ b/sope-core/NGExtensions/Version @@ -1,6 +1,6 @@ # version -SUBMINOR_VERSION:=172 +SUBMINOR_VERSION:=173 # v4.3.115 requires libFoundation v1.0.59 # v4.2.72 requires libEOControl v4.2.39 diff --git a/sope-core/NGStreams/GNUmakefile b/sope-core/NGStreams/GNUmakefile index 4fd79910..907fab0e 100644 --- a/sope-core/NGStreams/GNUmakefile +++ b/sope-core/NGStreams/GNUmakefile @@ -10,6 +10,7 @@ else FRAMEWORK_NAME = NGStreams endif +libNGStreams_PCH_FILE = common.h libNGStreams_DLL_DEF = libNGStreams.def libNGStreams_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libNGStreams_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) diff --git a/sope-core/README b/sope-core/README index 05c3ee22..44b6f549 100644 --- a/sope-core/README +++ b/sope-core/README @@ -1,27 +1,9 @@ -# $Id$ +sope-core +========= -This repository contains the core libraries of the SKYRiX application +This repository contains the core libraries of the SOPE application server, that is, extensions to the Foundation library (NGExtensions), streaming IO and network classes (NGStreams), libraries for datastore -abstractions (EOControl), library for MIME and mail processing (NGMime). +abstractions (EOControl). - -MacOSX Notes -============ -Locations: -currently some fixed pathes to /Users/helge/build might be used in the -project. those need to be fixed to use variables. - -Precompiled Headers: -I did not find out how to setup precompiled headers to support a -MACOSX_DEPLOYMENT_TARGET=10.2, if this option is set, compilation -throws a mass of warnings about __CONSTANT_CFSTRINGS__ and cannot -use precompiled Foundation headers. -Something like this: - fixPrecomps -force \ - -precompFlags "-D__CONSTANT_CFSTRINGS__" \ - -all -did not work out. Suggestions are welcome ... - -Prebinding: -doesn't work yet, needs to be checked +TODO: write more diff --git a/sope-core/README-OSX.txt b/sope-core/README-OSX.txt index 32e148fe..e978ab41 100644 --- a/sope-core/README-OSX.txt +++ b/sope-core/README-OSX.txt @@ -20,6 +20,8 @@ or make -s debug=yes install if you build with debug informations. +TODO: describe third way, GS-less system frameworks on OSX + Building using Xcode: ===================== @@ -84,16 +86,6 @@ sope-core NGExtensions.framework NGStreams.framework -sope-mime - NGMime.framework - NGMail.framework - NGImap4.framework - -sope-ldap - NGLdap.framework - -sope-ical - NGiCal.framework Note: "A word on umbrellas" diff --git a/sope-core/common.make b/sope-core/common.make index e9b25c82..cd66dfc6 100644 --- a/sope-core/common.make +++ b/sope-core/common.make @@ -1,4 +1,4 @@ -# $Id$ +# GNUstep makefile SKYROOT=.. diff --git a/sope-core/samples/GNUmakefile.preamble b/sope-core/samples/GNUmakefile.preamble index 4d2c4635..2cac9ae7 100644 --- a/sope-core/samples/GNUmakefile.preamble +++ b/sope-core/samples/GNUmakefile.preamble @@ -5,6 +5,22 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../NGStreams \ -I../NGExtensions \ +# PCH + +encoding_PCH_FILE = common.h +subclassing_PCH_FILE = common.h +fmdls_PCH_FILE = common.h +bmlookup_PCH_FILE = common.h +testdirenum_PCH_FILE = common.h +eoqual_PCH_FILE = common.h +testsock_PCH_FILE = common.h +parserule_PCH_FILE = common.h +httpu_notify_PCH_FILE = common.h +testurl_PCH_FILE = common.h +sope-rsrclookup_PCH_FILE = common.h +ngcal_PCH_FILE = common.h + +# dependencies ifneq ($(frameworks),yes) ADDITIONAL_TOOL_LIBS += \