1.1 --- a/common/makefiles/JavaCompilation.gmk Wed Dec 05 12:52:47 2012 -0800
1.2 +++ b/common/makefiles/JavaCompilation.gmk Fri Dec 07 17:23:42 2012 +0100
1.3 @@ -275,10 +275,12 @@
1.4 # Explicitly excluded files can be given with absolute path. The patsubst solution
1.5 # isn't perfect but the likelyhood of an absolute path to match something in a src
1.6 # dir is very small.
1.7 + # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
1.8 + # and only fail if it's not.
1.9 $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
1.10 $(MKDIR) -p $$(@D)
1.11 $(ECHO) Updating $$($1_NAME)
1.12 - $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))))$$(NEWLINE)) true
1.13 + $$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
1.14 $(TOUCH) $$@
1.15 endef
1.16
