changeset in /hg/icedtea: 2008-01-31 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 4200738b14e8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4200738b14e8
description:
	2008-01-31  Gary Benson  <gbenson at redhat.com>

		* Makefile.am (hotspot, hotspot-helper): New rules.
		* Makefile.in: Regenerated.

diffstat:

3 files changed, 41 insertions(+), 2 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |   19 ++++++++++++++++++-
Makefile.in |   19 ++++++++++++++++++-

diffs (84 lines):

diff -r bafb1c61ffad -r 4200738b14e8 ChangeLog
--- 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-29  Gary Benson  <gbenson at redhat
+2008-01-31  Gary Benson  <gbenson at redhat.com>
+
+	* Makefile.am (hotspot, hotspot-helper): New rules.
+	* Makefile.in: Regenerated.
+
 2008-01-29  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-c1-unimplemented.patch: Removed file.
diff -r bafb1c61ffad -r 4200738b14e8 Makefile.am
--- 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 @@ install:
 	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 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
 	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) \
diff -r bafb1c61ffad -r 4200738b14e8 Makefile.in
--- 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 @@ install:
 	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 @@ stamps/icedtea-ecj.stamp: stamps/hotspot
 	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) \