changeset 1244:7122945ca54c

Fixed EXCLUDE_FILES for SetupZipArchive.
author erikj
date Fri, 17 Oct 2014 14:59:06 +0200
parents ae7c3c481eca
children e04e721c5328
files make/common/JavaCompilation.gmk
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/JavaCompilation.gmk	Fri Oct 17 13:15:43 2014 +0200
+++ b/make/common/JavaCompilation.gmk	Fri Oct 17 14:59:06 2014 +0200
@@ -330,8 +330,8 @@
     $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
   endif
   ifneq ($$($1_EXCLUDE_FILES),)
-    $1_ZIP_EXCLUDE_FILES := $$(addprefix -x$(SPACE)$(DQUOTE)*,$$(addsuffix $(DQUOTE),\
-        $$(sort $$(foreach i, $$($1_SRC), $$(patsubst $$1/%,%,$$($1_EXCLUDE_FILES))))))
+    # Cannot precompute ZIP_EXCLUDE_FILES as it is dependent on which src root is being
+    # zipped at the moment.
     $1_SRC_EXCLUDE_FILES := $$(addprefix %, $$($1_EXCLUDE_FILES)) $$($1_EXCLUDE_FILES)
     $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDE_FILES), $$($1_ALL_SRCS))
   endif
@@ -351,7 +351,7 @@
 	$(ECHO) Updating $$($1_NAME)
 	$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) \
 	    $$($1_ZIP_EXCLUDES) -x \*_the.\* \
-	    $$($1_ZIP_EXCLUDE_FILES) \
+	    $$(addprefix -x$(SPACE), $$(patsubst $$i/%,%, $$($1_EXCLUDE_FILES))) \
 	    || test "$$$$?" = "12" )$$(NEWLINE)) true
 	$(TOUCH) $$@