diff options
Diffstat (limited to 'objective-c')
21 files changed, 98 insertions, 98 deletions
diff --git a/objective-c/Makefile b/objective-c/Makefile index bbfb2d51555..83e33f09ae3 100644 --- a/objective-c/Makefile +++ b/objective-c/Makefile @@ -7,8 +7,8 @@ # # ********************************************************************** -top_srcdir := .. -lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) +top_srcdir := .. +lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(abspath $(lastword $(MAKEFILE_LIST)))))) include $(top_srcdir)/config/Make.rules include $(lang_srcdir)/config/Make.rules diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules index ba76d2900ca..efe4ddd6ea1 100644 --- a/objective-c/config/Make.rules +++ b/objective-c/config/Make.rules @@ -14,10 +14,10 @@ # # Objective-C mapping configurations # -supported-configs = shared static arc-shared arc-static +supported-configs = shared static arc-shared arc-static ifeq ($(os),Darwin) -include $(lang_srcdir)/config/Make.xcodesdk.rules +include $(lang_srcdir)/config/Make.xcodesdk.rules endif ifneq ($(filter arc-%,$(CONFIGS)),) @@ -28,14 +28,14 @@ endif # # Build only few components with the static configuration (libraries) # -static_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC -static_projects = test/% -static_ldflags += $(if $(filter program,$($1_target)),-ObjC) +static_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC +static_projects = test/% +static_ldflags += $(if $(filter program,$($1_target)),-ObjC) # # Build only the tests with the ARC configuration # -arc_projects = test/Slice/% test/Ice/% +arc_projects = test/Slice/% test/Ice/% # # Define the arc configuration to build the tests with ARC support. @@ -46,14 +46,14 @@ arc_projects = test/Slice/% test/Ice/% # Ice[osx-shared] not Ice[osx-arc-shared]). This is necessary since # we don't have an ARC specific build of the libraries. # -arc_cppflags := -fobjc-arc -fobjc-arc-exceptions -arc_dependency := +arc_cppflags := -fobjc-arc -fobjc-arc-exceptions +arc_dependency := # # Define slice2objc target extension since it can't be figured out # automatically from the slice2objc translator name. # -slice2objc_targetext = m +slice2objc_targetext = m # Rule for installing headers file from include/objc directory ifeq ($(filter all obj%c,$(ICE_BIN_DIST)),) @@ -69,10 +69,10 @@ endif # define make-objc-src-project ifeq ($(filter all obj%c,$(ICE_BIN_DIST)),) -$1_slicecompiler := slice2objc -$1_sliceflags += -I$(slicedir) -$1_cppflags += -I$(includedir) -I$(includedir)/generated -$1_ldflags += -framework Foundation +$1_slicecompiler := slice2objc +$1_sliceflags += -I$(slicedir) +$1_cppflags += -I$(includedir) -I$(includedir)/generated +$1_ldflags += -framework Foundation $(make-project) srcs:: $1 endif @@ -82,12 +82,12 @@ endef # $(make-objc-test-project $1=project) # define make-objc-test-project -$1_slicecompiler := slice2objc -$1_sliceflags := -I$(slicedir) $$($1_sliceflags) -$1_cppflags := -I$(includedir) -Itest/include -I$1 -I$1/generated $$($1_cppflags) -$1_ldflags += -framework Foundation +$1_slicecompiler := slice2objc +$1_sliceflags := -I$(slicedir) $$($1_sliceflags) +$1_cppflags := -I$(includedir) -Itest/include -I$1 -I$1/generated $$($1_cppflags) +$1_ldflags += -framework Foundation ifeq ($(filter all obj%c,$(ICE_BIN_DIST)),) -$1_cppflags += -I$(includedir)/generated +$1_cppflags += -I$(includedir)/generated endif $(make-project) tests:: $1 @@ -97,12 +97,12 @@ endef # $(create-objc-test-project $1=test) # define create-objc-test-project -$1_srcext := m -$1_dependencies := $$(or $$($1_dependencies),TestCommonObjC IceObjC) -$1_cppflags += -Itest/Ice +$1_srcext := m +$1_dependencies := $$(or $$($1_dependencies),TestCommonObjC IceObjC) +$1_cppflags += -Itest/Ice # Also link with IceSSL when compiling the project with the static configuration -$1[static]_dependencies := IceSSL +$1[static]_dependencies := IceSSL # Dependencies for Xcode SDK configuration $1[xcodesdk]_dependencies := IceSSL diff --git a/objective-c/config/Make.xcodesdk.rules b/objective-c/config/Make.xcodesdk.rules index fd759f4c29e..a7f6e927647 100644 --- a/objective-c/config/Make.xcodesdk.rules +++ b/objective-c/config/Make.xcodesdk.rules @@ -9,19 +9,19 @@ include $(top_srcdir)/config/Make.xcodesdk.rules -supported-configs += xcodesdk arc-xcodesdk +supported-configs += xcodesdk arc-xcodesdk # # Xcode configuration to build Xcode IceSDK. # -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_targetrule = $(if $(filter-out program,$($1_target)),static) +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_targetrule = $(if $(filter-out program,$($1_target)),static) -xcodesdk_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC TestCommonObjC -xcodesdk_projects = test/Ice/% +xcodesdk_components = Ice IceSSL IceObjC IceSSLObjC Glacier2ObjC IceStormObjC IceGridObjC TestCommonObjC +xcodesdk_projects = test/Ice/% -iphoneos_excludes = test/% +iphoneos_excludes = test/% iphonesimulator_excludes = test/% ifneq ($(findstring xcodesdk,$(configs)),) diff --git a/objective-c/src/Glacier2/Makefile.mk b/objective-c/src/Glacier2/Makefile.mk index aefebcfaef7..b349080fbd2 100644 --- a/objective-c/src/Glacier2/Makefile.mk +++ b/objective-c/src/Glacier2/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_libraries = Glacier2ObjC +$(project)_libraries = Glacier2ObjC -Glacier2ObjC_targetdir := $(libdir) -Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 -Glacier2ObjC_dependencies := IceObjC -Glacier2ObjC_slicedir := $(slicedir)/Glacier2 -Glacier2ObjC_includedir := $(includedir)/objc/Glacier2 +Glacier2ObjC_targetdir := $(libdir) +Glacier2ObjC_sliceflags := --include-dir objc/Glacier2 +Glacier2ObjC_dependencies := IceObjC +Glacier2ObjC_slicedir := $(slicedir)/Glacier2 +Glacier2ObjC_includedir := $(includedir)/objc/Glacier2 Glacier2ObjC_install:: $(install_includedir)/objc/Glacier2.h diff --git a/objective-c/src/Ice/Makefile.mk b/objective-c/src/Ice/Makefile.mk index 90afd254899..ca919e7bd4d 100644 --- a/objective-c/src/Ice/Makefile.mk +++ b/objective-c/src/Ice/Makefile.mk @@ -7,18 +7,18 @@ # # ********************************************************************** -$(project)_libraries = IceObjC +$(project)_libraries = IceObjC -IceObjC_targetdir := $(libdir) -IceObjC_cppflags := -DICE_API_EXPORTS -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceObjC_sliceflags := --include-dir objc/Ice -IceObjC_dependencies := Ice -IceObjC_slicedir := $(slicedir)/Ice -IceObjC_includedir := $(includedir)/objc/Ice -IceObjC_excludes := $(slicedir)/Ice/ValueFactory.ice \ - $(slicedir)/Ice/ObjectFactory.ice \ - $(slicedir)/Ice/Instrumentation.ice \ - $(slicedir)/Ice/Plugin.ice +IceObjC_targetdir := $(libdir) +IceObjC_cppflags := -DICE_API_EXPORTS -I$(project) -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated +IceObjC_sliceflags := --include-dir objc/Ice +IceObjC_dependencies := Ice +IceObjC_slicedir := $(slicedir)/Ice +IceObjC_includedir := $(includedir)/objc/Ice +IceObjC_excludes := $(slicedir)/Ice/ValueFactory.ice \ + $(slicedir)/Ice/ObjectFactory.ice \ + $(slicedir)/Ice/Instrumentation.ice \ + $(slicedir)/Ice/Plugin.ice IceObjC_install:: $(install_includedir)/objc/Ice.h diff --git a/objective-c/src/IceGrid/Makefile.mk b/objective-c/src/IceGrid/Makefile.mk index a3fb1638666..6adc2f6855b 100644 --- a/objective-c/src/IceGrid/Makefile.mk +++ b/objective-c/src/IceGrid/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_libraries = IceGridObjC +$(project)_libraries = IceGridObjC -IceGridObjC_targetdir := $(libdir) -IceGridObjC_sliceflags := --include-dir objc/IceGrid -IceGridObjC_dependencies := IceObjC Glacier2ObjC -IceGridObjC_slicedir := $(slicedir)/IceGrid -IceGridObjC_includedir := $(includedir)/objc/IceGrid +IceGridObjC_targetdir := $(libdir) +IceGridObjC_sliceflags := --include-dir objc/IceGrid +IceGridObjC_dependencies := IceObjC Glacier2ObjC +IceGridObjC_slicedir := $(slicedir)/IceGrid +IceGridObjC_includedir := $(includedir)/objc/IceGrid IceGridObjC_install:: $(install_includedir)/objc/IceGrid.h diff --git a/objective-c/src/IceSSL/Makefile.mk b/objective-c/src/IceSSL/Makefile.mk index f5f906ce2ec..803740c4f1b 100644 --- a/objective-c/src/IceSSL/Makefile.mk +++ b/objective-c/src/IceSSL/Makefile.mk @@ -7,14 +7,14 @@ # # ********************************************************************** -$(project)_libraries = IceSSLObjC +$(project)_libraries = IceSSLObjC -IceSSLObjC_targetdir := $(libdir) -IceSSLObjC_cppflags := -DICESSL_API_EXPORTS -Isrc/Ice -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated -IceSSLObjC_sliceflags := --include-dir objc/IceSSL -IceSSLObjC_dependencies := IceObjC IceSSL Ice -IceSSLObjC_slicedir := $(slicedir)/IceSSL -IceSSLObjC_includedir := $(includedir)/objc/IceSSL +IceSSLObjC_targetdir := $(libdir) +IceSSLObjC_cppflags := -DICESSL_API_EXPORTS -Isrc/Ice -I$(top_srcdir)/cpp/include -I$(top_srcdir)/cpp/include/generated +IceSSLObjC_sliceflags := --include-dir objc/IceSSL +IceSSLObjC_dependencies := IceObjC IceSSL Ice +IceSSLObjC_slicedir := $(slicedir)/IceSSL +IceSSLObjC_includedir := $(includedir)/objc/IceSSL IceSSLObjC_install:: $(install_includedir)/objc/IceSSL.h diff --git a/objective-c/src/IceStorm/Makefile.mk b/objective-c/src/IceStorm/Makefile.mk index 4418e15851c..b2354122433 100644 --- a/objective-c/src/IceStorm/Makefile.mk +++ b/objective-c/src/IceStorm/Makefile.mk @@ -7,13 +7,13 @@ # # ********************************************************************** -$(project)_libraries = IceStormObjC +$(project)_libraries = IceStormObjC -IceStormObjC_targetdir := $(libdir) -IceStormObjC_sliceflags := --include-dir objc/IceStorm -IceStormObjC_dependencies := IceObjC -IceStormObjC_slicedir := $(slicedir)/IceStorm -IceStormObjC_includedir := $(includedir)/objc/IceStorm +IceStormObjC_targetdir := $(libdir) +IceStormObjC_sliceflags := --include-dir objc/IceStorm +IceStormObjC_dependencies := IceObjC +IceStormObjC_slicedir := $(slicedir)/IceStorm +IceStormObjC_includedir := $(includedir)/objc/IceStorm IceStormObjC_install:: $(install_includedir)/objc/IceStorm.h diff --git a/objective-c/test/Common/Makefile.mk b/objective-c/test/Common/Makefile.mk index 053e9e56f86..bee95c57b9d 100644 --- a/objective-c/test/Common/Makefile.mk +++ b/objective-c/test/Common/Makefile.mk @@ -7,15 +7,15 @@ # # ********************************************************************** -$(project)_libraries = TestCommonObjC -$(project)_noinstall = 1 +$(project)_libraries = TestCommonObjC +$(project)_noinstall = 1 # # Put the shared TestCommon library in the lib directory for convenience on platforms # which don't support something like @loader_path. # -TestCommonObjC[shared]_targetdir := lib -TestCommonObjC_dependencies := IceObjC -TestCommonObjC_cppflags := -DTEST_API_EXPORTS -I$(includedir) -Itest/include +TestCommonObjC[shared]_targetdir := lib +TestCommonObjC_dependencies := IceObjC +TestCommonObjC_cppflags := -DTEST_API_EXPORTS -I$(includedir) -Itest/include projects += $(project) diff --git a/objective-c/test/Ice/admin/Makefile.mk b/objective-c/test/Ice/admin/Makefile.mk index 3f435765680..e0629545f26 100644 --- a/objective-c/test/Ice/admin/Makefile.mk +++ b/objective-c/test/Ice/admin/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = $(test-client-sources) TestI.m +$(test)_client_sources = $(test-client-sources) TestI.m tests += $(test) diff --git a/objective-c/test/Ice/defaultServant/Makefile.mk b/objective-c/test/Ice/defaultServant/Makefile.mk index af36c0072e8..4eb969d67b0 100644 --- a/objective-c/test/Ice/defaultServant/Makefile.mk +++ b/objective-c/test/Ice/defaultServant/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = DefaultServantTest.ice Client.m TestI.m +$(test)_client_sources = DefaultServantTest.ice Client.m TestI.m tests += $(test) diff --git a/objective-c/test/Ice/interceptor/Makefile.mk b/objective-c/test/Ice/interceptor/Makefile.mk index 3058ec13028..0fcb48d4b49 100644 --- a/objective-c/test/Ice/interceptor/Makefile.mk +++ b/objective-c/test/Ice/interceptor/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = InterceptorTest.ice Client.m InterceptorI.m MyObjectI.m +$(test)_client_sources = InterceptorTest.ice Client.m InterceptorI.m MyObjectI.m tests += $(test) diff --git a/objective-c/test/Ice/invoke/Makefile.mk b/objective-c/test/Ice/invoke/Makefile.mk index 4fe345612e9..2c95f188c1c 100644 --- a/objective-c/test/Ice/invoke/Makefile.mk +++ b/objective-c/test/Ice/invoke/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = InvokeTest.ice Server.m BlobjectI.m +$(test)_server_sources = InvokeTest.ice Server.m BlobjectI.m tests += $(test) diff --git a/objective-c/test/Ice/location/Makefile.mk b/objective-c/test/Ice/location/Makefile.mk index 4e2a0fbd963..cd2d14888ed 100644 --- a/objective-c/test/Ice/location/Makefile.mk +++ b/objective-c/test/Ice/location/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = LocationTest.ice ServerLocator.m Server.m TestI.m +$(test)_server_sources = LocationTest.ice ServerLocator.m Server.m TestI.m tests += $(test) diff --git a/objective-c/test/Ice/operations/Makefile.mk b/objective-c/test/Ice/operations/Makefile.mk index 0834fab5f16..03f0dce5284 100644 --- a/objective-c/test/Ice/operations/Makefile.mk +++ b/objective-c/test/Ice/operations/Makefile.mk @@ -7,12 +7,12 @@ # # ********************************************************************** -$(test)_client_sources = $(test-client-sources) \ - Twoways.m \ - TwowaysNewAMI.m \ - Oneways.m \ - OnewaysNewAMI.m \ - BatchOneways.m \ - BatchOnewaysAMI.m +$(test)_client_sources = $(test-client-sources) \ + Twoways.m \ + TwowaysNewAMI.m \ + Oneways.m \ + OnewaysNewAMI.m \ + BatchOneways.m \ + BatchOnewaysAMI.m tests += $(test) diff --git a/objective-c/test/Ice/servantLocator/Makefile.mk b/objective-c/test/Ice/servantLocator/Makefile.mk index 92e1b7341a1..d7ac35282f4 100644 --- a/objective-c/test/Ice/servantLocator/Makefile.mk +++ b/objective-c/test/Ice/servantLocator/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_server_sources = $(test-server-sources) ServantLocatorI.m +$(test)_server_sources = $(test-server-sources) ServantLocatorI.m tests += $(test) diff --git a/objective-c/test/Ice/services/Makefile.mk b/objective-c/test/Ice/services/Makefile.mk index adbdaba19ab..6a5a9fa4cdf 100644 --- a/objective-c/test/Ice/services/Makefile.mk +++ b/objective-c/test/Ice/services/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_dependencies = IceObjC IceGridObjC Glacier2ObjC IceStormObjC TestCommonObjC +$(test)_dependencies = IceObjC IceGridObjC Glacier2ObjC IceStormObjC TestCommonObjC tests += $(test) diff --git a/objective-c/test/Ice/slicing/exceptions/Makefile.mk b/objective-c/test/Ice/slicing/exceptions/Makefile.mk index 3567513d254..3c89fa24cf5 100644 --- a/objective-c/test/Ice/slicing/exceptions/Makefile.mk +++ b/objective-c/test/Ice/slicing/exceptions/Makefile.mk @@ -7,7 +7,7 @@ # # ********************************************************************** -$(test)_client_sources = Client.m AllTests.m SlicingExceptionsTestClient.ice -$(test)_server_sources = Server.m TestI.m SlicingExceptionsTestServer.ice +$(test)_client_sources = Client.m AllTests.m SlicingExceptionsTestClient.ice +$(test)_server_sources = Server.m TestI.m SlicingExceptionsTestServer.ice tests += $(test) diff --git a/objective-c/test/Ice/slicing/objects/Makefile.mk b/objective-c/test/Ice/slicing/objects/Makefile.mk index 5db8a67cb8f..59fbe0c2192 100644 --- a/objective-c/test/Ice/slicing/objects/Makefile.mk +++ b/objective-c/test/Ice/slicing/objects/Makefile.mk @@ -7,7 +7,7 @@ # # ********************************************************************** -$(test)_client_sources = Client.m AllTests.m SlicingObjectsTestClient.ice SlicingObjectsForwardClient.ice -$(test)_server_sources = Server.m TestI.m SlicingObjectsTestServer.ice SlicingObjectsForwardServer.ice +$(test)_client_sources = Client.m AllTests.m SlicingObjectsTestClient.ice SlicingObjectsForwardClient.ice +$(test)_server_sources = Server.m TestI.m SlicingObjectsTestServer.ice SlicingObjectsForwardServer.ice tests += $(test) diff --git a/objective-c/test/Slice/escape/Makefile.mk b/objective-c/test/Slice/escape/Makefile.mk index 172ffdd0d12..6710d6de10a 100644 --- a/objective-c/test/Slice/escape/Makefile.mk +++ b/objective-c/test/Slice/escape/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = Client.m Clash.ice Key.ice Inherit.ice +$(test)_client_sources = Client.m Clash.ice Key.ice Inherit.ice tests += $(test) diff --git a/objective-c/test/ios/controller/Makefile.mk b/objective-c/test/ios/controller/Makefile.mk index 61cda72c27f..2ff5750d33d 100644 --- a/objective-c/test/ios/controller/Makefile.mk +++ b/objective-c/test/ios/controller/Makefile.mk @@ -7,14 +7,14 @@ # # ********************************************************************** -$(project)_type = xcode -$(project)_platforms = iphonesimulator iphoneos -$(project)_configs = xcodesdk arc-xcodesdk -$(project)_dependencies = $(if $(ICE_BIN_DIST),,IceObjC IceSSLObjC IceGridObjC Glacier2ObjC IceStormObjC) -$(project)_project = Objective-C Test Controller.xcodeproj -$(project)_scheme = $(if $(filter arc-xcodesdk,$2),Objective-C ARC Test Controller,Objective-C Test Controller) +$(project)_type = xcode +$(project)_platforms = iphonesimulator iphoneos +$(project)_configs = xcodesdk arc-xcodesdk +$(project)_dependencies = $(if $(ICE_BIN_DIST),,IceObjC IceSSLObjC IceGridObjC Glacier2ObjC IceStormObjC) +$(project)_project = Objective-C Test Controller.xcodeproj +$(project)_scheme = $(if $(filter arc-xcodesdk,$2),Objective-C ARC Test Controller,Objective-C Test Controller) # Always build debug configuration to prevent symbols from being stripped -$(project)_configuration = Debug +$(project)_configuration = Debug projects += $(project) tests:: $(project) |