diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-08-29 18:12:50 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-08-29 18:12:50 +0200 |
| commit | 52325337b9a939366bed8c1f57768e1b2909d3ac (patch) | |
| tree | 8bfd21a45eeb3f04d9bee829fde52c6aaf69d582 /cpp | |
| parent | Minor timeout test fix to prevent failure, fixes #498 (diff) | |
| download | ice-52325337b9a939366bed8c1f57768e1b2909d3ac.tar.bz2 ice-52325337b9a939366bed8c1f57768e1b2909d3ac.tar.xz ice-52325337b9a939366bed8c1f57768e1b2909d3ac.zip | |
Fixed iOS test controller Xcode build issue, updated Swift project
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.xcodesdk.rules | 13 | ||||
| -rw-r--r-- | cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/cpp/config/Make.xcodesdk.rules b/cpp/config/Make.xcodesdk.rules index ec9349fa70c..3dac9a1a66d 100644 --- a/cpp/config/Make.xcodesdk.rules +++ b/cpp/config/Make.xcodesdk.rules @@ -6,7 +6,7 @@ include $(top_srcdir)/config/Make.xcodesdk.rules supported-configs += xcodesdk cpp11-xcodesdk -is-iostest-program = $(and $(filter-out macosx,$2),$(filter program,$($1_target))) +is-iostest-program = $(and $(filter-out macosx,$2),$(filter test/%,$1)) # # Xcode configuration to build Xcode sdks for Ice. @@ -29,18 +29,23 @@ xcodesdk_excludes = $(addprefix test/Ice/,background \ # Rule to build an iOS bundle for testing (this is used for packaging client/server programs) # define make-iostest-program -$2/$1.bundle/$1.dylib: $5 $(foreach d,$6,$($d_targets)) - $(E) "Linking [$8-$9] $$@" +$2/$1.bundle/Info.plist: $(Q)if [ ! -f $2/$1.bundle/Info.plist ] ; \ then \ $(MKDIR) -p $2/$1.bundle ; \ sed "s/NAME/$1/" test/ios/bundles/BundleInfo.plist > $2/$1.bundle/Info.plist ; \ fi + +$2/$1.bundle/$1.dylib: $5 $2/$1.bundle/Info.plist $(foreach d,$6,$($d_targets)) + $(E) "Linking [$8-$9] $$@" $(Q)$(RM) $2/$1.bundle/$1.dylib $(Q)$(or $($8_cxx),$(platform_cxx)) -bundle $(LDFLAGS) -o $2/$1.bundle/$1.dylib $5 $(strip $7) endef -get-iostest-program-targets = $2/$1.bundle/$1.dylib +get-iostest-program-targets = $2/$1.bundle/$1.dylib $2/$1.bundle/Info.plist + +make-iostest-library = $(make-static-library) +get-iostest-library-targets = $(get-static-library-targets) ifneq ($(findstring xcodesdk,$(configs)),) $(eval $(call make-xcodesdk,bin/slice2cpp)) diff --git a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj index b1bdd56fb07..923d5e98c70 100644 --- a/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj +++ b/cpp/test/ios/controller/C++ Test Controller.xcodeproj/project.pbxproj @@ -62,6 +62,8 @@ compilerSpec = com.apple.compilers.proxy.script; filePatterns = "*.ice"; fileType = pattern.proxy; + inputFiles = ( + ); isEditable = 1; outputFiles = ( "$(DERIVED_FILE_DIR)/$(INPUT_FILE_BASE).cpp", @@ -796,7 +798,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Cpp98-Test-Controller"; PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -821,7 +822,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "com.zeroc.Cpp98-Test-Controller"; PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; |