changeset 8:898aad2e3f29 jdk6-b04

6755905: Changes for openjdk6 build 04 6652588: Fix broken JPRT makefile target, no bundle saved 6616089: Whitespace cleanup on all sources Summary: Final b04 state (as defined by the source bundle) Reviewed-by: darcy
author ohair
date Fri, 30 Jan 2009 16:32:57 -0800
parents 7aa3e538b4a2
children 300b973c488b
files make/Makefile
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/Makefile	Fri Jan 30 16:24:06 2009 -0800
+++ b/make/Makefile	Fri Jan 30 16:32:57 2009 -0800
@@ -90,7 +90,6 @@
 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_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 \