make/common/JavaCompilation.gmk
changeset 22480 d1be923b168a
parent 22469 f8c0670baf03
child 22481 e0f8e9039971
equal deleted inserted replaced
22479:43e372703313 22480:d1be923b168a
   245 	  $$($1_SCAPTURE_CONTENTS) \
   245 	  $$($1_SCAPTURE_CONTENTS) \
   246 	  $$($1_SCAPTURE_METAINF) \
   246 	  $$($1_SCAPTURE_METAINF) \
   247 	  $$($1_SUPDATE_CONTENTS) \
   247 	  $$($1_SUPDATE_CONTENTS) \
   248 	  $$($1_JARINDEX) && true )
   248 	  $$($1_JARINDEX) && true )
   249 
   249 
       
   250   # Add jar to target list
       
   251   $1 += $$($1_JAR)
   250 endef
   252 endef
   251 
   253 
   252 define SetupZipArchive
   254 define SetupZipArchive
   253   # param 1 is for example ZIP_MYSOURCE
   255   # param 1 is for example ZIP_MYSOURCE
   254   # param 2,3,4,5,6,7,8,9 are named args.
   256   # param 2,3,4,5,6,7,8,9 are named args.
   305   $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
   307   $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
   306 	$(MKDIR) -p $$(@D)
   308 	$(MKDIR) -p $$(@D)
   307 	$(ECHO) Updating $$($1_NAME)
   309 	$(ECHO) Updating $$($1_NAME)
   308 	$$(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
   310 	$$(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
   309 	$(TOUCH) $$@
   311 	$(TOUCH) $$@
       
   312 
       
   313   # Add zip to target list
       
   314   $1 += $$($1_ZIP)
   310 endef
   315 endef
   311 
   316 
   312 define add_file_to_copy
   317 define add_file_to_copy
   313   # param 1 = BUILD_MYPACKAGE
   318   # param 1 = BUILD_MYPACKAGE
   314   # parma 2 = The source file to copy.
   319   # parma 2 = The source file to copy.
   577         MANIFEST:=$$($1_MANIFEST), \
   582         MANIFEST:=$$($1_MANIFEST), \
   578         EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
   583         EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
   579         JARINDEX:=$$($1_JARINDEX), \
   584         JARINDEX:=$$($1_JARINDEX), \
   580         HEADERS:=$$($1_HEADERS), \
   585         HEADERS:=$$($1_HEADERS), \
   581         SETUP:=$$($1_SETUP)))
   586         SETUP:=$$($1_SETUP)))
       
   587 
       
   588     # Add jar to target list
       
   589     $1 += $$($1_JAR)
   582   endif
   590   endif
   583 
   591 
   584   # Check if a srczip was specified, then setup the rules for the srczip.
   592   # Check if a srczip was specified, then setup the rules for the srczip.
   585   ifneq (,$$($1_SRCZIP))
   593   ifneq (,$$($1_SRCZIP))
   586     $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
   594     $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
   587         SRC:=$$($1_SRC), \
   595         SRC:=$$($1_SRC), \
   588         ZIP:=$$($1_SRCZIP), \
   596         ZIP:=$$($1_SRCZIP), \
   589         INCLUDES:=$$($1_INCLUDES), \
   597         INCLUDES:=$$($1_INCLUDES), \
   590         EXCLUDES:=$$($1_EXCLUDES), \
   598         EXCLUDES:=$$($1_EXCLUDES), \
   591         EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
   599         EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
   592   endif
   600 
   593 
   601     # Add zip to target list
   594 endef
   602     $1 += $$($1_SRCZIP)
       
   603   endif
       
   604 endef