[Libreoffice-commits] core.git: 3 commits - include/LibreOfficeKit ios/CustomTarget_iOS.mk ios/CustomTarget_iOS_setup.mk ios/LibreOfficeKit ios/loKit.xcconfig.in ios/Module_ios.mk ios/source ios/StaticLibrary_iOSkit.mk
jan Iversen
jani at libreoffice.org
Thu Nov 23 07:54:08 UTC 2017
include/LibreOfficeKit/LibreOfficeKitInit.h | 1
ios/CustomTarget_iOS_setup.mk | 88 ---
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 334 ------------
ios/Module_ios.mk | 3
ios/StaticLibrary_iOSkit.mk | 31 +
ios/loKit.xcconfig.in | 19
ios/source/LibreOfficeKit.c | 8
7 files changed, 50 insertions(+), 434 deletions(-)
New commits:
commit ed885a3cdbfc4b4d194d40508a29334b9780858f
Author: jan Iversen <jani at libreoffice.org>
Date: Thu Nov 23 08:47:59 2017 +0100
iOS, do not use different C compilers
LibreOfficeKit.c was compiled with an xcode project and not like
all other sources. Changed to use clang with same switches as
rest of LO.
Separated resource generation in own makefile
Removed project LibreOfficeKit which was responsible for prelink.
Change-Id: Iaf9fbb4b652501af0b7f3643ed3efcc2ed93b611
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS_setup.mk
similarity index 55%
rename from ios/CustomTarget_iOS.mk
rename to ios/CustomTarget_iOS_setup.mk
index a9fb058db406..a1ae23e0fa3e 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -8,43 +8,20 @@
#- Env ------------------------------------------------------------------------
IOSGEN := $(SRCDIR)/ios/generated
IOSRES := $(IOSGEN)/resources
-IOSKITXC := $(WORKDIR)/ios/loKit.xcconfig
IOSAPPXC := $(WORKDIR)/ios/loApp.xcconfig
-IOSKITSRC := $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit
-IOSAPPSRC := $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight
-IOSKITPRJ := $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj
-IOSAPPPRJ := $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj
-IOSAPP := $(INSTDIR)/LibreOfficeLight.app
-ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT := libLibreOfficeKit_$(CPUNAME)_debug.a
-else
-IOSKIT := libLibreOfficeKit_$(CPUNAME).a
-endif
#- Top level -----------------------------------------------------------------
-$(eval $(call gb_CustomTarget_CustomTarget,ios/ios))
+$(eval $(call gb_CustomTarget_CustomTarget,ios/ios_setup))
-$(call gb_CustomTarget_get_target,ios/ios): $(IOSGEN)/$(IOSKIT)
+$(call gb_CustomTarget_get_target,ios/ios_setup): $(IOSAPPXC) $(IOSGEN)/native-code.h
-#- Generate xcconfig files ---------------------------------------------------
-$(IOSKITXC): $(SRCDIR)/ios/loKit.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
- @mkdir -p $(WORKDIR)/ios
- sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
- -e "s'@INSTDIR@'$(INSTDIR)'g" \
- -e "s'@SRCDIR@'$(SRC_ROOT)'g" \
- -e "s'@WORKDIR@'$(WORKDIR)'g" \
- -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
- -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
- -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
- -e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \
- $(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig
-$(IOSAPPXC): $(SRCDIR)/ios/loKit.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
+#- Generate dynamic files ---------------------------------------------------
+$(IOSAPPXC): $(SRCDIR)/ios/loApp.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
@mkdir -p $(WORKDIR)/ios
sed -e "s'@BUILDDIR@'$(BUILDDIR)'g" \
@@ -54,9 +31,11 @@ $(IOSAPPXC): $(SRCDIR)/ios/loKit.xcconfig.in $(BUILDDIR)/config_host.mk $(SRCDIR
-e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \
-e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \
- $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig
+ $(SRCDIR)/ios/loApp.xcconfig.in > $(IOSAPPXC)
+
+
-$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS.mk
+$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2)
mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \
$(IOSRES)/share/config $(IOSRES)/share/filter $(IOSRES)/program \
@@ -113,59 +92,12 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
echo "buildid=$(BUILDID)" >> $(IOSRES)/program/versionrc
-#- build ---------------------------------------------------------------------
-$(IOSGEN)/$(IOSKIT): $(IOSKITXC) $(IOSAPPXC) $(IOSGEN)/native-code.h STAT_LIB_DEPEND
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
- CC=; \
- $(call gb_Helper_print_on_error, \
- xcodebuild \
- -xcconfig $(IOSKITXC) \
- -project $(IOSKITPRJ) \
- -target LibreOfficeKit \
- -sdk $(IOS_SDK) \
- -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'`\
- -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
- build \
- , $(WORKDIR)/ios/build.log \
- )
- cp $(WORKDIR)/ios/build/*/libLibreOfficeKit.a $(IOSGEN)/$(IOSKIT)
-
-STAT_LIB_DEPEND:
-
-
-
-$(INSTDIR)/$(IOSAPP): $(IOSAPPPRJ)/project.pbxproj $(IOSGEN)/$(IOSKIT)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),APP,2)
- CC=; \
- $(call gb_Helper_print_on_error, \
- xcodebuild \
- -xcconfig $(IOSAPPXC) \
- -project $(IOSAPPPRJ) \
- -target LibreOfficeLight \
- -sdk $(IOS_SDK) \
- -arch $(CPU_NAME) \
- -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
- build \
- , $(WORKDIR)/ios/build.log \
- )
#- clean ios -----------------------------------------------------------------
-$(call gb_CustomTarget_get_clean_target,ios/ios):
+$(call gb_CustomTarget_get_clean_target,ios/ios_setup):
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2)
- $(call gb_Helper_print_on_error, \
- xcodebuild -xcconfig $(IOSAPPXC) -project $(IOSAPPPRJ) clean \
- , $(WORKDIR)/ios/build.log \
- )
- $(call gb_Helper_print_on_error, \
- xcodebuild -xcconfig $(IOSKITXC) -configuration Debug -project $(IOSKITPRJ) clean \
- , $(WORKDIR)/ios/build.log \
- )
- rm -f $(IOSGEN)/$(IOSKIT)
- rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.xcworkspace
- rm -rf $(SRCDIR)/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/xcuserdata
- rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.xcworkspace
- rm -rf $(SRCDIR)/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcuserdata
+ rm -rf $(IOSRES) $(IOSGEN)/native-code.h $(IOSAPPXC)
rm -rf $(WORKDIR)/ios
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
deleted file mode 100644
index abd1fe3ec65b..000000000000
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,334 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 48;
- objects = {
-
-/* Begin PBXBuildFile section */
- 39503A731F94CBA000F19C78 /* LibreOfficeKit.c in Sources */ = {isa = PBXBuildFile; fileRef = 39503A721F94CBA000F19C78 /* LibreOfficeKit.c */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- 39B5D2131F78130F008FB162 /* CopyFiles */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "$(SRCDIR)/ios/generated";
- dstSubfolderSpec = 0;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- 39503A6E1F94C3B700F19C78 /* LibreOfficeKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; };
- 39503A721F94CBA000F19C78 /* LibreOfficeKit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = LibreOfficeKit.c; sourceTree = "<group>"; };
- 3950BAE11F9CA739001A4E96 /* 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; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 39B5D2121F78130F008FB162 /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 3969A8C91F782610006F06A9 /* Support files */ = {
- isa = PBXGroup;
- children = (
- 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */,
- );
- name = "Support files";
- sourceTree = "<group>";
- };
- 39B5D20C1F78130F008FB162 = {
- isa = PBXGroup;
- children = (
- 39B5D2171F78130F008FB162 /* LibreOfficeKit */,
- 39B5D2161F78130F008FB162 /* Products */,
- 3969A8C91F782610006F06A9 /* Support files */,
- );
- sourceTree = "<group>";
- };
- 39B5D2161F78130F008FB162 /* Products */ = {
- isa = PBXGroup;
- children = (
- 39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 39B5D2171F78130F008FB162 /* LibreOfficeKit */ = {
- isa = PBXGroup;
- children = (
- 39503A721F94CBA000F19C78 /* LibreOfficeKit.c */,
- 39503A6E1F94C3B700F19C78 /* LibreOfficeKit.h */,
- );
- path = LibreOfficeKit;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 39B5D2141F78130F008FB162 /* LibreOfficeKit */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 39B5D21E1F78130F008FB162 /* Build configuration list for PBXNativeTarget "LibreOfficeKit" */;
- buildPhases = (
- 39B5D2111F78130F008FB162 /* Sources */,
- 39B5D2121F78130F008FB162 /* Frameworks */,
- 39B5D2131F78130F008FB162 /* CopyFiles */,
- );
- buildRules = (
- );
- dependencies = (
- );
- name = LibreOfficeKit;
- productName = LibreOfficeKit;
- productReference = 39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */;
- productType = "com.apple.product-type.library.static";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 39B5D20D1F78130F008FB162 /* Project object */ = {
- isa = PBXProject;
- attributes = {
- LastUpgradeCheck = 0900;
- ORGANIZATIONNAME = jani;
- TargetAttributes = {
- 39B5D2141F78130F008FB162 = {
- CreatedOnToolsVersion = 8.3;
- ProvisioningStyle = Automatic;
- };
- };
- };
- buildConfigurationList = 39B5D2101F78130F008FB162 /* Build configuration list for PBXProject "LibreOfficeKit" */;
- compatibilityVersion = "Xcode 8.0";
- developmentRegion = English;
- hasScannedForEncodings = 0;
- knownRegions = (
- en,
- );
- mainGroup = 39B5D20C1F78130F008FB162;
- productRefGroup = 39B5D2161F78130F008FB162 /* Products */;
- projectDirPath = "";
- projectRoot = "";
- targets = (
- 39B5D2141F78130F008FB162 /* LibreOfficeKit */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
- 39B5D2111F78130F008FB162 /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 39503A731F94CBA000F19C78 /* LibreOfficeKit.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
- 39B5D21C1F78130F008FB162 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ANALYZER_NONNULL = YES;
- CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = dwarf;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- ENABLE_TESTABILITY = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- GENERATE_MASTER_OBJECT_FILE = YES;
- HEADER_SEARCH_PATHS = (
- "$(inherited)",
- /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
- "$(LO_BUILDDIR)/config_host",
- "$(LO_SRCDIR)/include",
- "$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
- "$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
- "$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_SRCDIR)/ios/generated",
- );
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
- LD_GENERATE_MAP_FILE = YES;
- LD_MAP_FILE_PATH = ./iosKit.map;
- LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
- MACH_O_TYPE = staticlib;
- MTL_ENABLE_DEBUG_INFO = YES;
- ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -g";
- SDKROOT = iphoneos;
- VALID_ARCHS = "x86_64 arm64";
- };
- name = Debug;
- };
- 39B5D21D1F78130F008FB162 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */;
- buildSettings = {
- ALWAYS_SEARCH_USER_PATHS = NO;
- CLANG_ANALYZER_NONNULL = YES;
- CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES;
- CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "libc++";
- CLANG_ENABLE_MODULES = YES;
- CLANG_ENABLE_OBJC_ARC = YES;
- CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
- CLANG_WARN_BOOL_CONVERSION = YES;
- CLANG_WARN_COMMA = YES;
- CLANG_WARN_CONSTANT_CONVERSION = YES;
- CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
- CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
- CLANG_WARN_EMPTY_BODY = YES;
- CLANG_WARN_ENUM_CONVERSION = YES;
- CLANG_WARN_INFINITE_RECURSION = YES;
- CLANG_WARN_INT_CONVERSION = YES;
- CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
- CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
- CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
- CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
- CLANG_WARN_STRICT_PROTOTYPES = YES;
- CLANG_WARN_SUSPICIOUS_MOVE = YES;
- CLANG_WARN_UNREACHABLE_CODE = YES;
- CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
- COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = dwarf;
- ENABLE_NS_ASSERTIONS = NO;
- ENABLE_STRICT_OBJC_MSGSEND = YES;
- GCC_C_LANGUAGE_STANDARD = gnu99;
- GCC_NO_COMMON_BLOCKS = YES;
- GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
- GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
- GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
- GCC_WARN_UNDECLARED_SELECTOR = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- GCC_WARN_UNUSED_FUNCTION = YES;
- GCC_WARN_UNUSED_VARIABLE = YES;
- GENERATE_MASTER_OBJECT_FILE = YES;
- HEADER_SEARCH_PATHS = (
- "$(inherited)",
- /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
- "$(LO_BUILDDIR)/config_host",
- "$(LO_SRCDIR)/include",
- "$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
- "$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
- "$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
- "$(LO_SRCDIR)/ios/generated",
- );
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
- LD_GENERATE_MAP_FILE = YES;
- LD_MAP_FILE_PATH = ./iosKit.map;
- LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
- MACH_O_TYPE = staticlib;
- MTL_ENABLE_DEBUG_INFO = NO;
- ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -g";
- SDKROOT = iphoneos;
- VALIDATE_PRODUCT = YES;
- VALID_ARCHS = "x86_64 arm64";
- };
- name = Release;
- };
- 39B5D21F1F78130F008FB162 /* Debug */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */;
- buildSettings = {
- ENABLE_BITCODE = NO;
- MACH_O_TYPE = staticlib;
- OTHER_LDFLAGS = "";
- PRELINK_FLAGS = "-ios_version_min 11.1";
- PRELINK_LIBS = "";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SKIP_INSTALL = YES;
- };
- name = Debug;
- };
- 39B5D2201F78130F008FB162 /* Release */ = {
- isa = XCBuildConfiguration;
- baseConfigurationReference = 3950BAE11F9CA739001A4E96 /* loKit.xcconfig */;
- buildSettings = {
- ENABLE_BITCODE = NO;
- MACH_O_TYPE = staticlib;
- OTHER_LDFLAGS = "";
- PRELINK_FLAGS = "-ios_version_min 11.1";
- PRELINK_LIBS = "";
- PRODUCT_NAME = "$(TARGET_NAME)";
- SKIP_INSTALL = YES;
- };
- name = Release;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- 39B5D2101F78130F008FB162 /* Build configuration list for PBXProject "LibreOfficeKit" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 39B5D21C1F78130F008FB162 /* Debug */,
- 39B5D21D1F78130F008FB162 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 39B5D21E1F78130F008FB162 /* Build configuration list for PBXNativeTarget "LibreOfficeKit" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 39B5D21F1F78130F008FB162 /* Debug */,
- 39B5D2201F78130F008FB162 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 39B5D20D1F78130F008FB162 /* Project object */;
-}
diff --git a/ios/Module_ios.mk b/ios/Module_ios.mk
index 2a8e248670ba..de8a8d2a0af7 100644
--- a/ios/Module_ios.mk
+++ b/ios/Module_ios.mk
@@ -11,7 +11,8 @@ $(eval $(call gb_Module_Module,ios))
ifeq ($(OS),IOS)
$(eval $(call gb_Module_add_targets,ios,\
- CustomTarget_iOS \
+ CustomTarget_iOS_setup \
+ StaticLibrary_iOSkit \
))
endif
diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk
new file mode 100644
index 000000000000..3653e17d9a72
--- /dev/null
+++ b/ios/StaticLibrary_iOSkit.mk
@@ -0,0 +1,31 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,iOSkit))
+
+$(eval $(call gb_StaticLibrary_set_include,iOSkit,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/ios/generated \
+))
+
+$(eval $(call gb_StaticLibrary_add_cobjects,iOSkit,\
+ ios/source/LibreOfficeKit \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/ios/loKit.xcconfig.in b/ios/loKit.xcconfig.in
deleted file mode 100644
index a206fe12015d..000000000000
--- a/ios/loKit.xcconfig.in
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// 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@
-SYMROOT = @SYMROOT@
-
-PRELINK_LIBS = @PRELINK@
-
-
diff --git a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c
similarity index 97%
rename from ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c
rename to ios/source/LibreOfficeKit.c
index 59b2cf33b971..6240f802cf4d 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c
+++ b/ios/source/LibreOfficeKit.c
@@ -57,6 +57,9 @@ int BridgeLOkit_Sizing(const int countXtiles, const int countYtiles,
{
long docWidth, docHeight;
+ (void)countXtiles;
+ (void)countYtiles;
+
// Remember for later
tileSizeX = pixelsXtile;
tileSizeY = pixelsYtile;
@@ -87,6 +90,7 @@ int BridgeLOkit_open(const char *path)
int BridgeLOkit_ClientCommand(const char *input)
{
+ (void)input;
return 0;
}
diff --git a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h b/ios/source/LibreOfficeKit.h
similarity index 100%
rename from ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.h
rename to ios/source/LibreOfficeKit.h
commit 62da53e52cf141a7cdf8a27e95737a575fbf1696
Author: jan Iversen <jani at libreoffice.org>
Date: Wed Nov 22 20:52:05 2017 +0100
iOS, unicode not used in swift interface
remove include not needed
Change-Id: Ibad12f510a5d947ba2754dae192413852e63ab03
diff --git a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c
index a907f82d3e83..59b2cf33b971 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c
+++ b/ios/LibreOfficeKit/LibreOfficeKit/LibreOfficeKit.c
@@ -12,8 +12,8 @@
#include <osl/process.h>
-#include <unicode/udata.h>
-#include <unicode/ucnv.h>
+//#include <unicode/udata.h>
+//#include <unicode/ucnv.h>
// generated by solenv/bin/native-code.py:
#include "native-code.h"
commit 8d18f1e98b6658bd8722cdadc2b9f6305b475277
Author: jan Iversen <jani at libreoffice.org>
Date: Wed Nov 22 20:50:32 2017 +0100
iOS, cleaned unused parameter
Change-Id: Iac097d9a4578ef7dcb47006a422703ab06a8284e
diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h
index f95ee49634b5..a0c111a9e0e2 100644
--- a/include/LibreOfficeKit/LibreOfficeKitInit.h
+++ b/include/LibreOfficeKit/LibreOfficeKitInit.h
@@ -234,6 +234,7 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib )
}
}
#else
+ (void)install_path;
imp_lib = strdup("the app executable");
dlhandle = RTLD_MAIN_ONLY;
#endif
More information about the Libreoffice-commits
mailing list