ios/CustomTarget_MobileLibreOffice_app.mk | 26
+++++-----
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj | 3 -
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj | 8 +--
3 files changed, 16 insertions(+), 21 deletions(-)
New commits:
commit 5238d79a7c3067b182cbce51e2118a6fa336899a
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Nov 22 13:33:14 2013 +0200
Use hidden visibility as in the LO code here, too
Otherwise we get tons of (as such, in our case harmless) warnings from
the linker about mismatches.
Change-Id: I826d9e065bae59cdd213131163b31b2099806dd3
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 9d289b9..2c92795 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -545,7 +545,7 @@
"MLO_APP_ROLE=LO_APP",
"DEBUG=1",
);
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -582,6 +582,7 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_PREPROCESSOR_DEFINITIONS =
"MLO_APP_ROLE=LO_APP";
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -660,7 +661,7 @@
"MLO_APP_ROLE=TILE_TESTER",
"DEBUG=1",
);
- GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
commit de4af9183c09cc5ccc05198e456f3916376835f9
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Nov 22 13:32:35 2013 +0200
Don't redirect output to /dev/null if verbosity is requested
Change-Id: Idccc7cc8e9f81576bb24fec0a49144c0fcc16fd5
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk
b/ios/CustomTarget_MobileLibreOffice_app.mk
index 87783fa..76b3e75 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -15,7 +15,7 @@ BUILDID :=$(shell cd $(SRCDIR) && git
log -1 --format=%H)
#- Macros ---------------------------------------------------------------------
define MobileLibreOfficeXcodeBuild
- CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj
-scheme MobileLibreOffice -arch armv7 -configuration $(if
$(ENABLE_DEBUG),Debug,Release) $(1) >/dev/null
+ CC=;xcodebuild -project MobileLibreOffice/MobileLibreOffice.xcodeproj
-scheme MobileLibreOffice -arch armv7 -configuration $(if
$(ENABLE_DEBUG),Debug,Release) $(1) $(if $(verbose)$(VERBOSE),,>/dev/null)
endef
#- Targets --------------------------------------------------------------------
commit b9a3acb44c44cad1716be320f159dc793e6fa07a
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Nov 22 12:58:10 2013 +0200
Use the CLANG_CXX_LIBRARY from lo.xcconfig
Change-Id: Id6424157d2a9ba2a4ab987cd8aafd9c7de52f836
diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index 8c68aca..e806d6b 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -825,7 +825,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -874,7 +873,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -953,7 +951,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 679a2a7..9d289b9 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -530,7 +530,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -573,7 +572,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
@@ -647,7 +645,6 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = armv7;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
- CLANG_CXX_LIBRARY = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
commit 27c7db9a7365827fecb0cb72f3b27da9f935c4a2
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Nov 22 12:42:58 2013 +0200
Some whitespace cleanup, avoids Emacs warning
Change-Id: I5b2c5a249c0446d69ac19d11e0d5e038983f0be8
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk
b/ios/CustomTarget_MobileLibreOffice_app.mk
index 300d67f..87783fa 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -11,7 +11,7 @@
LO_XCCONFIG := lo.xcconfig
DEST_RESOURCE := MobileLibreOffice/resource_link
BUILDID :=$(shell cd $(SRCDIR) && git log -1
--format=%H)
-
+
#- Macros ---------------------------------------------------------------------
define MobileLibreOfficeXcodeBuild
@@ -56,14 +56,14 @@ MobileLibreOffice_setup:
$(WORKDIR)/UnpackedTarball/icu/source/lib \
$(WORKDIR)/UnpackedTarball/openssl; do \
flags=''; \
- for lib in $$path/lib*.a; do \
- if [ ! -r $$lib ]; then \
- continue; \
- fi; \
- base="$${lib##*/lib}"; \
- base=$${base%\.a}; \
- flags+=" -l$${base}"; \
- done; \
+ for lib in $$path/lib*.a; do \
+ if [ ! -r $$lib ]; then \
+ continue; \
+ fi; \
+ base="$${lib##*/lib}"; \
+ base=$${base%\.a}; \
+ flags+=" -l$${base}"; \
+ done; \
if [ "$$flags" ]; then \
all_flags+=" -L$$path $$flags"; \
fi; \
@@ -91,10 +91,10 @@ MobileLibreOffice_setup:
# soffice.cfg
mkdir -p $(DEST_RESOURCE)/share/config
cp -R $(INSTDIR)/share/config/soffice.cfg $(DEST_RESOURCE)/share/config
-
+
# "registry"
cp -R $(INSTDIR)/share/registry $(DEST_RESOURCE)/share
-
+
# Set up rc, the "inifile". See getIniFileName_Impl().
file=$(DEST_RESOURCE)/rc; \
echo '[Bootstrap]' > $$file; \
@@ -127,7 +127,7 @@ MobileLibreOffice_setup:
echo "buildid=$(BUILDID)" >> $$file; \
echo 'ProductMajor=360' >> $$file; \
echo 'ProductMinor=1' >> $$file;
-
+
#==============================================================================
# Clean
$(call gb_CustomTarget_get_clean_target,ios/MobileLibreOffice):
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
