[Libreoffice-commits] core.git: 3 commits - desktop/source ios/LibreOfficeKit ios/LibreOfficeLight ios/loApp.xcconfig.in
jan Iversen
jani at libreoffice.org
Sun Nov 12 12:00:07 UTC 2017
desktop/source/lib/init.cxx | 1
ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 4 -
ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 32 +++++++---
ios/loApp.xcconfig.in | 4 -
4 files changed, 28 insertions(+), 13 deletions(-)
New commits:
commit 3168c5e09f084e65a32b5865d975ea9a9524d7c3
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Nov 12 12:56:03 2017 +0100
iOS, updated link flags
added -ggdb2 to final linking
Added extra folder to include some LO files needing debug
Change-Id: Ieed2ff630b67df358dc47e2b27a51e8c692308b5
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
index bb8222ec9369..7e907b4639f2 100644
--- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj
@@ -43,6 +43,7 @@
392ED9B21E5E4B03005C8435 /* ViewPrintManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewPrintManager.swift; path = LibreOfficeLight/ViewPrintManager.swift; sourceTree = SOURCE_ROOT; };
393975771F8BECB0002DC80B /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
393975791F8BECC1002DC80B /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
+ 3944C2061FB7701100A06096 /* init.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = init.cxx; path = ../../desktop/source/lib/init.cxx; sourceTree = "<group>"; };
39503A6F1F94C4AC00F19C78 /* lokit-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "lokit-Bridging-Header.h"; sourceTree = "<group>"; };
39503A741F94D44900F19C78 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
3956B72E1FAB3E0D00BF5DE4 /* appquit.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = appquit.cxx; path = ../../sfx2/source/appl/appquit.cxx; sourceTree = "<group>"; };
@@ -55,6 +56,8 @@
397E08FD1E597BD8001374E0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = LibreOfficeLight/AppDelegate.swift; sourceTree = SOURCE_ROOT; };
397E09021E597BD8001374E0 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/Main.storyboard; sourceTree = "<group>"; };
397E09071E597BD8001374E0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = LibreOfficeLight/Assets.xcassets; sourceTree = SOURCE_ROOT; };
+ 398F37C81FB5E37400707604 /* sofficemain.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sofficemain.cxx; path = ../../desktop/source/app/sofficemain.cxx; sourceTree = "<group>"; };
+ 398F37CA1FB5E3D800707604 /* salmain.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = salmain.cxx; path = ../../vcl/source/salmain/salmain.cxx; sourceTree = "<group>"; };
3992D8591E5B762A00BEA987 /* DocumentController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DocumentController.swift; path = LibreOfficeLight/DocumentController.swift; sourceTree = SOURCE_ROOT; };
399648461E5B87DC00E73E83 /* ViewProperties.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ViewProperties.swift; path = LibreOfficeLight/ViewProperties.swift; sourceTree = SOURCE_ROOT; };
39ACF4181F8A317600DA7334 /* loApp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loApp.xcconfig; path = ../../../../../../../Users/jani/lo_ios/workdir/ios/loApp.xcconfig; sourceTree = "<group>"; };
@@ -68,6 +71,10 @@
39B092501E5F3DEA00682A59 /* LibreOfficeLight-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "LibreOfficeLight-Prefix.pch"; sourceTree = "<group>"; };
39EE81531FA644E800B73AB8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
39EF4E2E1FA500C9001914AC /* PropertiesController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PropertiesController.swift; sourceTree = "<group>"; };
+ 39F5C6EA1FADE79000728B10 /* app.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = app.cxx; path = ../../sfx2/source/appl/app.cxx; sourceTree = "<group>"; };
+ 39F5C6EC1FADEA8300728B10 /* module.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = module.cxx; path = ../../sfx2/source/appl/module.cxx; sourceTree = "<group>"; };
+ 39F5C6EE1FADEC4000728B10 /* globalevents.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = globalevents.cxx; path = ../../sfx2/source/notify/globalevents.cxx; sourceTree = "<group>"; };
+ 39FCD43C1FB5DDB000644AA3 /* svmain.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = svmain.cxx; path = ../../vcl/source/app/svmain.cxx; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -100,6 +107,13 @@
3956B72D1FAB3DBF00BF5DE4 /* extra */ = {
isa = PBXGroup;
children = (
+ 3944C2061FB7701100A06096 /* init.cxx */,
+ 398F37CA1FB5E3D800707604 /* salmain.cxx */,
+ 398F37C81FB5E37400707604 /* sofficemain.cxx */,
+ 39FCD43C1FB5DDB000644AA3 /* svmain.cxx */,
+ 39F5C6EE1FADEC4000728B10 /* globalevents.cxx */,
+ 39F5C6EC1FADEA8300728B10 /* module.cxx */,
+ 39F5C6EA1FADE79000728B10 /* app.cxx */,
3956B7321FAB3E7300BF5DE4 /* docinsert.cxx */,
3956B7301FAB3E4700BF5DE4 /* appdata.cxx */,
3956B72E1FAB3E0D00BF5DE4 /* appquit.cxx */,
@@ -473,7 +487,7 @@
CLANG_WARN_INFINITE_RECURSION = NO;
CODE_SIGN_ENTITLEMENTS = LibreOfficeLight/LibreOfficeLight.entitlements;
DEVELOPMENT_TEAM = TM977DU7EF;
- ENABLE_TESTABILITY = NO;
+ ENABLE_TESTABILITY = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "LibreOfficeLight/LibreOfficeLight-Prefix.pch";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -495,8 +509,8 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
- SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
@@ -513,7 +527,7 @@
CODE_SIGN_ENTITLEMENTS = LibreOfficeLight/LibreOfficeLight.entitlements;
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = TM977DU7EF;
- ENABLE_TESTABILITY = NO;
+ ENABLE_TESTABILITY = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "LibreOfficeLight/LibreOfficeLight-Prefix.pch";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
@@ -524,8 +538,8 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
- SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
@@ -625,7 +639,7 @@
CLANG_WARN_INFINITE_RECURSION = NO;
CODE_SIGN_ENTITLEMENTS = LibreOfficeLight/LibreOfficeLight.entitlements;
DEVELOPMENT_TEAM = TM977DU7EF;
- ENABLE_TESTABILITY = NO;
+ ENABLE_TESTABILITY = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "LibreOfficeLight/LibreOfficeLight-Prefix.pch";
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
@@ -647,8 +661,8 @@
PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h";
- SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
- SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+ SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_SWIFT3_OBJC_INFERENCE = Off;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = 2;
VALID_ARCHS = "arm64 x86_64";
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
index fb3426dd4df8..060598e49041 100644
--- a/ios/loApp.xcconfig.in
+++ b/ios/loApp.xcconfig.in
@@ -15,13 +15,13 @@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
SYMROOT = @SYMROOT@
//:configuration = Debug
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a -ggdb2
//:configuration = Release
LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
//:configuration = Simulator
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a -ggdb2
//:completeSettings = some
commit f5fea7373b72bf23642ea4f6fd8f5673f3c97174
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Nov 12 12:33:48 2017 +0100
iOS, added -ggdb2 prelink
New xcode needs -ggdb2 (like the compiler) in order not to strip symbols
Change-Id: I652b1d9791d1ce6d752748eb950615051d140ba7
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index f8a988031044..bff1cb2af2fe 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -ggdb2";
SDKROOT = iphoneos;
VALID_ARCHS = "x86_64 arm64";
};
@@ -272,7 +272,7 @@
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -ggdb2";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
commit 76fe5bddccfb9e27af1319678dfe3e287e124b79
Author: jan Iversen <jani at libreoffice.org>
Date: Sun Nov 12 12:27:34 2017 +0100
iOS, make sure SfxApplication::GetOrCreate() is called
For some reason SfxApplication::GetOrCreate() was never called, this leads
to problems when opening documents (reference to shared pointer).
Adding dummy call to SfxApplication::GetOrCreate() to make sure the list
contains at least one entry.
Change-Id: Ic8848c17efae5a0a38c9e9f7299a5f36f69aef31
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 58fd38013290..b7874dc54b2e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3593,6 +3593,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char
// there might be more elegant ways to get InitVCL() called, but
// this one works :-)
InitVCL();
+ SfxApplication::GetOrCreate();
#endif
if (eStage == PRE_INIT)
More information about the Libreoffice-commits
mailing list