ios, prepare for multiple targets.

Moved common macros to CustomTarget_Lo_Xcconfig.mk
to simplify each real target

added link to workdir/ios (needed by xcodeproj)

moved creation of configuration files to LO_Xcconfig, since
they are identical for all ios projects

central part of moving non git files to workdir completed

changed relative path in project.pbxproj to be <project> instead of <group>

Change-Id: I6be51f4d8a07ea7da08c0e5f1458fccfc3831a1e
Reviewed-on: https://gerrit.libreoffice.org/34223
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@libreoffice.org>

1 files changed, 3 insertions, 97 deletions

diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index 4c14329a70c8..d542c3ede0eb 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -7,26 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #- Env ------------------------------------------------------------------------
-
-TiledLibreOffice_resource := experimental/TiledLibreOffice/Resources
 BUILDID			:=$(shell cd $(SRCDIR) && git log -1 --format=%H)
 
-#- Macros ---------------------------------------------------------------------
-
-define TiledLibreOfficeXcodeBuild
-	CC=; \
-	$(call gb_Helper_print_on_error, \
-		xcodebuild \
-			-project experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj \
-			-target TiledLibreOffice \
-			-sdk $(XCODEBUILD_SDK) \
-			-arch $(XCODE_ARCHS) \
-			-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
-			$(1) \
-		, $$@.log \
-	)
-endef
-
 #- Targets --------------------------------------------------------------------
 
 .PHONY: TiledLibreOffice_setup
@@ -36,89 +18,13 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/TiledLibreOffice))
 
 # Build
 # Depend on the custom target that sets up lo.xcconfig
-$(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig) TiledLibreOffice_setup
+$(call gb_CustomTarget_get_target,ios/TiledLibreOffice): $(call gb_CustomTarget_get_target,ios/Lo_Xcconfig)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
-	$(SRCDIR)/solenv/bin/native-code.py \
-		-g core -g writer -g calc -g draw -g edit \
-		> $(SRCDIR)/ios/experimental/TiledLibreOffice/TiledLibreOffice/native-code.mm
-	$(call TiledLibreOfficeXcodeBuild, clean build)
-
-# Setup
-TiledLibreOffice_setup:
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
-
-	# Resources #
-	rm -rf $(TiledLibreOffice_resource) 2>/dev/null
-	mkdir -p $(TiledLibreOffice_resource)
-	mkdir -p $(TiledLibreOffice_resource)/services
-
-	# copy rdb files
-	cp $(INSTDIR)/program/types.rdb	            $(TiledLibreOffice_resource)/udkapi.rdb
-	cp $(INSTDIR)/program/types/offapi.rdb      $(TiledLibreOffice_resource)
-	cp $(INSTDIR)/program/types/oovbaapi.rdb  	$(TiledLibreOffice_resource)
-	cp $(INSTDIR)/program/services/services.rdb $(TiledLibreOffice_resource)/services
-	cp $(INSTDIR)/program/services.rdb          $(TiledLibreOffice_resource)
-
-	# copy .res files
-	# program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure,
-	# we could set STAR_RESOURCE_PATH instead. sigh...
-	mkdir -p $(TiledLibreOffice_resource)/program/resource
-	cp $(INSTDIR)/program/resource/*en-US.res $(TiledLibreOffice_resource)/program/resource
-
-	# soffice.cfg
-	mkdir -p $(TiledLibreOffice_resource)/share/config
-	cp -R $(INSTDIR)/share/config/soffice.cfg $(TiledLibreOffice_resource)/share/config
-
-	# Japanese and Chinese dict files
-	cp $(WORKDIR)/CustomTarget/i18npool/breakiterator/dict_*.data $(TiledLibreOffice_resource)/share
-
-	# Drawing ML custom shape data files
-	mkdir -p $(TiledLibreOffice_resource)/share/filter
-	cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(TiledLibreOffice_resource)/share/filter
-	cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(TiledLibreOffice_resource)/share/filter
-	cp $(INSTDIR)/share/filter/vml-shape-types $(TiledLibreOffice_resource)/share/filter
-
-	# "registry"
-	cp -R $(INSTDIR)/share/registry $(TiledLibreOffice_resource)/share
-
-	# Set up rc, the "inifile". See getIniFileName_Impl().
-	file=$(TiledLibreOffice_resource)/rc; \
-	echo '[Bootstrap]'                                       >  $$file; \
-	echo 'URE_BOOTSTRAP=file://$$APP_DATA_DIR/fundamentalrc' >> $$file; \
-	echo 'HOME=$$SYSUSERHOME'                                >> $$file;
-
-	# Set up fundamentalrc, unorc, bootstraprc and versionrc.
-	# Do we really need all these?
-	file=$(TiledLibreOffice_resource)/fundamentalrc; \
-	echo '[Bootstrap]'                                      >  $$file; \
-	echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/'            >> $$file; \
-	echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR'             >> $$file; \
-	echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/registry' >> $$file; \
-	echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb file://$$APP_DATA_DIR/offapi.rdb' >> $$file; \
-	echo 'UNO_SERVICES=file://$$APP_DATA_DIR/services.rdb file://$$APP_DATA_DIR/services/services.rdb' >> $$file; \
-	echo 'OSL_SOCKET_PATH=$$APP_DATA_DIR/cache' >> $$file
-
-	file=$(TiledLibreOffice_resource)/unorc; \
-	echo '[Bootstrap]' > $$file;
-
-	# bootstraprc must be in $BRAND_BASE_DIR/program
-	mkdir -p $(TiledLibreOffice_resource)/program
-	file=$(TiledLibreOffice_resource)/program/bootstraprc; \
-	echo '[Bootstrap]'                                                              >  $$file; \
-	echo 'InstallMode=<installmode>'                                                >> $$file; \
-	echo "ProductKey=LibreOffice $(PRODUCTVERSION)"                                 >> $$file; \
-	echo 'UserInstallation=$$SYSUSERHOME/userinstallation'                          >> $$file;
-
-	# Is this really needed?
-	file=$(TiledLibreOffice_resource)/program/versionrc; \
-	echo '[Version]'            >  $$file; \
-	echo 'AllLanguages=en-US'   >> $$file; \
-	echo 'BuildVersion='        >> $$file; \
-	echo "buildid=$(BUILDID)"   >> $$file;
+	$(call IOSbuild,TiledLibreOffice, clean build)
 
 # Clean
 $(call gb_CustomTarget_get_clean_target,ios/TiledLibreOffice):
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),APP,2)
-	$(call TiledLibreOfficeXcodeBuild, clean)
+	$(call IOSbuild,TiledLibreOffice, clean)
 
 # vim: set noet sw=4 ts=4: