Mercurial > hg > release > icedtea6-1.5

changeset 581:4200738b14e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-01-31 Gary Benson <gbenson@redhat.com> * Makefile.am (hotspot, hotspot-helper): New rules. * Makefile.in: Regenerated.
author Gary Benson <gbenson@redhat.com>
date Thu, 31 Jan 2008 13:44:18 +0000
parents bafb1c61ffad
children 36c1000392c9
files ChangeLog Makefile.am Makefile.in
diffstat 3 files changed, 41 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 29 07:55:41 2008 -0500
+++ b/ChangeLog	Thu Jan 31 13:44:18 2008 +0000
@@ -1,3 +1,8 @@
+2008-01-31  Gary Benson  <gbenson@redhat.com>
+
+	* Makefile.am (hotspot, hotspot-helper): New rules.
+	* Makefile.in: Regenerated.
+
 2008-01-29  Gary Benson  <gbenson@redhat.com>
 
 	* patches/icedtea-c1-unimplemented.patch: Removed file.
--- a/Makefile.am	Tue Jan 29 07:55:41 2008 -0500
+++ b/Makefile.am	Thu Jan 31 13:44:18 2008 +0000
@@ -24,7 +24,8 @@
 	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
 	clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
 	clean-tools-jar clean-tools clean-shared-objects \
-	clean-copy clean-rt clean-gcjwebplugin clean-tools
+	clean-copy clean-rt clean-gcjwebplugin clean-tools \
+	hotspot hotspot-helper
 
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports
@@ -474,6 +475,22 @@
 	mkdir -p stamps
 	touch stamps/icedtea-ecj.stamp
 
+hotspot:
+	rm -f stamps/bootstrap-directory-symlink-ecj.stamp
+	rm -f stamps/icedtea-ecj.stamp
+	rm -f stamps/icedtea-against-ecj.stamp
+	$(MAKE) hotspot-helper
+	cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/client/libjvm.so \
+	   openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/client
+	@echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
+
+hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
+	stamps/hotspot-tools.stamp stamps/plugs.stamp \
+	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+	$(MAKE) \
+	  $(ICEDTEA_ENV_ECJ) \
+	  -C openjdk-ecj hotspot
+
 clean-icedtea-ecj: stamps/clone-ecj.stamp
 	rm -f stamps/icedtea-ecj.stamp
 	$(MAKE) \
--- a/Makefile.in	Tue Jan 29 07:55:41 2008 -0500
+++ b/Makefile.in	Thu Jan 31 13:44:18 2008 +0000
@@ -656,7 +656,8 @@
 	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
 	clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
 	clean-tools-jar clean-tools clean-shared-objects \
-	clean-copy clean-rt clean-gcjwebplugin clean-tools
+	clean-copy clean-rt clean-gcjwebplugin clean-tools \
+	hotspot hotspot-helper
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -956,6 +957,22 @@
 	mkdir -p stamps
 	touch stamps/icedtea-ecj.stamp
 
+hotspot:
+	rm -f stamps/bootstrap-directory-symlink-ecj.stamp
+	rm -f stamps/icedtea-ecj.stamp
+	rm -f stamps/icedtea-against-ecj.stamp
+	$(MAKE) hotspot-helper
+	cp openjdk-ecj/build/$(LINUX_DIR)/hotspot/import/jre/lib/$(BUILD_ARCH_DIR)/client/libjvm.so \
+	   openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image/jre/lib/$(BUILD_ARCH_DIR)/client
+	@echo "Hotspot is served:" openjdk-ecj/build/$(LINUX_DIR)/j2sdk-image
+
+hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
+	stamps/hotspot-tools.stamp stamps/plugs.stamp \
+	stamps/ports-ecj.stamp stamps/patch-ecj.stamp
+	$(MAKE) \
+	  $(ICEDTEA_ENV_ECJ) \
+	  -C openjdk-ecj hotspot
+
 clean-icedtea-ecj: stamps/clone-ecj.stamp
 	rm -f stamps/icedtea-ecj.stamp
 	$(MAKE) \