changeset in /hg/icedtea6: 2009-06-08 Omair Majid <omajid at redh...
Omair Majid
omajid at redhat.com
Mon Jun 8 11:25:50 PDT 2009
changeset 0be8e3334758 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0be8e3334758
description:
2009-06-08 Omair Majid <omajid at redhat.com>
* Makefile.am
(stamps/ports.stamp): Depend on stamps/replace-hotspot.stamp instead
of stamps/extract.stamp.
(stamps/extract.stamp): Dont replace hotspot.
(stamps/replace-hotspot.stamp): New target. Replace hotspot without
assuming anything about the build.
(clean-replace-hotspot): New target.
(stamps/patch-fsg.stamp): Depend on stamps/replace-hotspot.stamp
instead of stamps/extract.stamp.
(stamps/hotspot-tools-source-files.txt): Likewise.
(rt-source-files.txt): Likewise.
(stamps/cacao.stamp): Likewise.
(stamps/visualvm.stamp): Likewise.
(stamps/nbplatform.stamp): Likewise.
(replace-hotspot): New alias for stamps/replace-hotspot.stamp.
diffstat:
2 files changed, 72 insertions(+), 49 deletions(-)
ChangeLog | 18 ++++++++++
Makefile.am | 103 ++++++++++++++++++++++++++++++-----------------------------
diffs (203 lines):
diff -r 4a81a23f1da6 -r 0be8e3334758 ChangeLog
--- a/ChangeLog Mon Jun 08 05:59:35 2009 -0400
+++ b/ChangeLog Mon Jun 08 14:26:32 2009 -0400
@@ -1,3 +1,21 @@ 2009-06-08 Gary Benson <gbenson at redhat
+2009-06-08 Omair Majid <omajid at redhat.com>
+
+ * Makefile.am
+ (stamps/ports.stamp): Depend on stamps/replace-hotspot.stamp instead
+ of stamps/extract.stamp.
+ (stamps/extract.stamp): Dont replace hotspot.
+ (stamps/replace-hotspot.stamp): New target. Replace hotspot without
+ assuming anything about the build.
+ (clean-replace-hotspot): New target.
+ (stamps/patch-fsg.stamp): Depend on stamps/replace-hotspot.stamp
+ instead of stamps/extract.stamp.
+ (stamps/hotspot-tools-source-files.txt): Likewise.
+ (rt-source-files.txt): Likewise.
+ (stamps/cacao.stamp): Likewise.
+ (stamps/visualvm.stamp): Likewise.
+ (stamps/nbplatform.stamp): Likewise.
+ (replace-hotspot): New alias for stamps/replace-hotspot.stamp.
+
2009-06-08 Gary Benson <gbenson at redhat.com>
* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp
diff -r 4a81a23f1da6 -r 0be8e3334758 Makefile.am
--- a/Makefile.am Mon Jun 08 05:59:35 2009 -0400
+++ b/Makefile.am Mon Jun 08 14:26:32 2009 -0400
@@ -455,7 +455,7 @@ endif
endif
# Link ports sources into tree
-stamps/ports.stamp: stamps/extract.stamp
+stamps/ports.stamp: stamps/replace-hotspot.stamp
for target in $(abs_top_srcdir)/ports/hotspot/build/*/makefiles/* \
$(abs_top_srcdir)/ports/hotspot/src/*cpu/* \
$(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \
@@ -675,57 +675,60 @@ else
mkdir openjdk ; \
$(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
- if test "x${HSBUILD}" != "xoriginal"; then \
- rm -rf openjdk/hotspot ; \
- fi ; \
sh $(abs_top_srcdir)/fsg.sh ; \
fi
+endif
+if BUILD_CACAO
+if !USE_SYSTEM_CACAO
+ if ! test -d cacao ; \
+ then \
+ mkdir cacao ; \
+ $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
+ dir=$$(basename cacao/cacao-*) ; \
+ ln -s $$dir cacao/cacao ; \
+ fi
+endif
+endif
+if WITH_VISUALVM
+ if ! test -d netbeans ; \
+ then \
+ mkdir netbeans ; \
+ $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
+ fi
+
+ if ! test -d visualvm ; \
+ then \
+ $(TAR) xf $(VISUALVM_SRC_ZIP) ; \
+ fi
+endif
+ if [ ! -e $(abs_top_builddir)/generated ]; then \
+ cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
+ find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
+ -o -type d -exec chmod 750 '{}' ';'; \
+ fi
+ mkdir -p stamps
+ touch stamps/extract.stamp
+
+clean-extract:
+ rm -f stamps/extract.stamp
+
+stamps/replace-hotspot.stamp: stamps/extract.stamp
if WITH_ALT_HSBUILD
- if test -e ${HOTSPOT_SRC_ZIP} ; \
- then \
- if ! test -d openjdk/hotspot ; \
+ if test "x${HSBUILD}" != "xoriginal"; then \
+ rm -rf openjdk/hotspot ; \
+ if test -e ${HOTSPOT_SRC_ZIP} ; \
then \
$(TAR) xf $(HOTSPOT_SRC_ZIP) ; \
chmod -R ug+w master-* ; \
mv master-$$($(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) \
$(abs_top_srcdir)/hotspot.map) openjdk/hotspot ; \
fi ; \
- fi
-endif
-endif
-if BUILD_CACAO
-if !USE_SYSTEM_CACAO
- if ! test -d cacao ; \
- then \
- mkdir cacao ; \
- $(TAR) xf $(CACAO_SRC_ZIP) -C cacao ; \
- dir=$$(basename cacao/cacao-*) ; \
- ln -s $$dir cacao/cacao ; \
- fi
-endif
-endif
-if WITH_VISUALVM
- if ! test -d netbeans ; \
- then \
- mkdir netbeans ; \
- $(TAR) xf $(NETBEANS_PROFILER_SRC_ZIP) -C netbeans ; \
- fi
-
- if ! test -d visualvm ; \
- then \
- $(TAR) xf $(VISUALVM_SRC_ZIP) ; \
- fi
-endif
- if [ ! -e $(abs_top_builddir)/generated ]; then \
- cp -a $(abs_top_srcdir)/generated $(abs_top_builddir); \
- find $(abs_top_builddir)/generated -type f -exec chmod 640 '{}' ';' \
- -o -type d -exec chmod 750 '{}' ';'; \
- fi
- mkdir -p stamps
- touch stamps/extract.stamp
-
-clean-extract:
- rm -f stamps/extract.stamp
+ fi ;
+endif
+ touch stamps/replace-hotspot.stamp
+
+clean-replace-hotspot:
+ rm -rf stamps/replace-hotspot.stamp
stamps/patch.stamp: stamps/patch-fsg.stamp
mkdir -p stamps ; \
@@ -812,7 +815,7 @@ clean-patch:
rm -f openjdk/jdk/src/share/classes/sun/applet/`basename $file` ; \
done ;
-stamps/patch-fsg.stamp: stamps/extract.stamp
+stamps/patch-fsg.stamp: stamps/replace-hotspot.stamp
mkdir -p stamps ; \
rm -f stamps/patch-fsg.stamp.tmp ; \
touch stamps/patch-fsg.stamp.tmp ; \
@@ -1445,7 +1448,7 @@ stamps/hotspot-tools-copy-source-files.s
mkdir -p stamps
touch stamps/hotspot-tools-copy-source-files.stamp
-hotspot-tools-source-files.txt: stamps/extract.stamp \
+hotspot-tools-source-files.txt: stamps/replace-hotspot.stamp \
stamps/hotspot-tools-copy-source-files.stamp
find hotspot-tools -name '*.java' | sort > $@
mkdir -p lib/hotspot-tools
@@ -1498,7 +1501,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
fi
# rt-closed.jar class files.
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
+rt-source-files.txt: stamps/replace-hotspot.stamp stamps/copy-source-files.stamp
find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' \
| sort -u > $@
@@ -1582,7 +1585,7 @@ extra-lib/about.jar: stamps/extra-class-
$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C extra-lib net ; \
fi
-stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
+stamps/cacao.stamp: stamps/replace-hotspot.stamp stamps/rt-class-files.stamp
if BUILD_CACAO
if !USE_SYSTEM_CACAO
cd cacao/cacao && \
@@ -1956,7 +1959,7 @@ check-local: jtregcheck
# VisualVM
stamps/visualvm.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/download.stamp \
- stamps/extract.stamp stamps/nbplatform.stamp
+ stamps/replace-hotspot.stamp stamps/nbplatform.stamp
if WITH_VISUALVM
cd visualvm ; \
ln -s $(abs_top_srcdir)/netbeans/nbbuild/netbeans_visualvm netbeans ; \
@@ -1969,7 +1972,7 @@ clean-visualvm:
rm -rf visualvm
rm -f stamps/visualvm.stamp
-stamps/nbplatform.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/extract.stamp \
+stamps/nbplatform.stamp: $(BOOTSTRAP_DIRECTORY_STAMP) stamps/replace-hotspot.stamp \
stamps/download.stamp
if WITH_VISUALVM
cd netbeans ; \
@@ -2059,6 +2062,8 @@ plugs: stamps/plugs.stamp
rt-class-files: stamps/rt-class-files.stamp
+replace-hotspot: stamps/replace-hotspot.stamp
+
hotspot-tools-class-files: stamps/hotspot-tools-class-files.stamp
hotspot-tools-copy-source-files: stamps/hotspot-tools-copy-source-files.stamp
More information about the distro-pkg-dev
mailing list