/hg/icedtea6: Make {ECJ_,}BUILD_OUTPUT_DIR absolute and drop unn...

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Jun 7 11:43:51 PDT 2010 

changeset fa0ad887008c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fa0ad887008c
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jun 07 19:43:40 2010 +0100

	Make {ECJ_,}BUILD_OUTPUT_DIR absolute and drop unneeded
	ICEDTEA_BUILD_DIR{,_ECJ}.

	2010-06-07 Andrew John Hughes <ahughes at redhat.com>

	 Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR
	absolute and dispense with ICEDTEA_BUILD_DIR and
	ICEDTEA_BUILD_DIR_ECJ.
		* Makefile.am: (BUILD_OUTPUT_DIR): Make absolute.
	(ICEDTEA_BUILD_DIR): Dropped. (ECJ_BUILD_OUTPUT_DIR):
	Likewise. (ICEDTEA_CLS_DIR): Make relative to
	BUILD_OUTPUT_DIR. (ICEDTEA_CLS_DIR): Likewise for
	ECJ_BUILD_OUTPUT_DIR. (ICEDTEA_BUILD_DIR_ECJ): Dropped.
	(ICEDTEA_ENV): Don't pass ICEDTEA_BUILD_DIR.
	(ICEDTEA_ENV_ECJ): Likewise. (bootstrap-directory.stamp):
	Use ECJ_BUILD_OUTPUT_DIR rather than ICEDTEA_BUILD_DIR_ECJ.
	Remove unneeded $(abs_top_builddir).
	(icedtea.stamp): Drop unneeded use of $(abs_top_builddir)
	from pulse java src.zip update. (icedtea-debug.stamp): Add
	pulse java src.zip update. (ADD_ZERO_CONFIGURE_ARGS): Drop
	unneeded $(abs_top_builddir). (ADD_ZERO_EXTRA_BUILD_ENV):
	Replace ICEDTEA_BUILD_DIR with BUILD_OUTPUT_DIR.
	(check-hotspot): Replace unneeded use of pwd. (check-jdk):
	Likewise. (check-langtools): Likewise.
		* patches/ecj/icedtea.patch: Use already defined CLASSBINDIR
	instead of passing in ICEDTEA_BUILD_DIR.


diffstat:

3 files changed, 48 insertions(+), 26 deletions(-)
ChangeLog                 |   29 +++++++++++++++++++++++++++++
Makefile.am               |   41 +++++++++++++++++------------------------
patches/ecj/icedtea.patch |    4 ++--

diffs (180 lines):

diff -r 2fd3953c1983 -r fa0ad887008c ChangeLog
--- a/ChangeLog	Mon Jun 07 11:49:53 2010 -0400
+++ b/ChangeLog	Mon Jun 07 19:43:40 2010 +0100
@@ -1,3 +1,32 @@ 2010-06-07 Jon VanAlten  <jon.vanalten at r
+2010-06-07 Andrew John Hughes  <ahughes at redhat.com>
+
+	Make BUILD_OUTPUT_DIR and ECJ_BUILD_OUTPUT_DIR
+	absolute and dispense with ICEDTEA_BUILD_DIR and
+	ICEDTEA_BUILD_DIR_ECJ.
+	* Makefile.am:
+	(BUILD_OUTPUT_DIR): Make absolute.
+	(ICEDTEA_BUILD_DIR): Dropped.
+	(ECJ_BUILD_OUTPUT_DIR): Likewise.
+	(ICEDTEA_CLS_DIR): Make relative to BUILD_OUTPUT_DIR.
+	(ICEDTEA_CLS_DIR): Likewise for ECJ_BUILD_OUTPUT_DIR.
+	(ICEDTEA_BUILD_DIR_ECJ): Dropped.
+	(ICEDTEA_ENV): Don't pass ICEDTEA_BUILD_DIR.
+	(ICEDTEA_ENV_ECJ): Likewise.
+	(bootstrap-directory.stamp): Use ECJ_BUILD_OUTPUT_DIR
+	rather than ICEDTEA_BUILD_DIR_ECJ.  Remove unneeded
+	$(abs_top_builddir).
+	(icedtea.stamp): Drop unneeded use of $(abs_top_builddir)
+	from pulse java src.zip update.
+	(icedtea-debug.stamp): Add pulse java src.zip update.
+	(ADD_ZERO_CONFIGURE_ARGS): Drop unneeded $(abs_top_builddir).
+	(ADD_ZERO_EXTRA_BUILD_ENV): Replace ICEDTEA_BUILD_DIR
+	with BUILD_OUTPUT_DIR.
+	(check-hotspot): Replace unneeded use of pwd.
+	(check-jdk): Likewise.
+	(check-langtools): Likewise.
+	* patches/ecj/icedtea.patch: Use already defined
+	CLASSBINDIR instead of passing in ICEDTEA_BUILD_DIR.
+
 2010-06-07 Jon VanAlten  <jon.vanalten at redhat.com>
 
 	* Makefile.am
diff -r 2fd3953c1983 -r fa0ad887008c Makefile.am
--- a/Makefile.am	Mon Jun 07 11:49:53 2010 -0400
+++ b/Makefile.am	Mon Jun 07 19:43:40 2010 +0100
@@ -32,23 +32,17 @@ OPENJDK_HG_URL = http://hg.openjdk.java.
 # Build directories
 
 OS_DIR = $(BUILD_OS_DIR)-$(BUILD_ARCH_DIR)
-BUILD_OUTPUT_DIR = openjdk/build/$(OS_DIR)
+BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk/build/$(OS_DIR)
 DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug
-ECJ_BUILD_OUTPUT_DIR = openjdk-ecj/build/$(OS_DIR)
-ICEDTEA_BUILD_DIR = \
-	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)
-ICEDTEA_CLS_DIR = \
-	$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/classes
+ECJ_BUILD_OUTPUT_DIR = $(abs_top_builddir)/openjdk-ecj/build/$(OS_DIR)
+ICEDTEA_CLS_DIR = $(BUILD_OUTPUT_DIR)/classes
+ICEDTEA_CLS_DIR_ECJ = $(ECJ_BUILD_OUTPUT_DIR)/classes
 ICEDTEA_BOOT_DIR= \
 	$(abs_top_builddir)/bootstrap/jdk1.6.0
 ICEDTEA_RT = \
 	$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar
 ICEDTEA_ENDORSED_DIR = \
 	$(ICEDTEA_BOOT_DIR)/lib/endorsed
-ICEDTEA_BUILD_DIR_ECJ = \
-	$(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/
-ICEDTEA_CLS_DIR_ECJ = \
-	$(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/classes
 SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server
 BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
@@ -422,7 +416,6 @@ ICEDTEA_ENV = \
 	PATH="$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:$(OS_PATH):$$PATH" \
 	ALT_BOOTDIR="$(ICEDTEA_BOOT_DIR)" \
 	BUILD_ARCH_DIR="$(BUILD_ARCH_DIR)" \
-	ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR)" \
 	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR)" \
 	ICEDTEA_ENDORSED_DIR="$(ICEDTEA_ENDORSED_DIR)" \
 	ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
@@ -497,7 +490,6 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
 	JAVA_TOOLS_DIR="$(ICEDTEA_BOOT_DIR)/bin" \
 	ICEDTEA_RT="$(ICEDTEA_RT)" \
-	ICEDTEA_BUILD_DIR="$(ICEDTEA_BUILD_DIR_ECJ)" \
 	ICEDTEA_CLS_DIR="$(ICEDTEA_CLS_DIR_ECJ)" \
 	BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
 	BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
@@ -1176,10 +1168,9 @@ stamps/bootstrap-directory.stamp: stamps
 stamps/bootstrap-directory.stamp: stamps/icedtea-against-ecj.stamp
 	rm -rf bootstrap/icedtea
 	ln -s \
-	  $(abs_top_builddir)/$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/ \
-	  bootstrap/icedtea
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/ bootstrap/icedtea
 	if ! test -d bootstrap/icedtea/include; then \
-	  ln -sf $(ICEDTEA_BUILD_DIR_ECJ)/include bootstrap/icedtea/include; \
+	  ln -sf $(ECJ_BUILD_OUTPUT_DIR)/include bootstrap/icedtea/include; \
 	fi
 	mkdir -p stamps
 	touch stamps/bootstrap-directory.stamp
@@ -1251,7 +1242,7 @@ if ENABLE_PULSE_JAVA
 	cp -pPRf pulse-java.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext
 	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
-	   $(ZIP) -qur $(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
+	   $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
 endif
 if WITH_VISUALVM
 	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
@@ -1342,6 +1333,8 @@ if ENABLE_PULSE_JAVA
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	cp -pPRf pulse-java.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext
+	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+	   $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org )
 endif
 if WITH_VISUALVM 
 	mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/lib/visualvm/etc ; \
@@ -1833,7 +1826,7 @@ endif
 # configure script arguments, quoted in single quotes
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ADD_ZERO_CONFIGURE_ARGS = \
-	--with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+	--with-openjdk=$(BUILD_OUTPUT_DIR)/j2sdk-image \
 	--enable-zero
 if ADD_SHARK_BUILD
 ADD_ZERO_CONFIGURE_ARGS += \
@@ -1855,10 +1848,10 @@ endif
 endif
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
-	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \
-	BUILD_JAXP=false      ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \
-	BUILD_JAXWS=false     ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \
-	BUILD_CORBA=false     ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \
+	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
+	BUILD_JAXP=false      ALT_JAXP_DIST=$(BUILD_OUTPUT_DIR)/jaxp/dist \
+	BUILD_JAXWS=false     ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \
+	BUILD_CORBA=false     ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \
 	BUILD_JDK=false \
 	DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))'
 
@@ -1967,7 +1960,7 @@ check-hotspot: stamps/jtreg.stamp
 	mkdir -p test/hotspot/JTwork test/hotspot/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/hotspot/JTwork -r:test/hotspot/JTreport \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/hotspot/test \
 	    | tee test/$@.log
@@ -1977,7 +1970,7 @@ check-langtools: stamps/jtreg.stamp
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/langtools/test \
 	    | tee test/$@.log
@@ -1987,7 +1980,7 @@ check-jdk: stamps/jtreg.stamp
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
 		$${ICEDTEA_JTREG_OTHERVM:--samevm} \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-jdk:$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.jtx \
 		$(ICEDTEA_JTREG_OPTIONS) \
 		`pwd`/openjdk/jdk/test \
diff -r 2fd3953c1983 -r fa0ad887008c patches/ecj/icedtea.patch
--- a/patches/ecj/icedtea.patch	Mon Jun 07 11:49:53 2010 -0400
+++ b/patches/ecj/icedtea.patch	Mon Jun 07 19:43:40 2010 +0100
@@ -336,9 +336,9 @@ diff -Nru openjdk-ecj.orig/corba/make/co
  	  $(ECHO) "# Running javac:"; \
 -	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
 -	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
++	  $(ECHO) $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \
 +		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
-+	  $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(ICEDTEA_BUILD_DIR)/corba/classes \
++	  $(JAVAC_CMD) -bootclasspath $(ICEDTEA_RT):$(CLASSBINDIR) \
 +		 -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$(JAVA_SOURCE_LIST); \
  	fi
  	@$(java-vm-cleanup)

More information about the distro-pkg-dev mailing list