From 57b81869382128c13d8558d027bd0ede29a93bd1 Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 21 Sep 2004 12:09:39 +0000 Subject: [PATCH] Reworked Xcode build once again. git-svn-id: http://svn.opengroupware.org/SOPE/trunk@145 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-xml/ChangeLog | 7 + sope-xml/DOM/ChangeLog | 7 + sope-xml/DOM/DOM.xcode/project.pbxproj | 13 -- sope-xml/SaxObjC/ChangeLog | 11 ++ sope-xml/SaxObjC/SaxObjC-Info.plist | 2 +- .../SaxObjC/SaxObjC.xcode/project.pbxproj | 187 +++++++++++++++--- sope-xml/XmlRpc/ChangeLog | 7 + sope-xml/XmlRpc/XmlRpc.xcode/project.pbxproj | 26 --- sope-xml/libxmlSAXDriver/ChangeLog | 9 + .../libxmlSAXDriver-Info.plist | 6 +- .../libxmlSAXDriver.xcode/project.pbxproj | 17 ++ sope-xml/sope-xml.xcode/project.pbxproj | 28 +-- 12 files changed, 240 insertions(+), 80 deletions(-) diff --git a/sope-xml/ChangeLog b/sope-xml/ChangeLog index 4e08237f..6569d4d1 100644 --- a/sope-xml/ChangeLog +++ b/sope-xml/ChangeLog @@ -1,3 +1,10 @@ +2004-09-21 Marcus Mueller + + * sope-xml.xcode: Fixed dependencies to resemble the make process + more closely. Our aim should be to stick to the make process + as closely as possible, so we shouldn't introduce dependencies in + non-toplevel projects. + 2004-08-29 Marcus Mueller * sope-xml.xcode: new Xcode aggregate project diff --git a/sope-xml/DOM/ChangeLog b/sope-xml/DOM/ChangeLog index 6dd2a141..2ac489a1 100644 --- a/sope-xml/DOM/ChangeLog +++ b/sope-xml/DOM/ChangeLog @@ -1,3 +1,10 @@ +2004-09-21 Marcus Mueller + + * DOM.xcode: Fixed dependencies to resemble the make process + more closely. Our aim should be to stick to the make process + as closely as possible, so we shouldn't introduce dependencies in + non-toplevel projects. + 2004-08-29 Helge Hess * added hack to install the project in FHS locations - the library, diff --git a/sope-xml/DOM/DOM.xcode/project.pbxproj b/sope-xml/DOM/DOM.xcode/project.pbxproj index d28f3600..a9ae1126 100644 --- a/sope-xml/DOM/DOM.xcode/project.pbxproj +++ b/sope-xml/DOM/DOM.xcode/project.pbxproj @@ -213,7 +213,6 @@ WARNING_CFLAGS = "-Wmost"; }; dependencies = ( - AD01336306DE7B1B000910D8, ); isa = PBXNativeTarget; name = DOM; @@ -1719,18 +1718,6 @@ settings = { }; }; - AD01336206DE7B1B000910D8 = { - containerPortal = AD01333B06DE7AF1000910D8; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = ADDF54A806DE727A00C4E7F8; - remoteInfo = SaxObjC; - }; - AD01336306DE7B1B000910D8 = { - isa = PBXTargetDependency; - name = "SaxObjC (from SaxObjC.xcode)"; - targetProxy = AD01336206DE7B1B000910D8; - }; AD01336406DE7B39000910D8 = { containerPortal = AD01333B06DE7AF1000910D8; isa = PBXContainerItemProxy; diff --git a/sope-xml/SaxObjC/ChangeLog b/sope-xml/SaxObjC/ChangeLog index 220dc806..1f492db6 100644 --- a/sope-xml/SaxObjC/ChangeLog +++ b/sope-xml/SaxObjC/ChangeLog @@ -1,3 +1,14 @@ +2004-09-21 Marcus Mueller + + * SaxObjC.xcode: Fixed dependencies to resemble the make process + more closely. Our aim should be to stick to the make process + as closely as possible, so we shouldn't introduce dependencies in + non-toplevel projects. Also fixed cyclic dependency between the + framework and the libxmlSAXDriver, which gets copied into the + framework wrapper after compilation. This now gets achieved by two + shellscript phases, one in the framework and one as a separate + shellscript target. + 2004-08-29 Helge Hess * v4.3.41 diff --git a/sope-xml/SaxObjC/SaxObjC-Info.plist b/sope-xml/SaxObjC/SaxObjC-Info.plist index ebee5b18..714442bc 100644 --- a/sope-xml/SaxObjC/SaxObjC-Info.plist +++ b/sope-xml/SaxObjC/SaxObjC-Info.plist @@ -9,7 +9,7 @@ CFBundleGetInfoString CFBundleIdentifier - org.OpenGroupware.SOPE.xml.SaxObjC + org.OpenGroupware.sope-xml.SaxObjC CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType diff --git a/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj b/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj index 18e4692c..a7b17107 100644 --- a/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj +++ b/sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj @@ -39,40 +39,178 @@ remoteRef = AD0130F706DE777D000910D8; sourceTree = BUILT_PRODUCTS_DIR; }; - AD0130F306DE7734000910D8 = { - buildActionMask = 2147483647; - dstPath = SaxDrivers; - dstSubfolderSpec = 7; - files = ( - AD0130F406DE7757000910D8, + AD0130F706DE777D000910D8 = { + containerPortal = AD0130DE06DE76DB000910D8; + isa = PBXContainerItemProxy; + proxyType = 2; + remoteGlobalIDString = ADDF535406DE6CC800C4E7F8; + remoteInfo = libxmlSAXDriver; + }; + ADABC83007003DAB00B582C7 = { + buildPhases = ( ); - isa = PBXCopyFilesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; + buildSettings = { + PRODUCT_NAME = all; + }; + dependencies = ( + ADABC8670700467D00B582C7, + ADABC83C07003DE300B582C7, + ADABC83E07003DE800B582C7, + ADABC8A107004CC600B582C7, + ); + isa = PBXAggregateTarget; + name = all; + productName = all; }; - AD0130F406DE7757000910D8 = { - fileRef = AD0130E206DE76DD000910D8; - isa = PBXBuildFile; - settings = { + ADABC83307003DB900B582C7 = { + buildPhases = ( + ); + buildSettings = { + PRODUCT_NAME = SAXDrivers; }; + dependencies = ( + ADABC83507003DBF00B582C7, + ); + isa = PBXAggregateTarget; + name = SAXDrivers; + productName = SAXDrivers; }; - AD0130F506DE7764000910D8 = { + ADABC83407003DBF00B582C7 = { containerPortal = AD0130DE06DE76DB000910D8; isa = PBXContainerItemProxy; proxyType = 1; remoteGlobalIDString = ADDF535306DE6CC800C4E7F8; remoteInfo = libxmlSAXDriver; }; - AD0130F606DE7764000910D8 = { + ADABC83507003DBF00B582C7 = { isa = PBXTargetDependency; name = "libxmlSAXDriver (from libxmlSAXDriver.xcode)"; - targetProxy = AD0130F506DE7764000910D8; + targetProxy = ADABC83407003DBF00B582C7; }; - AD0130F706DE777D000910D8 = { - containerPortal = AD0130DE06DE76DB000910D8; + ADABC83B07003DE300B582C7 = { + containerPortal = ADDF549E06DE724700C4E7F8; isa = PBXContainerItemProxy; - proxyType = 2; - remoteGlobalIDString = ADDF535406DE6CC800C4E7F8; - remoteInfo = libxmlSAXDriver; + proxyType = 1; + remoteGlobalIDString = ADDF54A806DE727A00C4E7F8; + remoteInfo = SaxObjC; + }; + ADABC83C07003DE300B582C7 = { + isa = PBXTargetDependency; + target = ADDF54A806DE727A00C4E7F8; + targetProxy = ADABC83B07003DE300B582C7; + }; + ADABC83D07003DE800B582C7 = { + containerPortal = ADDF549E06DE724700C4E7F8; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADABC83307003DB900B582C7; + remoteInfo = SAXDrivers; + }; + ADABC83E07003DE800B582C7 = { + isa = PBXTargetDependency; + target = ADABC83307003DB900B582C7; + targetProxy = ADABC83D07003DE800B582C7; + }; + ADABC862070045C200B582C7 = { + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + isa = PBXShellScriptBuildPhase; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "rm -f /tmp/SaxObjCBundledSAXDriversDestinationPath\nrm -rf /tmp/SaxObjCBundledSAXDrivers\nexit 0"; + }; + ADABC863070045C200B582C7 = { + buildPhases = ( + ADABC862070045C200B582C7, + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = CleanupSAXDrivers; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + ); + isa = PBXAggregateTarget; + name = CleanSAXDrivers; + productName = CleanupSAXDrivers; + }; + ADABC8660700467D00B582C7 = { + containerPortal = ADDF549E06DE724700C4E7F8; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADABC863070045C200B582C7; + remoteInfo = CleanupSAXDrivers; + }; + ADABC8670700467D00B582C7 = { + isa = PBXTargetDependency; + target = ADABC863070045C200B582C7; + targetProxy = ADABC8660700467D00B582C7; + }; + ADABC89E07004CAE00B582C7 = { + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + isa = PBXShellScriptBuildPhase; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "SAXDRIVERS=/tmp/SaxObjCBundledSAXDrivers\nSAXDRIVERS_DEST=`cat /tmp/SaxObjCBundledSAXDriversDestinationPath`\n\nif [ ! -d ${SAXDRIVERS} ]; then\n #error\n exit 1\nfi\n\nmkdir -p ${SAXDRIVERS_DEST}\ncp -pR ${SAXDRIVERS}/* ${SAXDRIVERS_DEST}\nexit 0\n"; + }; + ADABC89F07004CAE00B582C7 = { + buildPhases = ( + ADABC89E07004CAE00B582C7, + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = CopySAXDrivers; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; + }; + dependencies = ( + ); + isa = PBXAggregateTarget; + name = CopySAXDrivers; + productName = CopySAXDrivers; + }; + ADABC8A007004CC600B582C7 = { + containerPortal = ADDF549E06DE724700C4E7F8; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADABC89F07004CAE00B582C7; + remoteInfo = CopySAXDrivers; + }; + ADABC8A107004CC600B582C7 = { + isa = PBXTargetDependency; + target = ADABC89F07004CAE00B582C7; + targetProxy = ADABC8A007004CC600B582C7; + }; + ADABC8A407004D9200B582C7 = { + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + isa = PBXShellScriptBuildPhase; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SaxDrivers\" > /tmp/SaxObjCBundledSAXDriversDestinationPath\nexit 0"; }; ADDF549A06DE724600C4E7F8 = { children = ( @@ -146,6 +284,10 @@ ); targets = ( ADDF54A806DE727A00C4E7F8, + ADABC83007003DAB00B582C7, + ADABC83307003DB900B582C7, + ADABC863070045C200B582C7, + ADABC89F07004CAE00B582C7, ); }; ADDF54A406DE727A00C4E7F8 = { @@ -227,13 +369,13 @@ ADDF54A506DE727A00C4E7F8, ADDF54A606DE727A00C4E7F8, ADDF54A706DE727A00C4E7F8, - AD0130F306DE7734000910D8, + ADABC8A407004D9200B582C7, ); buildRules = ( ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 4.3.40; + DYLIB_CURRENT_VERSION = 4.3.41; FRAMEWORK_VERSION = A; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; @@ -244,7 +386,6 @@ WARNING_CFLAGS = "-Wmost"; }; dependencies = ( - AD0130F606DE7764000910D8, ); isa = PBXNativeTarget; name = SaxObjC; diff --git a/sope-xml/XmlRpc/ChangeLog b/sope-xml/XmlRpc/ChangeLog index 88ac496a..9964b3ad 100644 --- a/sope-xml/XmlRpc/ChangeLog +++ b/sope-xml/XmlRpc/ChangeLog @@ -1,3 +1,10 @@ +2004-09-21 Marcus Mueller + + * XmlRpc.xcode: Fixed dependencies to resemble the make process + more closely. Our aim should be to stick to the make process + as closely as possible, so we shouldn't introduce dependencies in + non-toplevel projects. + 2004-08-29 Helge Hess * added hack to install the project in FHS locations - the library, diff --git a/sope-xml/XmlRpc/XmlRpc.xcode/project.pbxproj b/sope-xml/XmlRpc/XmlRpc.xcode/project.pbxproj index 5c9507c9..edaf2f26 100644 --- a/sope-xml/XmlRpc/XmlRpc.xcode/project.pbxproj +++ b/sope-xml/XmlRpc/XmlRpc.xcode/project.pbxproj @@ -171,8 +171,6 @@ WARNING_CFLAGS = "-Wmost"; }; dependencies = ( - AD01348206DE7FFD000910D8, - AD01348006DE7FFD000910D8, ); isa = PBXNativeTarget; name = XmlRpc; @@ -956,30 +954,6 @@ settings = { }; }; - AD01347F06DE7FFD000910D8 = { - containerPortal = AD01347306DE7F96000910D8; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = AD01311E06DE794E000910D8; - remoteInfo = DOM; - }; - AD01348006DE7FFD000910D8 = { - isa = PBXTargetDependency; - name = "DOM (from DOM.xcode)"; - targetProxy = AD01347F06DE7FFD000910D8; - }; - AD01348106DE7FFD000910D8 = { - containerPortal = AD01347106DE7F83000910D8; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = ADDF54A806DE727A00C4E7F8; - remoteInfo = SaxObjC; - }; - AD01348206DE7FFD000910D8 = { - isa = PBXTargetDependency; - name = "SaxObjC (from SaxObjC.xcode)"; - targetProxy = AD01348106DE7FFD000910D8; - }; ADFA0CFD06E227BC009429E9 = { children = ( AD0133E206DE7E48000910D8, diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog index 094dd5b7..e4a3988c 100644 --- a/sope-xml/libxmlSAXDriver/ChangeLog +++ b/sope-xml/libxmlSAXDriver/ChangeLog @@ -1,3 +1,12 @@ +2004-09-21 Marcus Mueller + + * libxmlSAXDriver.xcode: Fixed dependencies to resemble the make process + more closely. Our aim should be to stick to the make process + as closely as possible, so we shouldn't introduce dependencies in + non-toplevel projects. Also added a new copy files phase to copy the + resulting bundle to a well-known place where the SaxObjC framework + can later pick it up for inclusion in its framework wrapper. + 2004-08-29 Helge Hess * added hack to install the project in FHS locations - the SAX driver diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist b/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist index e2047329..1e4814a1 100644 --- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist +++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist @@ -11,16 +11,16 @@ CFBundleIconFile CFBundleIdentifier - org.opengroupware.xml.libxmlSAXDriver + org.OpenGroupware.sope-xml.libxmlSAXDriver CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType - APPL + BNDL CFBundleShortVersionString CFBundleSignature ???? CFBundleVersion - 1.0.0d1 + 4.3.17 diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcode/project.pbxproj b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcode/project.pbxproj index af2216e5..16a80636 100644 --- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcode/project.pbxproj +++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcode/project.pbxproj @@ -5,6 +5,22 @@ }; objectVersion = 39; objects = { + ADABC87D0700496800B582C7 = { + buildActionMask = 2147483647; + dstPath = /tmp/SaxObjCBundledSAXDrivers; + dstSubfolderSpec = 0; + files = ( + ADABC8820700497D00B582C7, + ); + isa = PBXCopyFilesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + ADABC8820700497D00B582C7 = { + fileRef = ADDF535406DE6CC800C4E7F8; + isa = PBXBuildFile; + settings = { + }; + }; ADDF534406DE6C5300C4E7F8 = { children = ( ADDF539406DE6EA300C4E7F8, @@ -113,6 +129,7 @@ ADDF535006DE6CC800C4E7F8, ADDF535106DE6CC800C4E7F8, ADDF535206DE6CC800C4E7F8, + ADABC87D0700496800B582C7, ); buildRules = ( ); diff --git a/sope-xml/sope-xml.xcode/project.pbxproj b/sope-xml/sope-xml.xcode/project.pbxproj index 1bc240f3..b6247b55 100644 --- a/sope-xml/sope-xml.xcode/project.pbxproj +++ b/sope-xml/sope-xml.xcode/project.pbxproj @@ -5,6 +5,18 @@ }; objectVersion = 39; objects = { + ADABC8B407004F8600B582C7 = { + containerPortal = ADFE530506E23356006628C4; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = ADABC83007003DAB00B582C7; + remoteInfo = all; + }; + ADABC8B507004F8600B582C7 = { + isa = PBXTargetDependency; + name = "all (from SaxObjC.xcode)"; + targetProxy = ADABC8B407004F8600B582C7; + }; ADDF476606DA572500C4E7F8 = { children = ( ADDF477506DA575700C4E7F8, @@ -198,9 +210,9 @@ PRODUCT_NAME = "Wrapper Contents"; }; dependencies = ( - ADFE530A06E23361006628C4, - ADFE531506E23396006628C4, + ADABC8B507004F8600B582C7, ADFE531706E23396006628C4, + ADFE531506E23396006628C4, ); isa = PBXAggregateTarget; name = "Wrapper Contents"; @@ -259,18 +271,6 @@ refType = 4; sourceTree = ""; }; - ADFE530906E23361006628C4 = { - containerPortal = ADFE530506E23356006628C4; - isa = PBXContainerItemProxy; - proxyType = 1; - remoteGlobalIDString = ADDF54A806DE727A00C4E7F8; - remoteInfo = SaxObjC; - }; - ADFE530A06E23361006628C4 = { - isa = PBXTargetDependency; - name = "SaxObjC (from SaxObjC.xcode)"; - targetProxy = ADFE530906E23361006628C4; - }; ADFE530B06E2336C006628C4 = { fileType = wrapper.framework; isa = PBXReferenceProxy; -- 2.39.5