Hello andreip, nicolasroard,
I'd like you to do a code review. Please execute
g4 diff -c 9448887
or point your web browser to
http://mondrian/9448887
(this changelist has been uploaded to Mondrian)
to review the following code:
Change 9448887 by jrip...@jripley-gears-trunk on 2008/12/17 15:56:44 *pending*
Fix Android installer parallel build breakage.
Removed the ANDROID_INSTALLER_OUTDIR build rule and instead
put an explicit "mkdir -p $(ANDROID_INSTALLER_OUTDIR)" in
every build rule that requires this directory to exist.
Also delete the output .zip file before creating a new
one. The behavior of zip is to update an archive in-place
rather than create from fresh. Deleting the file first removes
any possible build variation this might cause.
PRESUBMIT=passed
R=andreip,nicolasroard
[email protected]
DELTA=10 (5 added, 4 deleted, 1 changed)
OCL=9448887
Affected files ...
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#94 edit
10 delta lines: 5 added, 4 deleted, 1 changed
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [email protected].
Change 9448887 by jrip...@jripley-gears-trunk on 2008/12/17 15:56:44 *pending*
Fix Android installer parallel build breakage.
Removed the ANDROID_INSTALLER_OUTDIR build rule and instead
put an explicit "mkdir -p $(ANDROID_INSTALLER_OUTDIR)" in
every build rule that requires this directory to exist.
Also delete the output .zip file before creating a new
one. The behavior of zip is to update an archive in-place
rather than create from fresh. Deleting the file first removes
any possible build variation this might cause.
Affected files ...
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#94 edit
==== //depot/googleclient/gears/opensource/gears/tools/rules.mk#94 -
/usr/local/google/home/jripley/gears-trunk/googleclient/gears/opensource/gears/tools/rules.mk
====
# action=edit type=text
--- googleclient/gears/opensource/gears/tools/rules.mk 2008-12-17
15:52:12.000000000 +0000
+++ googleclient/gears/opensource/gears/tools/rules.mk 2008-12-17
15:47:42.000000000 +0000
@@ -1176,25 +1176,26 @@
ifeq ($(OS),android)
# Installer which packages up relevant Android Gears files into a .zip
-$(ANDROID_INSTALLER_OUTDIR):
- @echo "Create $@"
- @mkdir -p $@
-
$(ANDROID_INSTALLER_DLL): $(NPAPI_MODULE_DLL)
@echo "Copy $<"
+ @mkdir -p $(ANDROID_INSTALLER_OUTDIR)
@cp $< $@
@echo "Strip $<"
@$(CROSS_PREFIX)strip $@
$(ANDROID_INSTALLER_OUTDIR)/%.html: $(NPAPI_OUTDIR)/genfiles/%.html.compress
@echo "Copy `basename $...@`"
+ @mkdir -p $(ANDROID_INSTALLER_OUTDIR)
@cp $< $@
-$(ANDROID_INSTALLER_ZIP_PACKAGE): $(ANDROID_INSTALLER_OUTDIR) $(patsubst
%.html,$(ANDROID_INSTALLER_OUTDIR)/%.html,$(NPAPI_HTML_COMPRESSED_FILES))
$(ANDROID_INSTALLER_DLL)
+$(ANDROID_INSTALLER_ZIP_PACKAGE): $(patsubst
%.html,$(ANDROID_INSTALLER_OUTDIR)/%.html,$(NPAPI_HTML_COMPRESSED_FILES))
$(ANDROID_INSTALLER_DLL)
@echo "Build Android package"
+ @mkdir -p $(ANDROID_INSTALLER_OUTDIR)
+ @-rm -f $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME).zip
@(cd $(INSTALLERS_OUTDIR) && zip -r $(INSTALLER_BASE_NAME).zip
`basename $(ANDROID_INSTALLER_OUTDIR)`)
@echo "Clean files"
@rm -rf $(ANDROID_INSTALLER_OUTDIR)
+ @ls -l $(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME).zip
endif # android
ifeq ($(OS),osx)
