stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6652588: Fix broken JPRT makefile target, no bundle saved

Browse Source 
Jprt make rules were missing the bundle logic

Reviewed-by: xdono
This commit is contained in:
Kelly O'Hair 2008-03-04 10:58:50 -08:00
parent f7a57b1ea2
commit fc9ffa52c4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jaxws/make/Makefile
View File

@ -69,7 +69,7 @@ else
endif endif
endif endif
# Note: j2se/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) # Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
# and the somewhat misnamed CLASS_VERSION (-target NN) # and the somewhat misnamed CLASS_VERSION (-target NN)
ifdef TARGET_CLASS_VERSION ifdef TARGET_CLASS_VERSION
ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION) ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
@ -90,7 +90,6 @@ ifdef ALT_OUTPUTDIR
else else
OUTPUTDIR = .. OUTPUTDIR = ..
endif endif
ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
ifdef ALT_LANGTOOLS_DIST ifdef ALT_LANGTOOLS_DIST
ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
@ -127,7 +126,11 @@ $(ANT_TARGETS):
$(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
# Targets for Sun's internal JPRT build system # Targets for Sun's internal JPRT build system
JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip
jprt_build_product jprt_build_debug jprt_build_fastdebug: all jprt_build_product jprt_build_debug jprt_build_fastdebug: all
$(RM) $(JPRT_ARCHIVE_BUNDLE)
( cd $(OUTPUTDIR)/dist && \
zip -q -r $(JPRT_ARCHIVE_BUNDLE) . )
# Declare these phony (not filenames) # Declare these phony (not filenames)
.PHONY: $(ANT_TARGETS) all clobber \ .PHONY: $(ANT_TARGETS) all clobber \