ios/CustomTarget_iOS_setup.mk | 1 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 3 ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme | 93 ++++++++++ ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme | 93 ++++++++++ 4 files changed, 187 insertions(+), 3 deletions(-)
New commits: commit f17d0ff5234d88816198becb0f3d8ea7f00f7eb0 Author: jan Iversen <j...@libreoffice.org> Date: Mon Feb 5 11:09:43 2018 +0100 iOS, correctly build release/debug versions Added 2 schemes Debug/Release as shared to make sure they are available. Not having them as shared and cleaning causes them to be "forgotten" Change-Id: I4cb66c7088f770c7cda592994f3610e98fb1b7f0 diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme new file mode 100644 index 000000000000..b860af5cc7e5 --- /dev/null +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "0920" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" + shouldUseLaunchSchemeArgsEnv = "YES"> + <Testables> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> + </TestAction> + <LaunchAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + buildConfiguration = "Debug" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme new file mode 100644 index 000000000000..4861ceef6913 --- /dev/null +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/xcshareddata/xcschemes/Release.xcscheme @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "0920" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" + shouldUseLaunchSchemeArgsEnv = "YES"> + <Testables> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> + </TestAction> + <LaunchAction + buildConfiguration = "Release" + selectedDebuggerIdentifier = "" + selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn" + language = "" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "397E08F91E597BD8001374E0" + BuildableName = "LibreOfficeLight.app" + BlueprintName = "LibreOfficeLight" + ReferencedContainer = "container:LibreOfficeLight.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Release"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> commit 1ed8f225ab0328055dbb6724060d21584b393bd5 Author: jan Iversen <j...@libreoffice.org> Date: Mon Feb 5 11:06:22 2018 +0100 iOS, removed OTHER_LDFLAGS Change-Id: Ib07c1c4823deda7fa4ba389e9679f6eff99691d8 diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index c85096aa1a60..17263df41d76 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -494,7 +494,6 @@ MACH_O_TYPE = mh_execute; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ""; SDKROOT = iphoneos; SWIFT_OBJC_BRIDGING_HEADER = "lokit-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -529,7 +528,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; @@ -563,7 +561,6 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; commit 8258b425e85bc360f67d776a0196a7a091e7975f Author: jan Iversen <j...@libreoffice.org> Date: Mon Feb 5 09:14:01 2018 +0100 iOS, allow x86 release builds Added dir for x86_64 release builds Change-Id: If8c5e775ecd1283d9386a764441019c2423170f9 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 0ca73a345ffb..8fea759249e9 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -14,6 +14,7 @@ IOSRES = $(IOSGEN)/resources IOSDIRS = $(IOSGEN) \ $(IOSGEN)/Debug_x86_64 \ $(IOSGEN)/Debug_arm64 \ + $(IOSGEN)/Release_x86_64 \ $(IOSGEN)/Release_arm64 \ $(IOSRES) \ $(IOSRES)/services \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits