]> err.no Git - sope/commitdiff
Reworked Xcode build once again.
authorznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Tue, 21 Sep 2004 12:09:39 +0000 (12:09 +0000)
committerznek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Tue, 21 Sep 2004 12:09:39 +0000 (12:09 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@145 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

12 files changed:
sope-xml/ChangeLog
sope-xml/DOM/ChangeLog
sope-xml/DOM/DOM.xcode/project.pbxproj
sope-xml/SaxObjC/ChangeLog
sope-xml/SaxObjC/SaxObjC-Info.plist
sope-xml/SaxObjC/SaxObjC.xcode/project.pbxproj
sope-xml/XmlRpc/ChangeLog
sope-xml/XmlRpc/XmlRpc.xcode/project.pbxproj
sope-xml/libxmlSAXDriver/ChangeLog
sope-xml/libxmlSAXDriver/libxmlSAXDriver-Info.plist
sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcode/project.pbxproj
sope-xml/sope-xml.xcode/project.pbxproj

index 4e08237fcc6ff1d675abdc6456f66963ca142a67..6569d4d1dff9c1368dcb9e70f6db32867155cd04 100644 (file)
@@ -1,3 +1,10 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * 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  <znek@mulle-kybernetik.com>
 
        * sope-xml.xcode: new Xcode aggregate project
index 6dd2a14124e80d6a883f606acbd3cc0e3f2d8882..2ac489a158020f59891e9d6a2e5e29c6893becd3 100644 (file)
@@ -1,3 +1,10 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * added hack to install the project in FHS locations - the library,
index d28f36004c853255a204d8c0c09c91c412f1c8f0..a9ae11260acff6f4ae10444afcb334fc434c3c8e 100644 (file)
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               AD01336306DE7B1B000910D8,
                        );
                        isa = PBXNativeTarget;
                        name = DOM;
                        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;
index 220dc806c423cce7290543247ffc7b8134596e7d..1f492db651d2f648f66a6ad461c15d1b37575e69 100644 (file)
@@ -1,3 +1,14 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * v4.3.41
index ebee5b184eedb8f23b001185e649d6b3aa3b598d..714442bcf1e9563dc80eff0ad1a794caf620ac0f 100644 (file)
@@ -9,7 +9,7 @@
        <key>CFBundleGetInfoString</key>
        <string></string>
        <key>CFBundleIdentifier</key>
-       <string>org.OpenGroupware.SOPE.xml.SaxObjC</string>
+       <string>org.OpenGroupware.sope-xml.SaxObjC</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundlePackageType</key>
index 18e4692cb6caa4bd75604fa7bf3f62660980fcee..a7b17107f965414bb7e231bcf31a26654ce46bdc 100644 (file)
                        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 = (
                        );
                        targets = (
                                ADDF54A806DE727A00C4E7F8,
+                               ADABC83007003DAB00B582C7,
+                               ADABC83307003DB900B582C7,
+                               ADABC863070045C200B582C7,
+                               ADABC89F07004CAE00B582C7,
                        );
                };
                ADDF54A406DE727A00C4E7F8 = {
                                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;
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               AD0130F606DE7764000910D8,
                        );
                        isa = PBXNativeTarget;
                        name = SaxObjC;
index 88ac496a324e71c08cb3264825e91efb4480d333..9964b3ada582747b9ae90993e52c801a112f74f3 100644 (file)
@@ -1,3 +1,10 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * added hack to install the project in FHS locations - the library,
index 5c9507c97033aaa456ece81a516c5346e190d7f6..edaf2f26c59224872b93b49f179fc08a6f6e6a6c 100644 (file)
                                WARNING_CFLAGS = "-Wmost";
                        };
                        dependencies = (
-                               AD01348206DE7FFD000910D8,
-                               AD01348006DE7FFD000910D8,
                        );
                        isa = PBXNativeTarget;
                        name = XmlRpc;
                        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,
index 094dd5b7b2229ba8f638a957b85b7d6d9a591a4d..e4a3988c00a45e76723a2e3929977a8f25cc55cd 100644 (file)
@@ -1,3 +1,12 @@
+2004-09-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * 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  <helge.hess@opengroupware.org>
        
        * added hack to install the project in FHS locations - the SAX driver
index e2047329aeb70e4b51bf8c187b0d586d718612cd..1e4814a1636db9bfcf299355b3a4b22d34771714 100644 (file)
        <key>CFBundleIconFile</key>
        <string></string>
        <key>CFBundleIdentifier</key>
-       <string>org.opengroupware.xml.libxmlSAXDriver</string>
+       <string>org.OpenGroupware.sope-xml.libxmlSAXDriver</string>
        <key>CFBundleInfoDictionaryVersion</key>
        <string>6.0</string>
        <key>CFBundlePackageType</key>
-       <string>APPL</string>
+       <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <string></string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>1.0.0d1</string>
+       <string>4.3.17</string>
 </dict>
 </plist>
index af2216e53ab168a4961591fe3101c28419d00634..16a80636c735878ab850855648235b04ca34a503 100644 (file)
@@ -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,
                                ADDF535006DE6CC800C4E7F8,
                                ADDF535106DE6CC800C4E7F8,
                                ADDF535206DE6CC800C4E7F8,
+                               ADABC87D0700496800B582C7,
                        );
                        buildRules = (
                        );
index 1bc240f3b2640221cd4c441d2762f3a020f65e20..b6247b5527a0805853f432db2dba81fbd460740e 100644 (file)
@@ -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,
                                PRODUCT_NAME = "Wrapper Contents";
                        };
                        dependencies = (
-                               ADFE530A06E23361006628C4,
-                               ADFE531506E23396006628C4,
+                               ADABC8B507004F8600B582C7,
                                ADFE531706E23396006628C4,
+                               ADFE531506E23396006628C4,
                        );
                        isa = PBXAggregateTarget;
                        name = "Wrapper Contents";
                        refType = 4;
                        sourceTree = "<group>";
                };
-               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;