[Libreoffice-commits] .: 4 commits - distro-configs/LibreOfficeiOS.conf GNUmakefile.mk Module_tail_build.mk RepositoryExternal.mk RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk solenv/gbuild
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 2 12:24:33 PDT 2011
GNUmakefile.mk | 1
Module_tail_build.mk | 3 +-
Repository.mk | 1
RepositoryExternal.mk | 46 ++++++++++++++++++++++++-------------
RepositoryFixes.mk | 1
RepositoryModule_ooo.mk | 1
distro-configs/LibreOfficeiOS.conf | 1
solenv/gbuild/platform/ios.mk | 29 +++++++++++++++++------
8 files changed, 60 insertions(+), 23 deletions(-)
New commits:
commit aa43d84e9590d34a096a28043eef3ca14ae4cd5f
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 2 22:21:07 2011 +0300
Do build executables for iOS, too
Needed already now for our statically linked cppunit tests. We don't
construct complete app bundles. You have to manually copy the
executable to replace the one in some app bundle built in Xcode before
running it for now. This works fine at least for debugging in the
simulator, haven't tried yet on a device.
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 6725886..29305bd 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -226,7 +226,7 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
# FIXME framework handling very hackish
define gb_LinkTarget__get_liblinkflags
-$(patsubst lib%.dylib,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \
+$(patsubst lib%.a,-l%,$(foreach lib,$(filter-out $(gb_Library__FRAMEWORKS),$(1)),$(call gb_Library_get_filename,$(lib)))) \
$(addprefix -framework ,$(filter $(gb_Library__FRAMEWORKS),$(1)))
endef
@@ -236,13 +236,24 @@ $(if $(filter Executable,$(1)),\
$$(call gb_Library_get_layer,$(2)))
endef
-# Just create a dummy executable
-# It is pointless to build actual iOS executables here anyway.
-# Hmm, except for the simulator? Nah, use Xcode for that, too.
+
define gb_LinkTarget__command_dynamiclink
-$(call gb_Helper_abbreviate_dirs,\
+ $(if $(filter Library CppunitTest,$(TARGETTYPE)), at echo No dynamic libraries should be built for iOS && exit 1, \
mkdir -p $(dir $(1)) && \
- ((echo '#!/bin/sh' && echo 'echo Nope.') >$(1)))
+ $(gb_CXX) \
+ $(gb_Executable_TARGETTYPEFLAGS) \
+ $(subst \d,$$,$(RPATH)) \
+ $(T_LDFLAGS) \
+ $(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+ $(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(OBJCOBJECTS),$(call gb_ObjCObject_get_target,$(object))) \
+ $(foreach object,$(OBJCXXOBJECTS),$(call gb_ObjCxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+ $(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
+ $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) \
+ $(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
+ $(LIBS) \
+ -o $(1))
endef
# parameters: 1-linktarget 2-cobjects 3-cxxobjects
@@ -279,8 +290,12 @@ gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
gb_Library__FRAMEWORKS := \
+ Foundation \
+ CoreFoundation \
+ CoreGraphics \
gb_Library_PLAINLIBS_NONE += \
+ objc \
jpeg \
m \
pthread \
@@ -331,7 +346,7 @@ gb_StaticLibrary_StaticLibrary_platform =
# Executable class
gb_Executable_EXT :=
-gb_Executable_TARGETTYPEFLAGS := -bind_at_load
+gb_Executable_TARGETTYPEFLAGS := -dead_strip
gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \
commit ab31a307b1d96fe6c1e3cc7545ad18abb5dba1a7
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 2 22:19:35 2011 +0300
Sort the frameworks and separate MacOSX and iOS ones for clarity
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cd15f9e..03151b8 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -595,23 +595,35 @@ $(call gb_LinkTarget_add_libs,$(1),$(DBUSMENUGTK_LIBS))
endef
-define gb_LinkTarget__use_uikit
-$(call gb_LinkTarget__add_libs,$(1), \
- -framework UIKit \
+# MacOSX-only frameworks
+# (in alphabetical order)
+
+define gb_LinkTarget__use_carbon
+$(call gb_LinkTarget_add_libs,$(1), \
+ -framework Carbon \
)
endef
-define gb_LinkTarget__use_corefoundation
+define gb_LinkTarget__use_cocoa
$(call gb_LinkTarget_add_libs,$(1), \
- -framework CoreFoundation \
+ -framework Cocoa \
)
endef
-define gb_LinkTarget__use_coretext
-$(call gb_Library_add_libs,$(1), \
- -framework CoreText \
+define gb_LinkTarget__use_quicktime
+$(call gb_LinkTarget_add_libs,$(1), \
+ -framework QuickTime \
+)
+
+endef
+
+# Common MacOSX and iOS frameworks
+
+define gb_LinkTarget__use_corefoundation
+$(call gb_LinkTarget_add_libs,$(1), \
+ -framework CoreFoundation \
)
endef
@@ -623,23 +635,25 @@ $(call gb_Library_add_libs,$(1), \
endef
-define gb_LinkTarget__use_cocoa
-$(call gb_LinkTarget_add_libs,$(1), \
- -framework Cocoa \
+define gb_LinkTarget__use_coretext
+$(call gb_Library_add_libs,$(1), \
+ -framework CoreText \
)
endef
-define gb_LinkTarget__use_carbon
+define gb_LinkTarget__use_foundation
$(call gb_LinkTarget_add_libs,$(1), \
- -framework Carbon \
+ -framework Foundation \
)
endef
-define gb_LinkTarget__use_quicktime
+# iOS-only frameworks
+
+define gb_LinkTarget__use_uikit
$(call gb_LinkTarget_add_libs,$(1), \
- -framework QuickTime \
+ -framework UIKit \
)
endef
commit c5179c5d8a79df673e410b185beade833e0b1157
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 2 21:22:35 2011 +0300
Add Emacs mode lines
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index 8299e78..d2cbe23 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a1a7add..6002046 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
@@ -43,4 +44,4 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
writerfilter \
))
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/Repository.mk b/Repository.mk
index 9552f64..1b651b4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2a66f73..cd15f9e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -642,4 +643,5 @@ $(call gb_LinkTarget_add_libs,$(1), \
)
endef
+
# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index d822ae6..004b4a0 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 68d6192..2b05f31 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
commit 5b0a102ed2caa7e9772d000e8a71dea7a1d823d3
Author: Tor Lillqvist <tml at iki.fi>
Date: Tue Aug 2 20:51:02 2011 +0300
Add --disable-librsvg
diff --git a/distro-configs/LibreOfficeiOS.conf b/distro-configs/LibreOfficeiOS.conf
index 02008d5..bd2b60c 100644
--- a/distro-configs/LibreOfficeiOS.conf
+++ b/distro-configs/LibreOfficeiOS.conf
@@ -6,6 +6,7 @@
--disable-gconf
--disable-gnome-vfs
--disable-gstreamer
+--disable-librsvg
--disable-lockdown
--disable-mozilla
--disable-nss-module
More information about the Libreoffice-commits
mailing list