diff options
| author | ohair <none@none> | 2008-03-04 10:58:50 -0800 |
|---|---|---|
| committer | ohair <none@none> | 2008-03-04 10:58:50 -0800 |
| commit | 0893974a3fc02ad96467659f599ea5dc242867c8 (patch) | |
| tree | a948c732acdbfca36e01b609e1fa20d9a0bb7942 /make | |
| parent | c176d3fa8a17f405e11fbc84b47ec1d042aa5522 (diff) | |
| download | jdk8u_jaxws-0893974a3fc02ad96467659f599ea5dc242867c8.tar.gz | |
6652588: Fix broken JPRT makefile target, no bundle saved
Summary: jprt make rules were missing the bundle logic
Reviewed-by: xdono
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/make/Makefile b/make/Makefile index 3dab62be..3dc17bfa 100644 --- a/make/Makefile +++ b/make/Makefile @@ -69,7 +69,7 @@ else 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) ifdef TARGET_CLASS_VERSION ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION) @@ -90,7 +90,6 @@ ifdef ALT_OUTPUTDIR else OUTPUTDIR = .. endif -ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR)) ifdef ALT_LANGTOOLS_DIST ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap @@ -127,7 +126,11 @@ $(ANT_TARGETS): $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ # Targets for Sun's internal JPRT build system +JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip 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) .PHONY: $(ANT_TARGETS) all clobber \ |