From 0c4274e0bdd32c04271d54c2dae2c8da87e4b29f Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 19 Jul 2007 13:53:12 +0000 Subject: [PATCH] further updates for the new Xcode build git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1511 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- SOPE.xcodeproj/project.pbxproj | 93 ++++++++++++------- sope-xml/SaxObjC/SaxObjC-Info.plist | 2 +- .../libxmlSAXDriver.xcodeproj/project.pbxproj | 4 +- xcconfig/Wrapper.xcconfig | 26 +++++- 4 files changed, 83 insertions(+), 42 deletions(-) diff --git a/SOPE.xcodeproj/project.pbxproj b/SOPE.xcodeproj/project.pbxproj index 7ac0c3c6..5c3c4f55 100644 --- a/SOPE.xcodeproj/project.pbxproj +++ b/SOPE.xcodeproj/project.pbxproj @@ -20,6 +20,8 @@ AD8BF1BD070197B000EC239A /* PBXTargetDependency */, AD8BF27B070199B000EC239A /* PBXTargetDependency */, AD8BF8680701AE0600EC239A /* PBXTargetDependency */, + AD2209B10C4FA0FE004B863D /* PBXTargetDependency */, + AD2209AF0C4FA0FE004B863D /* PBXTargetDependency */, ); name = "Wrapper Contents"; productName = "Wrapper Contents"; @@ -37,6 +39,8 @@ AD8BF1BB0701978A00EC239A /* PBXTargetDependency */, AD8BF279070199A200EC239A /* PBXTargetDependency */, AD8BF8660701ADF800EC239A /* PBXTargetDependency */, + AD2209A90C4FA0DE004B863D /* PBXTargetDependency */, + AD2209AB0C4FA0E9004B863D /* PBXTargetDependency */, ); name = all; productName = all; @@ -82,18 +86,46 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + AD2209A80C4FA0DE004B863D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AD5836760C4F869E00745D88 /* SOPEX.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = SOPEX; + }; + AD2209AA0C4FA0E9004B863D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AD5836810C4F86B500745D88 /* WebObjects.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = "WebObjects (Umbrella)"; + }; + AD2209AE0C4FA0FE004B863D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AD5836810C4F86B500745D88 /* WebObjects.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = "WebObjects (Umbrella)"; + }; + AD2209B00C4FA0FE004B863D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = AD5836760C4F869E00745D88 /* SOPEX.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 8DC2EF4F0486A6940098B216; + remoteInfo = SOPEX; + }; AD58367F0C4F86A000745D88 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = AD5836760C4F869E00745D88 /* SOPEX.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 8DC2EF5B0486A6940098B216 /* SOPEX.framework */; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteInfo = SOPEX; }; AD5836950C4F86B900745D88 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = AD5836810C4F86B500745D88 /* WebObjects.xcodeproj */; proxyType = 2; - remoteGlobalIDString = 8DC2EF5B0486A6940098B216 /* WebObjects.framework */; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; remoteInfo = "WebObjects (Umbrella)"; }; AD8BF0D007018E5200EC239A /* PBXContainerItemProxy */ = { @@ -648,6 +680,26 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + AD2209A90C4FA0DE004B863D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = SOPEX; + targetProxy = AD2209A80C4FA0DE004B863D /* PBXContainerItemProxy */; + }; + AD2209AB0C4FA0E9004B863D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "WebObjects (Umbrella)"; + targetProxy = AD2209AA0C4FA0E9004B863D /* PBXContainerItemProxy */; + }; + AD2209AF0C4FA0FE004B863D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "WebObjects (Umbrella)"; + targetProxy = AD2209AE0C4FA0FE004B863D /* PBXContainerItemProxy */; + }; + AD2209B10C4FA0FE004B863D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = SOPEX; + targetProxy = AD2209B00C4FA0FE004B863D /* PBXContainerItemProxy */; + }; AD8BF0D107018E5200EC239A /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "all (from sope-xml.xcodeproj)"; @@ -723,19 +775,14 @@ /* Begin XCBuildConfiguration section */ AD0C92E108AC9E0D00952E9F /* Development */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD2640D70C46729500186AAB /* Development.xcconfig */; buildSettings = { - COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = "$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION).0"; DYLIB_CURRENT_VERSION = "$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION).0"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G4; - GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "SOPE-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC5FF0000, "-sub_umbrella", @@ -774,34 +821,20 @@ NGMime, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; - PREBINDING = NO; PRODUCT_NAME = SOPE; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); }; name = Development; }; AD0C92E208AC9E0D00952E9F /* Wrapper */ = { isa = XCBuildConfiguration; + baseConfigurationReference = AD263F730C4670E400186AAB /* Wrapper.xcconfig */; buildSettings = { DYLIB_COMPATIBILITY_VERSION = "$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION).0"; DYLIB_CURRENT_VERSION = "$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION).0"; - DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks"; - FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)"; FRAMEWORK_VERSION = A; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G4; - GCC_PRECOMPILE_PREFIX_HEADER = NO; INFOPLIST_FILE = "SOPE-Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = ""; OTHER_LDFLAGS = ( + "$(OTHER_LDFLAGS)", "-seg1addr", 0xC5FF0000, "-sub_umbrella", @@ -840,17 +873,7 @@ NGMime, "-headerpad_max_install_names", ); - OTHER_REZFLAGS = ""; - PREBINDING = NO; PRODUCT_NAME = SOPE; - SECTORDER_FLAGS = ""; - SYMROOT = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION)"; - TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build"; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - ); }; name = Wrapper; }; diff --git a/sope-xml/SaxObjC/SaxObjC-Info.plist b/sope-xml/SaxObjC/SaxObjC-Info.plist index 9ba3b821..37415024 100644 --- a/sope-xml/SaxObjC/SaxObjC-Info.plist +++ b/sope-xml/SaxObjC/SaxObjC-Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 4.5 + 4.7 diff --git a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj index 56fbd546..ee53a662 100644 --- a/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj +++ b/sope-xml/libxmlSAXDriver/libxmlSAXDriver.xcodeproj/project.pbxproj @@ -245,7 +245,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; INFOPLIST_FILE = "libxmlSAXDriver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-I/usr/include/libxml2", @@ -266,7 +266,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = common.h; INFOPLIST_FILE = "libxmlSAXDriver-Info.plist"; - INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers"; + INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers-$(SOPE_MAJOR_VERSION).$(SOPE_MINOR_VERSION)"; OTHER_CFLAGS = ( "$(OTHER_CFLAGS)", "-I/usr/include/libxml2", diff --git a/xcconfig/Wrapper.xcconfig b/xcconfig/Wrapper.xcconfig index 73a397e7..c727249d 100644 --- a/xcconfig/Wrapper.xcconfig +++ b/xcconfig/Wrapper.xcconfig @@ -21,8 +21,26 @@ DEPLOYMENT_LOCATION = NO DEPLOYMENT_POSTPROCESSING = YES DSTROOT = / -DYLIB_INSTALL_NAME_BASE = @executable_path/../Frameworks/ -FRAMEWORK_SEARCH_PATHS = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION) -SYMROOT = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION) -TEMP_DIR = $(SYMROOT)/$(PROJECT_NAME).build ZERO_LINK = NO + +// install_header +DYLIB_INSTALL_NAME_BASE = @executable_path/../Frameworks/ +// the directory, where the built product can be fetched later +// TARGET_BUILD_DIR = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION) + +// the following build variables appear to look normal, but when omitted +// the Xcode build engine fails miserably. It appears that Xcode tries to +// evaluate these variables several times and mysterious substitutions to +// the effect of having built products in directories named like +// $(CONFIGURATION)/$(CONFIGURATION) (where these are properly substituted +// as in i.e. "Wrapper") occur... having these variables defined here +// seems to eliminate the problem. +// Problem verified with Xcode build 2.4.1, later versions might be ok. + +SYMROOT = $(USER_LIBRARY_DIR)/EmbeddedFrameworks +OBJROOT = $(SYMROOT)/build +TEMP_DIR = $(SYMROOT)/$(PROJECT_NAME).build +PROJECT_TEMP_DIR = $(SYMROOT)/$(PROJECT_NAME).build +CONFIGURATION_BUILD_DIR = $(BUILD_DIR)/$(CONFIGURATION) +CONFIGURATION_TEMP_DIR = $(PROJECT_TEMP_DIR)/$(CONFIGURATION) +FRAMEWORK_SEARCH_PATHS = $(USER_LIBRARY_DIR)/EmbeddedFrameworks/$(CONFIGURATION) -- 2.39.5