Mercurial > hg > release > icedtea6-1.13

changeset 2285:0e69fee3cd86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build failures --with-additional-vms=zero/shark - Revert the last change - Robustify installation of files into directories, which might not exist - Work around assumptions made by several icedtea components 2010-10-12 Matthias Klose <doko@ubuntu.com> * Makefile.am (stamps/add-plugin.stamp, stamps/add-plugin-debug.stamp, stamps/add-pulseaudio-debug.stamp, stamps/add-plugin-ecj.stamp): Robustify. (ADD_ZERO_CONFIGURE_ARGS): Adjust to new configure flags. (stamps/add-zero.stamp): Explicitly create directories that icedtea components assume to be created by the jdk build (not built in zerovm).
author doko@ubuntu.com
date Tue, 12 Oct 2010 22:13:50 +0200
parents a18694f7c8fa
children c66cf32a25db
files ChangeLog Makefile.am
diffstat 2 files changed, 31 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Oct 12 13:32:46 2010 +0200
+++ b/ChangeLog	Tue Oct 12 22:13:50 2010 +0200
@@ -1,6 +1,10 @@
 2010-10-12  Matthias Klose  <doko@ubuntu.com>
 
-	* Makefile.am (stamps/add-netx.stamp): Create target directories.
+	* Makefile.am (stamps/add-plugin.stamp, stamps/add-plugin-debug.stamp,
+	stamps/add-pulseaudio-debug.stamp, stamps/add-plugin-ecj.stamp): Robustify.
+	(ADD_ZERO_CONFIGURE_ARGS): Adjust to new configure flags.
+	(stamps/add-zero.stamp): Explicitly create directories that icedtea
+	components assume to be created by the jdk build (not built in zerovm).
 
 2010-10-08  Omair Majid  <omajid@redhat.com>
 
--- a/Makefile.am	Tue Oct 12 13:32:46 2010 +0200
+++ b/Makefile.am	Tue Oct 12 22:13:50 2010 +0200
@@ -1340,9 +1340,9 @@
 stamps/add-plugin.stamp: stamps/plugin.stamp stamps/icedtea.stamp
 if ENABLE_PLUGIN
 	cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
 	cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
@@ -1360,9 +1360,9 @@
 stamps/add-plugin-debug.stamp: stamps/plugin.stamp stamps/icedtea-debug.stamp
 if ENABLE_PLUGIN
 	cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
 	cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
@@ -1386,10 +1386,8 @@
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
 	cp $(NETX_RESOURCE_DIR)/about.jnlp extra-lib/about.jar \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
 	cp $(NETX_SRCDIR)/javaws.1 \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
 	cp $(NETX_SRCDIR)/javaws.1 \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1
 	touch stamps/add-netx.stamp
@@ -1509,9 +1507,9 @@
 stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET)
 if ENABLE_PULSE_JAVA
 	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
 	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
 	cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \
@@ -1600,9 +1598,9 @@
 stamps/add-plugin-ecj.stamp: stamps/plugin.stamp stamps/icedtea-ecj.stamp
 if ENABLE_PLUGIN
 	cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
-	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(PLUGIN_DIR)/IcedTeaPlugin.so \
-	  $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/
 	cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
 	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/plugin.jar
 	cp -pPRf $(abs_top_builddir)/liveconnect/lib/classes.jar \
@@ -2088,7 +2086,7 @@
 endif
 ADD_ZERO_CONFIGURE_ARGS += \
 	--disable-docs \
-	$(filter-out '--with-gcj-home=% '--with-ecj=% \
+	$(filter-out '--with-jdk-home=% '--with-ecj=% \
 			'--with-java=% '--with-javah=% \
 			'--with-rmic=% '--with-additional-vms=% \
 			'--with-openjdk '--with-openjdk=% , \
@@ -2100,6 +2098,7 @@
 	$(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \
 	  --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP))
 endif
+ADD_ZERO_CONFIGURE_ARGS += --disable-plugin --disable-bootstrap
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
@@ -2117,6 +2116,22 @@
 	    $(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
 
+	: # create directories which are expected by icedtea components,
+	: # implicitly assumed to be created by the jdk build.
+	mkdir -p $(patsubst $(abs_top_builddir)/%,$(abs_top_builddir)/zerovm/%, \
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) \
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 \
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) \
+	  $(ECJ_BUILD_OUTPUT_DIR)/j2re-image/man/man1 \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/man/man1 \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/man/man1 \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) \
+	  $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/man/man1)
+
 	$(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET)