[Libreoffice-commits] .: 4 commits - android/experimental android/qa basebmp/CppunitTest_basebmp.mk basebmp/Module_basebmp.mk basebmp/StaticLibrary_basebmp.mk Library_merged.mk Repository.mk solenv/gbuild vcl/Library_vcl.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Aug 23 12:34:54 PDT 2012
Library_merged.mk | 5 ++
Repository.mk | 19 +++--------
android/experimental/DocumentLoader/Makefile | 2 -
android/experimental/LibreOffice4Android/Makefile | 1
android/qa/desktop/Makefile | 1
android/qa/sc/Makefile | 1
basebmp/CppunitTest_basebmp.mk | 9 +++++
basebmp/Module_basebmp.mk | 9 +++++
basebmp/StaticLibrary_basebmp.mk | 37 ++++++++++++++++++++++
solenv/gbuild/StaticLibrary.mk | 2 +
vcl/Library_vcl.mk | 2 -
11 files changed, 68 insertions(+), 20 deletions(-)
New commits:
commit a1aed54fee058fdedb7d50b96291af701a327e57
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Aug 23 22:23:33 2012 +0300
Build basebmp as a static library for Android
Reduces shared library count by one... This is tedious.
Change-Id: I3bdc0a5c4ee4cabf9bbcedc469ca6e94d0103d6b
diff --git a/Library_merged.mk b/Library_merged.mk
index 1ac02e5..b793544 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -123,8 +123,11 @@ $(eval $(call gb_Library_use_externals,merged,\
endif
ifeq ($(OS),ANDROID)
-$(eval $(call gb_Library_use_libraries,merged,\
+$(eval $(call gb_Library_use_static_libraries,merged,\
basebmp \
+))
+
+$(eval $(call gb_Library_use_libraries,merged,\
libotouch \
))
diff --git a/Repository.mk b/Repository.mk
index c8f9692..df57a96 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -215,7 +215,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
analysis \
animcore \
basctl \
- basebmp \
+ $(if $(filter $(OS),ANDROID),, \
+ basebmp \
+ ) \
bib \
canvastools \
communi \
@@ -628,6 +630,9 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ $(if $(filter $(OS),ANDROID), \
+ basebmp \
+ ) \
basegfx_s \
codemaker \
codemaker_cpp \
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index a6a2898..063bef2 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -52,7 +52,6 @@ copy-stuff:
#
for F in $(strip \
analysislo \
- basebmplo \
basegfxlo \
bootstrap.uno \
comphelpgcc3 \
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 837f930..baeabdf 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -21,7 +21,6 @@ copy-stuff:
#
for F in $(strip \
analysislo \
- basebmplo \
basegfxlo \
bootstrap.uno \
chartcontrollerlo \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 2fbd815..734cb56 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -92,7 +92,6 @@ copy-stuff: buildrcs
#
for F in $(strip \
analysislo \
- basebmplo \
basegfxlo \
bootstrap.uno \
comphelpgcc3 \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index b77c5cf..a455939 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -61,7 +61,6 @@ copy-stuff:
#
for F in $(strip \
analysislo \
- basebmplo \
basegfxlo \
bootstrap.uno \
comphelpgcc3 \
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index cbdfef6..f11b462 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -14,8 +14,17 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
$$(INCLUDE) \
))
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\
+ basebmp \
+))
+else
$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
basebmp \
+))
+endif
+
+$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
basegfx \
sal \
$(gb_STDLIBS) \
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
index f6080f6..b1c45fe 100644
--- a/basebmp/Module_basebmp.mk
+++ b/basebmp/Module_basebmp.mk
@@ -9,8 +9,17 @@
$(eval $(call gb_Module_Module,basebmp))
+ifeq ($(OS),ANDROID)
+$(eval $(call gb_Module_add_targets,basebmp,\
+ StaticLibrary_basebmp \
+))
+else
$(eval $(call gb_Module_add_targets,basebmp,\
Library_basebmp \
+))
+endif
+
+$(eval $(call gb_Module_add_targets,basebmp,\
Package_inc \
))
diff --git a/basebmp/StaticLibrary_basebmp.mk b/basebmp/StaticLibrary_basebmp.mk
new file mode 100644
index 0000000..29f3d59
--- /dev/null
+++ b/basebmp/StaticLibrary_basebmp.mk
@@ -0,0 +1,37 @@
+# -*- 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/.
+#
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,basebmp))
+
+$(eval $(call gb_StaticLibrary_use_package,basebmp,basebmp_inc))
+
+$(eval $(call gb_StaticLibrary_use_sdk_api,basebmp))
+
+$(eval $(call gb_StaticLibrary_use_libraries,basebmp,\
+ basegfx \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_StaticLibrary_set_include,basebmp,\
+ -I$(SRCDIR)/basebmp/inc/ \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_StaticLibrary_add_defs,basebmp,\
+ -DBASEBMP_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,basebmp,\
+ basebmp/source/bitmapdevice \
+ basebmp/source/debug \
+ basebmp/source/polypolygonrenderer \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f8e7fa8..77ea232 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -568,7 +568,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
$(vcl_headless_code) \
))
-$(eval $(call gb_Library_use_libraries,vcl,\
+$(eval $(call gb_Library_use_static_libraries,vcl,\
basebmp \
))
commit 0d2ed78dad772e62ce8e50be95e445a86742ab9b
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Aug 23 16:38:55 2012 +0300
No reason to leave out use_sdk_api and use_udk_api, I think
Change-Id: I5bf5dd2708de103a1f4eb48ef2cb1a28b5e4cd29
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 2d4a9d5..6da10ff 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -112,6 +112,8 @@ $(eval $(foreach method,\
set_library_path_flags \
add_api \
use_api \
+ use_sdk_api \
+ use_udk_api \
use_internal_api \
use_internal_bootstrap_api \
use_internal_comprehensive_api \
commit 07df4c9ed0785b07b0ad1d9f74388e25614db811
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Aug 23 16:21:50 2012 +0300
fileacc is in merged
Change-Id: If58adf2558c2baac51f91d621b75f2d37f935dfd
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index adff84f..a6a2898 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -63,7 +63,6 @@ copy-stuff:
evtattlo \
expwrap.uno \
fastsax.uno \
- fileacc \
forlo \
foruilo \
frmlo \
commit 4e1fd1b3e1390adb668d5f12f5e4b4888a7db8a6
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Aug 23 15:01:38 2012 +0300
Bin leftovers from the iOS foo_cppunittester_all crack
Change-Id: Ieba3c29cd28f14e2fb5eac827f245edbed053298
diff --git a/Repository.mk b/Repository.mk
index 8fd26ed..c8f9692 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -158,18 +158,6 @@ endif
endif
-ifeq ($(OS),IOS)
-
-$(eval $(call gb_Helper_register_executables,OOO,\
- basegfx_cppunittester_all \
- basebmp_cppunittester_all \
- i18npool_cppunittester_all \
- sax_cppunittester_all \
- tools_cppunittester_all \
-))
-
-endif
-
ifneq ($(OS),IOS)
$(eval $(call gb_Helper_register_executables,UREBIN,\
More information about the Libreoffice-commits
mailing list