comparison make/common/JarArchive.gmk @ 47290:b90a1b5b8142

manual merge
author mcimadamore
date Mon, 25 Sep 2017 16:38:40 +0100
parents 59bdd7243c52
children 1c1118deeedb
comparison
equal deleted inserted replaced
4:7fefc979d898 5:64bc33def1a0
209 $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) ) 209 $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
210 endif 210 endif
211 $1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE) 211 $1_SUPDATE_CONTENTS=$(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
212 212
213 # Use a slightly shorter name for logging, but with enough path to identify this jar. 213 # Use a slightly shorter name for logging, but with enough path to identify this jar.
214 $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR)) 214 $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR))
215 215
216 ifneq (,$$($1_CHECK_COMPRESS_JAR)) 216 ifneq (,$$($1_CHECK_COMPRESS_JAR))
217 $1_JAR_CREATE_OPTIONS := c0fm 217 $1_JAR_CREATE_OPTIONS := c0fm
218 $1_JAR_UPDATE_OPTIONS := u0f 218 $1_JAR_UPDATE_OPTIONS := u0f
219 ifeq ($(COMPRESS_JARS), true) 219 ifeq ($(COMPRESS_JARS), true)