strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build also the DocumentLoader test Android app with gbuild

Browse source 
Serialize the Ant cleaning and building of android/abs-lib so that one
Ant is not cleaning it while another is building something that
depends on it.

Change-Id: I22fde47bf84208fa129b8f6a65a2314c885451a0
This commit is contained in:
Tor Lillqvist 2012-08-22 14:26:38 +03:00
parent 7887a4e0ad
commit e2a7989765
4 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/Bootstrap/Makefile.shared
View file

@ -42,7 +42,7 @@ properties:
install: build-ant
unset JAVA_HOME && $(ANT) debug install
@echo
@echo 'Run it with something like what "make run" does (see Makefile)'
@echo 'Run it with "make run"'
@echo
uninstall:

33
android/CustomTarget_docloader.mk Normal file
View file

@ -0,0 +1,33 @@
# -*- 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)
# Depending on sw and sc modules hopefully means that all libraries and other
# files from there (plus all those they depend on), that DocumentLoader needs
# from solver will have been built? Or should we just move the stuff from
# android/experimental/DocumentLoader/Makefile here, and depend on them
# explicitly?
$(call gb_CustomTarget_get_target,android/docloader) : \
$(docloader_DIR)/done \
$(call gb_Module_get_target,sw) \
$(call gb_Module_get_target,sc)
$(docloader_DIR)/done : $(gb_Helper_PHONY)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
# Lock needed to serialize the Ant cleaning/building which cleans/builds also
# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be
# cleaning out abs-lib while another is building stuff that depends on
# it. yeah, this sucks
cd $(SRCDIR)/android/experimental/DocumentLoader && flock $(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all"
mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
# vim: set noet sw=4 ts=4:

6
android/CustomTarget_sdremote.mk
View file

@ -14,7 +14,11 @@ $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
$(sdremote_DIR)/done : $(gb_Helper_PHONY)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1)
cd $(SRCDIR)/android/sdremote && $(MAKE) clean && $(MAKE) all
# Lock needed to serialize the Ant cleaning/building which cleans/builds also
# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be
# cleaning out abs-lib while another is building stuff that depends on
# it. yeah, this sucks
cd $(SRCDIR)/android/sdremote && flock $(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all"
mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin

1
android/Module_android.mk
View file

@ -12,6 +12,7 @@ ifeq ($(OS),ANDROID)
$(eval $(call gb_Module_add_targets,android,\
CustomTarget_sdremote \
CustomTarget_docloader \
))
endif