diff options
| author | Joe George <joe@zeroc.com> | 2017-07-06 14:30:39 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-07-06 14:30:39 -0400 |
| commit | 8dd8d6fbe132484a2db4e2e5e16c5f078a2f8743 (patch) | |
| tree | 1caba0435b090b3779287eda965f6a7568d0e5cb /objective-c | |
| parent | Fixed ICE-8234 - fixed Ice/slicing/objects cycle leaks (diff) | |
| download | ice-8dd8d6fbe132484a2db4e2e5e16c5f078a2f8743.tar.bz2 ice-8dd8d6fbe132484a2db4e2e5e16c5f078a2f8743.tar.xz ice-8dd8d6fbe132484a2db4e2e5e16c5f078a2f8743.zip | |
ICE-8225 - Rework Ice sdk for Xcode
- Renamed IceSDK to sdk
- Remove IceSDK/bin and IceSDK/slice directories
- Update Xcode projects to use Ice Builder 3.1.0
Diffstat (limited to 'objective-c')
| -rw-r--r-- | objective-c/BuildInstructions.md | 2 | ||||
| -rw-r--r-- | objective-c/config/Make.xcodesdk.rules | 14 | ||||
| -rw-r--r-- | objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/objective-c/BuildInstructions.md b/objective-c/BuildInstructions.md index b07c5f58bcd..88fede93bfc 100644 --- a/objective-c/BuildInstructions.md +++ b/objective-c/BuildInstructions.md @@ -56,7 +56,7 @@ easily develop Ice applications with Xcode. To build Xcode SDKs, use the make CONFIGS=xcodesdk -j8 srcs # Build the Objective-C mapping Xcode SDK # for the default platform ``` -The Xcode SDKs are built into `ice/IceSDK`. +The Xcode SDKs are built into `ice/sdk`. ## Installing an Objective-C Source Build diff --git a/objective-c/config/Make.xcodesdk.rules b/objective-c/config/Make.xcodesdk.rules index eb0331af053..99470e7b527 100644 --- a/objective-c/config/Make.xcodesdk.rules +++ b/objective-c/config/Make.xcodesdk.rules @@ -12,10 +12,10 @@ include $(top_srcdir)/config/Make.xcodesdk.rules supported-configs += xcodesdk arc-xcodesdk # -# Xcode configuration to build Xcode IceSDK. +# Xcode configuration to build Xcode sdks for Ice. # -xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,IceSDK/$2.sdk/usr/lib) -xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,IceSDK/$2.sdk/usr/lib) +xcodesdk_targetdir = $(if $(filter %/build,$5),xcodesdk,sdk/$2.sdk/usr/lib) +xcodesdk_installdir = $(if $(filter %/build,$5),xcodesdk,../sdk/$2.sdk/usr/lib) xcodesdk_targetrule = $(if $(filter-out program,$($1_target)),static) xcodesdk_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC TestCommonObjC @@ -40,14 +40,14 @@ $(make-xcodesdk-component-with-config) ifneq ($(filter-out $(sdk_includefiles),$3-$2),) sdk_includefiles += $3-$2 $$(eval $$(call install-data-files,include/objc/$(subst ObjC,,$2).h,include,\ - $(top_srcdir)/IceSDK/$3.sdk/usr/include,$5)) + $(top_srcdir)/sdk/$3.sdk/usr/include,$5)) $$(eval $$(call install-data-files,include/objc/$(subst ObjC,,$2).h,include,\ - $(install_libdir)/IceSDK/$3.sdk/usr/include,$5_install)) + $(install_sdkdir)/$3.sdk/usr/include,$5_install)) $5_clean:: - $(Q)$(RM) $(top_srcdir)/IceSDK/$3.sdk/usr/include/objc/$(subst ObjC,,$2).h - $(Q)$(RM) -r $(top_srcdir)/IceSDK/$3.sdk/usr/include/objc/$(subst ObjC,,$2) + $(Q)$(RM) $(top_srcdir)/sdk/$3.sdk/usr/include/objc/$(subst ObjC,,$2).h + $(Q)$(RM) -r $(top_srcdir)/sdk/$3.sdk/usr/include/objc/$(subst ObjC,,$2) endif endif diff --git a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj index 42812e2c3ec..883ab391487 100644 --- a/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj +++ b/objective-c/test/ios/controller/Objective-C Test Controller.xcodeproj/project.pbxproj @@ -370,7 +370,7 @@ "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m", "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h", ); - script = /usr/local/bin/icebuilder; + script = "\"$(git rev-parse --show-toplevel)/scripts/ice-builder-xcode-wrapper\""; }; 14B7DF791E043085001D0109 /* PBXBuildRule */ = { isa = PBXBuildRule; @@ -382,7 +382,7 @@ "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).m", "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).h", ); - script = /usr/local/bin/icebuilder; + script = "\"$(git rev-parse --show-toplevel)/scripts/ice-builder-xcode-wrapper\""; }; /* End PBXBuildRule section */ @@ -1649,7 +1649,7 @@ 14905C661DF98FD8002AE61B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ADDITIONAL_SDKS = "../../../../IceSDK/$(PLATFORM_NAME).sdk"; + ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk"; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -1697,7 +1697,7 @@ 14905C671DF98FD8002AE61B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ADDITIONAL_SDKS = "../../../../IceSDK/$(PLATFORM_NAME).sdk"; + ADDITIONAL_SDKS = "../../../../sdk/$(PLATFORM_NAME).sdk"; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; |