mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flock is not portable, so use different approach

Browse Source 
Change-Id: I4a864ddd3681101c8c5d0943d2761ac85bf4161f
This commit is contained in:
Tor Lillqvist
2012-08-22 14:49:13 +03:00
parent 0e3510d14e
commit b34b7c93bd
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/CustomTarget_docloader.mk
View File

@@ -20,13 +20,15 @@ $(call gb_CustomTarget_get_target,android/docloader) : \
$(call gb_Module_get_target,sw) \
$(call gb_Module_get_target,sc)
$(docloader_DIR)/done : $(gb_Helper_PHONY)
# 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 abs-lib, which is used both by 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
$(docloader_DIR)/done : $(sdremote_DIR)/done
$(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"
cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) clean && $(MAKE) all
mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin

8
android/CustomTarget_sdremote.mk
View File

@@ -12,13 +12,9 @@ sdremote_DIR := $(call gb_CustomTarget_get_workdir,android/sdremote)
$(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
$(sdremote_DIR)/done : $(gb_Helper_PHONY)
$(sdremote_DIR)/done :
$(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/sdremote && flock $(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all"
cd $(SRCDIR)/android/sdremote && $(MAKE) clean && $(MAKE) all
mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin