comparison make/CreateJars.gmk @ 11311:c942132c5014

Added tag jdk8u71-b01 for changeset e8b5e10a19d6
author asaha
date Tue, 22 Sep 2015 13:39:46 -0700
parents 12a94014eaba
children 5eb47c73c343
comparison
equal deleted inserted replaced
6:e38f60b47a7e 7:03b30bf60a55
281 $(RM) $@ $@.tmp 281 $(RM) $@ $@.tmp
282 $(GREP) -v -e '\.class$$' \ 282 $(GREP) -v -e '\.class$$' \
283 -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \ 283 -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
284 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp 284 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
285 ifneq ($(PROFILE), ) 285 ifneq ($(PROFILE), )
286 # Strip out all META-INF/services/ entries
287 $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
286 ifneq ($(strip $(PROFILE_INCLUDE_METAINF_SERVICES)), ) 288 ifneq ($(strip $(PROFILE_INCLUDE_METAINF_SERVICES)), )
287 # Strip out all META-INF/services/ entries
288 $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
289 # Add back the required services 289 # Add back the required services
290 for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \ 290 for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
291 $(ECHO) $$service >> $@.tmp2; \ 291 $(ECHO) $$service >> $@.tmp2; \
292 done 292 done
293 $(MV) $@.tmp2 $@.tmp
294 endif 293 endif
294 $(MV) $@.tmp2 $@.tmp
295 endif 295 endif
296 $(MV) $@.tmp $@ 296 $(MV) $@.tmp $@
297 297
298 # This is a hack but I don't know how to make this fit into the existing scheme 298 # This is a hack but I don't know how to make this fit into the existing scheme
299 $(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS) 299 $(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS)