[Libreoffice-commits] core.git: 2 commits - android/CustomTarget_android_desktop.mk android/CustomTarget_docloader.mk android/CustomTarget_lo4android.mk android/experimental android/Module_android.mk
Tor Lillqvist
tml at collabora.com
Tue Sep 10 01:38:36 PDT 2013
android/CustomTarget_android_desktop.mk | 6 ++---
android/CustomTarget_docloader.mk | 37 --------------------------------
android/CustomTarget_lo4android.mk | 15 ++++++------
android/Module_android.mk | 1
android/experimental/desktop/Makefile | 20 ++++++++---------
5 files changed, 20 insertions(+), 59 deletions(-)
New commits:
commit be4b57b6da08231635f843529fed6fa53c931d02
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 10 11:35:20 2013 +0300
Copy some stuff from INSTDIR, not OUTDIR
Some of it is not in OUTDIR at all any more.
Change-Id: I1afbaafa0fe5a355158b44fcafd3d3e190fce79c
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index 4d4fe6d..25cc0fb 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -114,7 +114,7 @@ copy-stuff:
# ------------ Pieces not from DocumentLoader ------------
# tango artwork / icons
mkdir -p assets/share/config
- cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config
+ cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip assets/share/config
# shell / splash images
mkdir -p assets/program
cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program
@@ -142,15 +142,15 @@ setup-jars:
#
# Copy jar files we need
#
- for F in $(strip \
- java_uno \
- juh \
- jurt \
- ridl \
- unoil \
- unoloader \
- ); do \
- $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
+ for F in java_uno \
+ juh \
+ jurt \
+ ridl \
+ unoloader; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar); \
+ done
+ for F in unoil; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
done
build-ant: android_version_setup copy-stuff link-so properties setup-jars
commit 3b9f9a5a4baa06607110db644eff3af146802326
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 10 11:25:00 2013 +0300
Don't bother building the DocumentLoader Android app every time
Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk
index a1e12d7..1bb0446 100644
--- a/android/CustomTarget_android_desktop.mk
+++ b/android/CustomTarget_android_desktop.mk
@@ -17,9 +17,9 @@ $(call gb_CustomTarget_get_target,android/desktop) : \
# in Module_android.mk, so lo4android_DIR is defined. We want that to
# be built completely first, so that we can serialize Ant access to
# Bootstrap and abs-lib, which are used by Desktop (this makefile),
-# LibreOffice4Android, DocumentLoader and sdremote. We don't want one
-# Ant to be cleaning out one place while another is building stuff
-# that depends on it. Yeah, this sucks
+# LibreOffice4Android and sdremote. We don't want one Ant to be
+# cleaning out one place while another is building stuff that depends
+# on it. Yeah, this sucks
$(android_desktop_DIR)/done : $(lo4android_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk
deleted file mode 100644
index badcabd..0000000
--- a/android/CustomTarget_docloader.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- 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_CustomTarget_CustomTarget,android/docloader))
-
-docloader_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
-
-$(call gb_CustomTarget_get_target,android/docloader) : \
- $(docloader_DIR)/done
-
-# We know that CustomTarget_sdremote.mk is included first, so
-# sdremote_DIR is defined. We want that to be built completely first,
-# so that we can serialize Ant access to Bootstrap, which is used both
-# by DocumentLoader and sdremote. We don't want one Ant to be cleaning
-# out Bootstrap while another is building stuff that depends on it.
-# Yeah, this sucks
-
-$(docloader_DIR)/done : $(sdremote_DIR)/done $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
- cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all
-# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as that is where the tinderbox build script
-# still looks for the .apk, and we want fresh daily builds to be uploaded.
- if test $(SRCDIR) = $(BUILDDIR); then \
- mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
- cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \
- fi
-
-$(call gb_CustomTarget_get_clean_target,android/docloader) :
- $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
- cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) clean
-
-# vim: set noet sw=4 ts=4:
diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk
index 651c435..9e54f3e 100644
--- a/android/CustomTarget_lo4android.mk
+++ b/android/CustomTarget_lo4android.mk
@@ -13,15 +13,14 @@ lo4android_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LibreO
$(call gb_CustomTarget_get_target,android/lo4android) : \
$(lo4android_DIR)/done
-# We know that CustomTarget_docloader.mk is included before this file
-# in Module_android.mk, so docloader_DIR is defined. We want that to
-# be built completely first, so that we can serialize Ant access to
-# Bootstrap and abs-lib, which are used by LibreOffice4Android (this
-# makefile), DocumentLoader and sdremote. We don't want one Ant to be
-# cleaning out one place while another is building stuff that depends
-# on it. Yeah, this sucks
+# We know that CustomTarget_sdremote.mk is included first, so
+# sdremote_DIR is defined. We want that to be built completely first,
+# so that we can serialize Ant access to Bootstrap, which is used both
+# by DocumentLoader and sdremote. We don't want one Ant to be cleaning
+# out Bootstrap while another is building stuff that depends on it.
+# Yeah, this sucks
-$(lo4android_DIR)/done : $(docloader_DIR)/done
+$(lo4android_DIR)/done : $(sdremote_DIR)/done $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all
# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as that is where the tinderbox build script
diff --git a/android/Module_android.mk b/android/Module_android.mk
index 2e225b5..46326bd 100644
--- a/android/Module_android.mk
+++ b/android/Module_android.mk
@@ -12,7 +12,6 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,android,\
CustomTarget_sdremote \
- CustomTarget_docloader \
CustomTarget_lo4android \
CustomTarget_android_desktop \
))
More information about the Libreoffice-commits
mailing list