6652588: Fix broken JPRT makefile target, no bundle saved jdk7-b25

Tue, 04 Mar 2008 10:58:50 -0800

author
ohair
date
Tue, 04 Mar 2008 10:58:50 -0800
changeset 4
59fd8224ba2d
parent 3
018781e80410
child 5
debd37e1a422

6652588: Fix broken JPRT makefile target, no bundle saved
Summary: jprt make rules were missing the bundle logic
Reviewed-by: xdono

make/Makefile file | annotate | diff | comparison | revisions
     1.1 --- a/make/Makefile	Fri Feb 29 20:03:59 2008 -0800
     1.2 +++ b/make/Makefile	Tue Mar 04 10:58:50 2008 -0800
     1.3 @@ -69,7 +69,7 @@
     1.4    endif
     1.5  endif
     1.6  
     1.7 -# Note: j2se/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
     1.8 +# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
     1.9  # and the somewhat misnamed CLASS_VERSION (-target NN)
    1.10  ifdef TARGET_CLASS_VERSION
    1.11    ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
    1.12 @@ -90,7 +90,6 @@
    1.13  else
    1.14    OUTPUTDIR = ..
    1.15  endif
    1.16 -ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
    1.17  
    1.18  ifdef ALT_LANGTOOLS_DIST
    1.19    ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap
    1.20 @@ -127,7 +126,11 @@
    1.21  	$(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
    1.22  
    1.23  # Targets for Sun's internal JPRT build system
    1.24 +JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip
    1.25  jprt_build_product jprt_build_debug jprt_build_fastdebug: all
    1.26 +	$(RM) $(JPRT_ARCHIVE_BUNDLE)
    1.27 +	( cd $(OUTPUTDIR)/dist && \
    1.28 +	   zip -q -r $(JPRT_ARCHIVE_BUNDLE) . )
    1.29  
    1.30  # Declare these phony (not filenames)
    1.31  .PHONY: $(ANT_TARGETS) all clobber \

mercurial