Skip to content

C
core
Kaydet (Commit) 9bda1ac6 authored tarafından jan Iversen's avatar jan Iversen
Dosyalara gözat
Seçenekler

iOS, change generation of xcconfig 

The generation was far to complex simplified.

Change-Id: Iea2f1b9630f70f05deeb8eb44aa8333989929642
üst 8481019c
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 46 deletions
ios/CustomTarget_iOS.mk
Dosyayı görüntüle @ 9bda1ac6
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
#- Env ------------------------------------------------------------------------ #- Env ------------------------------------------------------------------------
IOSGEN := $(SRCDIR)/ios/generated IOSGEN := $(SRCDIR)/ios/generated
IOSRES := $(IOSGEN)/resources IOSRES := $(IOSGEN)/resources
IOSKITXC := $(BUILDDIR)/ios/loKit.xcconfig IOSKITXC := $(WORKDIR)/ios/loKit.xcconfig
IOSAPPXC := $(BUILDDIR)/ios/loApp.xcconfig IOSAPPXC := $(WORKDIR)/ios/loApp.xcconfig
IOSKITPRJ := $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj IOSKITPRJ := $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj
IOSAPPPRJ := $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj IOSAPPPRJ := $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj
IOSAPP := $(INSTDIR)/LibreOfficeLight.app IOSAPP := $(INSTDIR)/LibreOfficeLight.app
...@@ -27,36 +27,29 @@ $(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT) ...@@ -27,36 +27,29 @@ $(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT)
#- Generate xcconfig files --------------------------------------------------- #- Generate xcconfig files ---------------------------------------------------
$(IOSKITXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
@echo "// Xcode configuration properties" > $(IOSKITXC) @mkdir -p $(IOSGEN) $(WORKDIR)/ios;
@echo "LO_BUILDDIR = $(BUILDDIR)" >> $(IOSKITXC) sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
@echo "LO_INSTDIR = $(INSTDIR)" >> $(IOSKITXC) -e "s'@INSTDIR@'$(INSTDIR)'g" \
@echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSKITXC) -e "s'@SRCDIR@'$(SRC_ROOT)'g" \
@echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSKITXC) -e "s'@WORKDIR@'$(WORKDIR)'g" \
@echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC) -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
@echo "OTHER_CPLUSPLUSFLAGS = $(gb_GLOBALDEFS)" >> $(IOSKITXC) -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
@echo "PRELINK_LIBS = `$(SRCDIR)/bin/lo-all-static-libs`" >> $(IOSKITXC) -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \
@echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosKit.map " >> $(IOSKITXC) -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
@echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSKITXC) -e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \
$(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig
$(IOSAPPXC) : $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) -e "s'@INSTDIR@'$(INSTDIR)'g" \
@mkdir -p $(IOSGEN); -e "s'@SRCDIR@'$(SRC_ROOT)'g" \
@echo "// Xcode configuration properties" > $(IOSAPPXC) -e "s'@WORKDIR@'$(WORKDIR)'g" \
@echo "LO_BUILDDIR = $(BUILDDIR)" >> $(IOSAPPXC) -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
@echo "LO_INSTDIR = $(INSTDIR)" >> $(IOSAPPXC) -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
@echo "LO_SRCDIR = $(SRC_ROOT)" >> $(IOSAPPXC) -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \
@echo "LO_WORKDIR = $(WORKDIR)" >> $(IOSAPPXC) -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
@echo "OTHER_CFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPPXC) $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig
@echo "OTHER_CPLUSPLUSFLAGS = $(gb_GLOBALDEFS)" >> $(IOSAPPXC)
@echo "LINK_LDFLAGS = -Wl,-lz,-liconv,-map,$(WORKDIR)/iosApp.map " >> $(IOSAPPXC)
@echo "SYMROOT = $(WORKDIR)/ios/build\n" >> $(IOSAPPXC)
#- Generate ios ------------------------------------------------------------
.PHONY : iosCopySetup
iosCopySetup: $(IOSKITXC) $(IOSAPPXC)
ifeq ("$(wildcard $(IOSRES))","") ifeq ("$(wildcard $(IOSRES))","")
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
...@@ -116,9 +109,8 @@ endif ...@@ -116,9 +109,8 @@ endif
#- build --------------------------------------------------------------------- #- build ---------------------------------------------------------------------
$(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj iosCopySetup $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj $(IOSKITXC) $(IOSAPPXC)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
mkdir -p $(WORKDIR)/ios
CC=; \ CC=; \
$(call gb_Helper_print_on_error, \ $(call gb_Helper_print_on_error, \
xcodebuild \ xcodebuild \
...@@ -137,7 +129,6 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj iosCopySetup ...@@ -137,7 +129,6 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj iosCopySetup
$(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT) $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
mkdir -p $(WORKDIR)/ios
CC=; \ CC=; \
$(call gb_Helper_print_on_error, \ $(call gb_Helper_print_on_error, \
xcodebuild \ xcodebuild \
...@@ -155,13 +146,12 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT) ...@@ -155,13 +146,12 @@ $(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
#- clean ios ----------------------------------------------------------------- #- clean ios -----------------------------------------------------------------
$(call gb_CustomTarget_get_clean_target,ios/ios): $(call gb_CustomTarget_get_clean_target,ios/ios):
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2) $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
rm -rf $(IOSGEN) $(IOSKITXC) $(IOSAPPXC) rm -rf $(IOSGEN)
rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.xcworkspace rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.xcworkspace
rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/xcuserdata rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/xcuserdata
rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.xcworkspace rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.xcworkspace
rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcuserdata rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcuserdata
rm -rf $(SRCDIR)/ios/LibreOfficeLight/build rm -rf $(WORKDIR)/ios
rm -rf $(SRCDIR)/ios/LibreOfficeKit/build
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
Dosyayı görüntüle @ 9bda1ac6
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = /Users/jani/lo_ios/ios/loKit.xcconfig; sourceTree = "<group>"; }; 3908315E1F8395EB003F2A29 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = ../../../../../../../Users/jani/lo_ios/workdir/ios/loKit.xcconfig; sourceTree = "<group>"; };
39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; }; 39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; }; 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; };
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; }; 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; };
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
39B5D2171F78130F008FB162 /* LibreOfficeKit */ = { 39B5D2171F78130F008FB162 /* LibreOfficeKit */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */, 3908315E1F8395EB003F2A29 /* loKit.xcconfig */,
39B5D2181F78130F008FB162 /* LibreOfficeKit.h */, 39B5D2181F78130F008FB162 /* LibreOfficeKit.h */,
39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */, 39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */,
); );
...@@ -142,10 +142,12 @@ ...@@ -142,10 +142,12 @@
/* Begin XCBuildConfiguration section */ /* Begin XCBuildConfiguration section */
39B5D21C1F78130F008FB162 /* Debug */ = { 39B5D21C1F78130F008FB162 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)"; ARCHS = (
x86_64,
arm64,
);
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
...@@ -203,16 +205,18 @@ ...@@ -203,16 +205,18 @@
"-lstdc++", "-lstdc++",
); );
SDKROOT = iphoneos; SDKROOT = iphoneos;
VALID_ARCHS = "arm64 x86_64"; VALID_ARCHS = "x86_64 arm64";
}; };
name = Debug; name = Debug;
}; };
39B5D21D1F78130F008FB162 /* Release */ = { 39B5D21D1F78130F008FB162 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)"; ARCHS = (
x86_64,
arm64,
);
CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
...@@ -271,7 +275,6 @@ ...@@ -271,7 +275,6 @@
}; };
39B5D21F1F78130F008FB162 /* Debug */ = { 39B5D21F1F78130F008FB162 /* Debug */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */;
buildSettings = { buildSettings = {
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
...@@ -281,7 +284,6 @@ ...@@ -281,7 +284,6 @@
}; };
39B5D2201F78130F008FB162 /* Release */ = { 39B5D2201F78130F008FB162 /* Release */ = {
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
baseConfigurationReference = 39AB2EC91F7D6D3D00E6FDA9 /* loKit.xcconfig */;
buildSettings = { buildSettings = {
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
......
ios/loApp.xcconfig.in 0 → 100644
Dosyayı görüntüle @ 9bda1ac6
//
// This file is part of the LibreOffice project.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
//
// Xcode configuration properties
LO_BUILDDIR = @BUILDDIR@
LO_INSTDIR = @INSTDIR@
LO_SRCDIR = @SRCDIR@
LO_WORKDIR = @WORKDIR@
OTHER_CFLAGS = @CFLAGS@
OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
LINK_LDFLAGS = @LDFLAGS@
SYMROOT = @SYMROOT@
ios/loKit.xcconfig.in 0 → 100644
Dosyayı görüntüle @ 9bda1ac6
//
// This file is part of the LibreOffice project.
//
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
//
// Xcode configuration properties
LO_BUILDDIR = @BUILDDIR@
LO_INSTDIR = @INSTDIR@
LO_SRCDIR = @SRCDIR@
LO_WORKDIR = @WORKDIR@
OTHER_CFLAGS = @CFLAGS@
OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
LINK_LDFLAGS = @LDFLAGS@
SYMROOT = @SYMROOT@
PRELINK_LIBS = @PRELINK@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment