changeset 1298:7e0b9f5a6d06

Moved nashorn and source-tips to support outputdir
author erikj
date Fri, 14 Nov 2014 17:37:39 +0100
parents c43e61c85aee
children 0c27b12c722c 612f3744a974
files common/autoconf/spec.gmk.in make/Images.gmk make/Main.gmk make/MakeHelpers.gmk
diffstat 4 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/spec.gmk.in	Fri Nov 14 17:16:21 2014 +0100
+++ b/common/autoconf/spec.gmk.in	Fri Nov 14 17:37:39 2014 +0100
@@ -242,13 +242,11 @@
 
 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
-NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
 TESTMAKE_OUTPUTDIR=$(BUILD_OUTPUT)/testmake
 MAKESUPPORT_OUTPUTDIR=$(BUILD_OUTPUT)/make-support
 
 HOTSPOT_DIST=@HOTSPOT_DIST@
-NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist
 
 BUILD_HOTSPOT=@BUILD_HOTSPOT@
 
--- a/make/Images.gmk	Fri Nov 14 17:16:21 2014 +0100
+++ b/make/Images.gmk	Fri Nov 14 17:37:39 2014 +0100
@@ -383,25 +383,25 @@
 endef
 
 ALL_SOURCE_TIPS = $(shell \
-    if [ -f $(OUTPUT_ROOT)/source_tips ] ; then \
-      $(CAT) $(OUTPUT_ROOT)/source_tips ; \
+    if [ -f $(SUPPORT_OUTPUTDIR)/source_tips ] ; then \
+      $(CAT) $(SUPPORT_OUTPUTDIR)/source_tips ; \
     fi)
 
-$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
+$(JRE_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips
 	$(call create-info-file, $(JRE_SORTED_MODULES))
 
-$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
+$(JDK_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips
 	$(call create-info-file, $(JDK_SORTED_MODULES))
 
-$(JRE_COMPACT1_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
+$(JRE_COMPACT1_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips
 	$(call create-info-file, $(JRE_COMPACT1_SORTED_MODULES))
 	$(call info-file-item, "JAVA_PROFILE", "compact1")
 
-$(JRE_COMPACT2_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
+$(JRE_COMPACT2_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips
 	$(call create-info-file, $(JRE_COMPACT2_SORTED_MODULES))
 	$(call info-file-item, "JAVA_PROFILE", "compact2")
 
-$(JRE_COMPACT3_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(OUTPUT_ROOT)/source_tips
+$(JRE_COMPACT3_INFO_FILE): $(OUTPUT_ROOT)/spec.gmk $(SUPPORT_OUTPUTDIR)/source_tips
 	$(call create-info-file, $(JRE_COMPACT3_SORTED_MODULES))
 	$(call info-file-item, "JAVA_PROFILE", "compact3")
 
--- a/make/Main.gmk	Fri Nov 14 17:16:21 2014 +0100
+++ b/make/Main.gmk	Fri Nov 14 17:37:39 2014 +0100
@@ -206,8 +206,8 @@
 
 # Stores the tips for each repository. This file is be used when constructing the jdk image and can be
 # used to track the exact sources used to build that image.
-source-tips: $(OUTPUT_ROOT)/source_tips
-$(OUTPUT_ROOT)/source_tips: FRC
+source-tips: $(SUPPORT_OUTPUTDIR)/source_tips
+$(SUPPORT_OUTPUTDIR)/source_tips: FRC
 	@$(MKDIR) -p $(@D)
 	@$(RM) $@
 	@$(call GetSourceTips)
@@ -472,7 +472,7 @@
 # Clean targets are automatically run serially by the Makefile calling this 
 # file.
 
-CLEAN_DIRS += hotspot jdk nashorn bootcycle-build test buildtools support \
+CLEAN_DIRS += hotspot jdk bootcycle-build test buildtools support \
     images make-support
 CLEAN_DIR_TARGETS := $(addprefix clean-, $(CLEAN_DIRS))
 CLEAN_PHASES := gensrc java native include
--- a/make/MakeHelpers.gmk	Fri Nov 14 17:16:21 2014 +0100
+++ b/make/MakeHelpers.gmk	Fri Nov 14 17:37:39 2014 +0100
@@ -313,6 +313,7 @@
 define Clean-java
 	@$(PRINTF) "Cleaning java $(if $1,for $(strip $1) )..."
 	@$(RM) -r $(JDK_OUTPUTDIR)/modules/$(strip $1)
+	@$(RM) -r $(SUPPORT_OUTPUTDIR)/misc/$(strip $1)
 	@$(PRINTF) " done\n"
 	@$(PRINTF) "Cleaning headers $(if $1,for $(strip $1)) ..."
 	@$(RM) -r $(SUPPORT_OUTPUTDIR)/headers/$(strip $1)