changeset in /hg/icedtea: 2008-02-28 Joshua Sumali <jsumali at re...

Joshua Sumali jsumali at redhat.com
Thu Feb 28 10:11:53 PST 2008 

changeset 25a7a016f7c5 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=25a7a016f7c5
description:
	2008-02-28  Joshua Sumali  <jsumali at redhat.com>

	        * Makefile.am
	        (.PHONY): Remove clean-tools.
	        (EXTRA_DIST): Add icedtea-webservices.patch
	        (icedtea-compile.stamp): Removed this stamp to go back to old building of
	        icedtea target.
	        (icedtea-compile-debug.stamp): Likewise.
	        (clean-tools-jar): Remove clean-tools dependency.
	        (default-jnlp.stamp): Moved to be part of icedtea and icedtea-debug
	        targets.
	        (default-jnlp): Remove unused target.
	        (icedtea-compile): Likewise.
	        (icedtea-compile-ecj): Likewise.
	        * Makefile.in: Regenerated.

diffstat:

3 files changed, 50 insertions(+), 65 deletions(-)
ChangeLog   |   16 ++++++++++++++++
Makefile.am |   49 +++++++++++++++++--------------------------------
Makefile.in |   50 +++++++++++++++++---------------------------------

diffs (249 lines):

diff -r 8ffe6ba090e2 -r 25a7a016f7c5 ChangeLog
--- a/ChangeLog	Thu Feb 28 16:15:39 2008 +0000
+++ b/ChangeLog	Thu Feb 28 13:11:45 2008 -0500
@@ -1,3 +1,19 @@ 2008-02-28  Gary Benson  <gbenson at redhat
+2008-02-28  Joshua Sumali  <jsumali at redhat.com>
+
+	* Makefile.am
+	(.PHONY): Remove clean-tools.
+	(EXTRA_DIST): Add icedtea-webservices.patch
+	(icedtea-compile.stamp): Removed this stamp to go back to old building of
+	icedtea target.
+	(icedtea-compile-debug.stamp): Likewise.
+	(clean-tools-jar): Remove clean-tools dependency.
+	(default-jnlp.stamp): Moved to be part of icedtea and icedtea-debug
+	targets.
+	(default-jnlp): Remove unused target.
+	(icedtea-compile): Likewise.
+	(icedtea-compile-ecj): Likewise.
+	* Makefile.in: Regenerated.
+
 2008-02-28  Gary Benson  <gbenson at redhat.com>
 
 	* contrib/templater/README: Changed a URL.
diff -r 8ffe6ba090e2 -r 25a7a016f7c5 Makefile.am
--- a/Makefile.am	Thu Feb 28 16:15:39 2008 +0000
+++ b/Makefile.am	Thu Feb 28 13:11:45 2008 -0500
@@ -51,14 +51,14 @@ install:
 	clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
 	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-tools-jar clean-shared-objects \
 	clean-copy clean-hotspot-tools clean-rt $(GCJWEBPLUGIN_CLEAN) \
 	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper
 
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
 	patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch \
-	patches/icedtea-liveconnect.patch \
+	patches/icedtea-liveconnect.patch patches/icedtea-webservices.patch \
 	IcedTeaPlugin.cc patches/icedtea-freetype.patch
 
 # OpenJDK build environment.
@@ -498,13 +498,7 @@ endif
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: stamps/icedtea-compile.stamp stamps/default-jnlp.stamp
-	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
-
-# if you are working on tools.jar or netx, you can add
-# "touch stamps/icedtea-compile.stamp" to the end of this rule to avoid
-# rebuilding OpenJDK on each run.
-stamps/icedtea-compile.stamp: stamps/bootstrap-directory-symlink.stamp \
+icedtea: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
 	$(ICEDTEAPLUGIN_TARGET)
@@ -524,15 +518,13 @@ if ENABLE_PLUGIN
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 endif
 endif
-
-icedtea-debug: stamps/icedtea-compile-debug.stamp
-	@echo "IcedTea (debug build) is served:" \
-	 $(BUILD_OUTPUT_DIR)-debug
-
-# if you are working on tools.jar or netx, you can add
-# "touch stamps/icedtea-compile-debug.stamp" to the end of this rule to avoid
-# rebuilding OpenJDK on each run.
-stamps/icedtea-compile-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+
+icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
 	$(ICEDTEAPLUGIN_TARGET)
@@ -553,6 +545,12 @@ if ENABLE_PLUGIN
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 endif
 endif
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
+	@echo "IcedTea (debug build) is served:" \
+	  $(BUILD_OUTPUT_DIR)-debug
 
 clean-icedtea: stamps/clone.stamp
 	$(MAKE) \
@@ -622,9 +620,8 @@ clean-plugs: clean-plugs clean-shared-ob
 	rm -f stamps/plugs.stamp
 	rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
-clean-tools-jar: clean-hotspot-tools clean-tools
+clean-tools-jar: clean-hotspot-tools
 	rm -f stamps/hotspot-tools.stamp
-	rm -rf tools/
 	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
 
 # Shared objects.
@@ -837,13 +834,6 @@ endif
 endif
 endif
 
-stamps/default-jnlp.stamp: stamps/icedtea-compile.stamp
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
-	touch stamps/default-jnlp.stamp
-
 # Target Aliases
 # ===============
 
@@ -879,14 +869,9 @@ hotspot-tools-copy-source-files: stamps/
 
 hotspot-tools: stamps/hotspot-tools.stamp
 
-default-jnlp: stamps/default-jnlp.stamp
-
 ports: stamps/ports.stamp
 
 ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
 
-icedtea-compile: stamps/icedtea-compile.stamp
-
-icedtea-compile-ecj: stamps/icedtea-compile-ecj.stamp
diff -r 8ffe6ba090e2 -r 25a7a016f7c5 Makefile.in
--- a/Makefile.in	Thu Feb 28 16:15:39 2008 +0000
+++ b/Makefile.in	Thu Feb 28 13:11:45 2008 -0500
@@ -227,7 +227,7 @@ EXTRA_DIST = rt generated $(ICEDTEA_PATC
 EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
 	gcjwebplugin.cc patches/icedtea-speed.patch tools-copy contrib ports \
 	patches/icedtea-gcc-4.3.patch patches/icedtea-always-zero.patch \
-	patches/icedtea-liveconnect.patch \
+	patches/icedtea-liveconnect.patch patches/icedtea-webservices.patch \
 	IcedTeaPlugin.cc patches/icedtea-freetype.patch
 
 
@@ -717,7 +717,7 @@ install:
 	clean-bootstrap-directory-symlink clean-bootstrap-directory-ecj \
 	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-tools-jar clean-shared-objects \
 	clean-copy clean-hotspot-tools clean-rt $(GCJWEBPLUGIN_CLEAN) \
 	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper
 
@@ -978,13 +978,7 @@ clean-bootstrap-directory-symlink-ecj:
 
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
-icedtea: stamps/icedtea-compile.stamp stamps/default-jnlp.stamp
-	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
-
-# if you are working on tools.jar or netx, you can add
-# "touch stamps/icedtea-compile.stamp" to the end of this rule to avoid
-# rebuilding OpenJDK on each run.
-stamps/icedtea-compile.stamp: stamps/bootstrap-directory-symlink.stamp \
+icedtea: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
 	$(ICEDTEAPLUGIN_TARGET)
@@ -999,15 +993,13 @@ stamps/icedtea-compile.stamp: stamps/boo
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-
-icedtea-debug: stamps/icedtea-compile-debug.stamp
-	@echo "IcedTea (debug build) is served:" \
-	 $(BUILD_OUTPUT_DIR)-debug
-
-# if you are working on tools.jar or netx, you can add
-# "touch stamps/icedtea-compile-debug.stamp" to the end of this rule to avoid
-# rebuilding OpenJDK on each run.
-stamps/icedtea-compile-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+	@echo "IcedTea is served:" $(BUILD_OUTPUT_DIR)
+
+icedtea-debug: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp $(GCJWEBPLUGIN_TARGET) \
 	$(ICEDTEAPLUGIN_TARGET)
@@ -1023,6 +1015,12 @@ stamps/icedtea-compile-debug.stamp: stam
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	cp -pPRf gcjwebplugin.so \
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib
+	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib
+	@echo "IcedTea (debug build) is served:" \
+	  $(BUILD_OUTPUT_DIR)-debug
 
 clean-icedtea: stamps/clone.stamp
 	$(MAKE) \
@@ -1092,9 +1090,8 @@ clean-plugs: clean-plugs clean-shared-ob
 	rm -f stamps/plugs.stamp
 	rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 
-clean-tools-jar: clean-hotspot-tools clean-tools
+clean-tools-jar: clean-hotspot-tools
 	rm -f stamps/hotspot-tools.stamp
-	rm -rf tools/
 	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
 
 $(SHARED_OBJECT_FILES):
@@ -1274,13 +1271,6 @@ bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE at clean-gcjwebplugin:
 @ENABLE_LIVECONNECT_FALSE@@ENABLE_PLUGIN_TRUE@	rm -f gcjwebplugin.so
 
-stamps/default-jnlp.stamp: stamps/icedtea-compile.stamp
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/lib
-	cp rt/net/sourceforge/jnlp/resources/default.jnlp \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
-	touch stamps/default-jnlp.stamp
-
 # Target Aliases
 # ===============
 
@@ -1316,17 +1306,11 @@ hotspot-tools-copy-source-files: stamps/
 
 hotspot-tools: stamps/hotspot-tools.stamp
 
-default-jnlp: stamps/default-jnlp.stamp
-
 ports: stamps/ports.stamp
 
 ports-ecj: stamps/ports-ecj.stamp
 
 clean: distclean-local
-
-icedtea-compile: stamps/icedtea-compile.stamp
-
-icedtea-compile-ecj: stamps/icedtea-compile-ecj.stamp
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

More information about the distro-pkg-dev mailing list