/hg/icedtea: 4 new changesets
|
View:
New views
1 Messages
—
Rating Filter:
Alert me
|
 |
/hg/icedtea: 4 new changesets
by andrew-127
::
Rate this Message:
changeset 864e5903d8e2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=864e5903d8e2 author: Andrew John Hughes <ahughes@...> date: Mon Nov 02 19:00:19 2009 +0000 Cleanup the existing clean targets and add missing ones. 2009-11-02 Andrew John Hughes <ahughes@...> * Makefile.am: (clean-local): New target which removes all but the downloaded tarballs. (distclean- local): Now depends on clean-local, and removes the tarballs. (stamps/download.stamp): Changed to be a top-level target for all downloads. (clean-download): Changed to remove all downloads. (stamps/download-openjdk.stamp): Renamed from stamps/download.stamp. Downloads OpenJDK tarballs. (clean-download-openjdk): Now removes all OpenJDK tarballs if not using the alternate zip option. (stamps/extract.stamp): Changed to be a top-level target for all extraction. (clean-extract): Changed to remove all extracted directories. (stamps/extract- visualvm.stamp): Depend on the tarball having being downloaded. (clean-extract-visualvm): Renamed from clean- extract-visualvm.stamp (stamps/extract-cacao.stamp): Rename dependency to match changes above. (clean-extract- cacao): Simply depend on clean-cacao and remove the stamp. (stamps/ports.stamp): Depend on general extraction target. (clean-ports): New target to invert stamps/ports.stamp (clean-generated): Likewise for stamps/generated.stamp (clean-patch-fsg): Only revert patches if they've been applied. (clean-patch): Likewise. (stamps/versioning.stamp): Backup Defs.gmk prior to altering. (clean-versioning): Restore original Defs.gmk. (clean-overlay): New target to remove stamps/overlay.stamp (clean-native-ecj): New target to remove the native-ecj binary and stamp. (stamps/icedtea.stamp): Reduce dependencies where implied by others. (clean-plugin): New target depending on two conditional plugin targets. (clean-liveconnect): New target to revert stamps/liveconnect.stamp. (clean-netx): Likewise for stamps/netx.stamp and stamps/netx-dist.stamp (clean): Removed; provided by automake. changeset dd437ca5fa4a in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=dd437ca5fa4a author: Andrew John Hughes <ahughes@...> date: Mon Nov 02 19:25:07 2009 +0000 Create separate targets for downloading CACAO and VisualVM. 2009-11-02 Andrew John Hughes <ahughes@...> * Makefile.am: Replace explicit touch stamps/<file> invocations with touch $@. Reorganise aliases alphabetically and add missing ones. (stamps/download- openjdk.stamp): Move CACAO and VisualVM downloads to separate target. (stamps/download-cacao.stamp): New target for downloading CACAO. (clean-download-cacao): Inverse of download-cacao. (stamps/download-visualvm.stamp): New target for downloading VisualVM. (clean-download-visualvm): Inverse of download-visualvm. (stamps/extract-cacao.stamp): Depend on download-cacao. (stamps/extract-visualvm.stamp): Depend on download-visualvm. (clean-patch-boot): Check that patches have been applied. (stamps/pulse-java.stamp): Move native code generation to its own target, making this a top-level dependency target. (stamps/pulse-java-native-code.stamp): New target for native code generation for PulseAudio plugin. (clean-pulse-java): Always remove stamps. changeset 73b1d535e19b in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=73b1d535e19b author: Andrew John Hughes <ahughes@...> date: Mon Nov 02 19:55:03 2009 +0000 Ensure all downloading and extracting happens before building OpenJDK. 2009-11-02 Andrew John Hughes <ahughes@...> * Makefile.am: Make sure all downloading and extracting occurs before building OpenJDK. changeset 9c96175dae62 in /hg/icedtea details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9c96175dae62 author: Andrew John Hughes <ahughes@...> date: Mon Nov 02 21:43:32 2009 +0000 Add missing plugin target and turn icedtea-*-stage2 into stamps. 2009-11-02 Andrew John Hughes <ahughes@...> * Makefile.am: (stamps/plugin.stamp): Added to unify two plugin targets. (stamps/icedtea-stage2.stamp): Renamed from icedtea-stage2 so we can mark when its done. (stamps/icedtea-debug-stage2.stamp): Likewise with icedtea- debug-stage2. (clean-icedtea-stage2): Inverse target for icedtea-stage2. (clean-icedtea-debug-stage2): Same for icedtea-debug-stage2. diffstat: 2 files changed, 507 insertions(+), 296 deletions(-) ChangeLog | 86 +++++++ Makefile.am | 717 ++++++++++++++++++++++++++++++++++------------------------- diffs (truncated from 1192 to 500 lines): diff -r d3256a5c9afe -r 9c96175dae62 ChangeLog --- a/ChangeLog Sun Nov 01 19:13:55 2009 +0000 +++ b/ChangeLog Mon Nov 02 21:43:32 2009 +0000 @@ -1,3 +1,89 @@ 2009-11-01 Andrew John Hughes <ahughes +2009-11-02 Andrew John Hughes <ahughes@...> + + * Makefile.am: + (stamps/plugin.stamp): Added to unify + two plugin targets. + (stamps/icedtea-stage2.stamp): Renamed + from icedtea-stage2 so we can mark when + its done. + (stamps/icedtea-debug-stage2.stamp): Likewise + with icedtea-debug-stage2. + (clean-icedtea-stage2): Inverse target for + icedtea-stage2. + (clean-icedtea-debug-stage2): Same for + icedtea-debug-stage2. + +2009-11-02 Andrew John Hughes <ahughes@...> + + * Makefile.am: + Make sure all downloading and extracting + occurs before building OpenJDK. + +2009-11-02 Andrew John Hughes <ahughes@...> + + * Makefile.am: + Replace explicit touch stamps/<file> + invocations with touch $@. Reorganise + aliases alphabetically and add missing ones. + (stamps/download-openjdk.stamp): Move + CACAO and VisualVM downloads to separate target. + (stamps/download-cacao.stamp): New target + for downloading CACAO. + (clean-download-cacao): Inverse of download-cacao. + (stamps/download-visualvm.stamp): New target + for downloading VisualVM. + (clean-download-visualvm): Inverse of download-visualvm. + (stamps/extract-cacao.stamp): Depend on download-cacao. + (stamps/extract-visualvm.stamp): Depend on download-visualvm. + (clean-patch-boot): Check that patches have been applied. + (stamps/pulse-java.stamp): Move native code generation to its + own target, making this a top-level dependency target. + (stamps/pulse-java-native-code.stamp): New target for native + code generation for PulseAudio plugin. + (clean-pulse-java): Always remove stamps. + +2009-11-02 Andrew John Hughes <ahughes@...> + + * Makefile.am: + (clean-local): New target which removes all + but the downloaded tarballs. + (distclean-local): Now depends on clean-local, + and removes the tarballs. + (stamps/download.stamp): Changed to be a top-level + target for all downloads. + (clean-download): Changed to remove all downloads. + (stamps/download-openjdk.stamp): Renamed from + stamps/download.stamp. Downloads OpenJDK tarballs. + (clean-download-openjdk): Now removes all OpenJDK + tarballs if not using the alternate zip option. + (stamps/extract.stamp): Changed to be a top-level + target for all extraction. + (clean-extract): Changed to remove all extracted + directories. + (stamps/extract-visualvm.stamp): Depend on the tarball + having being downloaded. + (clean-extract-visualvm): Renamed from clean-extract-visualvm.stamp + (stamps/extract-cacao.stamp): Rename dependency to + match changes above. + (clean-extract-cacao): Simply depend on clean-cacao and + remove the stamp. + (stamps/ports.stamp): Depend on general extraction target. + (clean-ports): New target to invert stamps/ports.stamp + (clean-generated): Likewise for stamps/generated.stamp + (clean-patch-fsg): Only revert patches if they've been applied. + (clean-patch): Likewise. + (stamps/versioning.stamp): Backup Defs.gmk prior to altering. + (clean-versioning): Restore original Defs.gmk. + (clean-overlay): New target to remove stamps/overlay.stamp + (clean-native-ecj): New target to remove the native-ecj binary + and stamp. + (stamps/icedtea.stamp): Reduce dependencies where implied by + others. + (clean-plugin): New target depending on two conditional plugin targets. + (clean-liveconnect): New target to revert stamps/liveconnect.stamp. + (clean-netx): Likewise for stamps/netx.stamp and stamps/netx-dist.stamp + (clean): Removed; provided by automake. + 2009-11-01 Andrew John Hughes <ahughes@...> * patches/icedtea-float-double-trailing-zeros.patch: diff -r d3256a5c9afe -r 9c96175dae62 Makefile.am --- a/Makefile.am Sun Nov 01 19:13:55 2009 +0000 +++ b/Makefile.am Mon Nov 02 21:43:32 2009 +0000 @@ -165,6 +165,12 @@ endif endif endif +if USE_ALT_CACAO_SRC_ZIP + CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) +else + CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 +endif + if WITH_ALT_HSBUILD HS_MD5SUM = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" HS_CHANGESET = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_srcdir)/hotspot.map`" @@ -173,12 +179,6 @@ else HS_MD5SUM = $(HOTSPOT_MD5SUM) HS_CHANGESET = $(HOTSPOT_CHANGESET) HS_URL = $(HOTSPOT_URL) -endif - -if USE_ALT_CACAO_SRC_ZIP - CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) -else - CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.bz2 endif if ENABLE_NPPLUGIN @@ -695,38 +695,28 @@ all-local: icedtea-stage2 check-local: jtregcheck -distclean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \ - clean-clone clean-clone-boot clean-download - rm -rf stamps - rm -rf drops - rm -f rt-source-files.txt \ - extra-source-files.txt \ - netx-source-files.txt - rm -rf bootstrap - rm -rf lib - rm -rf extra-lib +clean-local: clean-jtreg clean-jtreg-reports clean-pulse-java \ + clean-clone clean-clone-boot clean-plugs clean-extra clean-netx \ + clean-visualvm clean-nbplatform clean-bootstrap-directory-stage1 \ + clean-bootstrap-directory-stage2 clean-bootstrap-directory-symlink-stage1 \ + clean-bootstrap-directory-symlink-stage2 clean-extract clean-generated \ + clean-plugin clean-liveconnect clean-native-ecj clean-hgforest \ + clean-icedtea-stage2 clean-icedtea-debug-stage2 + if [ -e bootstrap ]; then \ + rmdir bootstrap ; \ + fi + if [ -e lib ]; then \ + rmdir lib ; \ + fi rm -rf rt/netscape - rm -rf visualvm - rm -rf netbeans - rm -rf netx.build -if ENABLE_PLUGIN - rm -f IcedTeaPlugin.o IcedTeaPlugin.so -endif -if ENABLE_NPPLUGIN - rm -f $(NPPLUGIN_DIR)/*.o $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so -endif -if BUILD_CACAO - rm -rf cacao -endif rm -f jni-common.o if ADD_ZERO_BUILD rm -rf zerovm endif -if BUILD_NATIVE_ECJ - rm -f native-ecj -endif - if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \ - rm -rf $(abs_top_builddir)/generated ; \ + +distclean-local: clean-local clean-download + if [ -e stamps ] ; then \ + rmdir stamps ; \ fi install: @@ -738,9 +728,8 @@ install: clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \ clean-icedtea icedtea-stage2 clean-icedtea-boot clean-plugs \ clean-tools-jar clean-visualvm clean-nbplatform \ - clean-rt $(ICEDTEAPLUGIN_CLEAN) \ - $(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \ - clean-jtreg-reports + clean-rt clean-plugin hotspot hotspot-helper clean-extra clean-jtreg \ + clean-jtreg-reports clean-netx clean-drops env: @echo 'unset JAVA_HOME' @@ -766,7 +755,39 @@ dist-openjdk-fsg: stamps/patch-fsg.stamp # OpenJDK Source Preparation Targets # ================================== +# Check for forest support + +stamps/hgforest.stamp: +if OPENJDK_SRC_DIR_FOUND +else +if USE_ALT_OPENJDK_SRC_ZIP +else +if !USE_HG +else + if ! $(HG) fclone -h; \ + then \ + echo "No forest extension found. Please refer to" \ + "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \ + exit 1; \ + fi; +endif +endif +endif + mkdir -p stamps + touch $@ + +clean-hgforest: + rm -f stamps/hgforest.stamp + # Download OpenJDK sources. + +stamps/download.stamp: stamps/download-drops.stamp stamps/download-openjdk.stamp \ + stamps/download-cacao.stamp stamps/download-visualvm.stamp + mkdir -p stamps + touch $@ + +clean-download: clean-drops clean-download-openjdk + rm -f stamps/download.stamp stamps/download-jaxp-drop.stamp: mkdir -p drops @@ -787,7 +808,11 @@ endif fi; \ fi ; mkdir -p stamps - touch stamps/download-jaxp-drop.stamp + touch $@ + +clean-download-jaxp-drop: + rm -f drops/$(JAXP_DROP_ZIP) + rm -f stamps/download-jaxp-drop.stamp stamps/download-jaf-drop.stamp: mkdir -p drops @@ -808,7 +833,11 @@ endif fi; \ fi ; mkdir -p stamps - touch stamps/download-jaf-drop.stamp + touch $@ + +clean-download-jaf-drop: + rm -f drops/$(JAF_DROP_ZIP) + rm -f stamps/download-jaf-drop.stamp stamps/download-jaxws-drop.stamp: mkdir -p drops @@ -829,14 +858,25 @@ endif fi; \ fi ; mkdir -p stamps - touch stamps/download-jaxws-drop.stamp + touch $@ + +clean-download-jaxws-drop: + rm -f drops/$(JAXWS_DROP_ZIP) + rm -f stamps/download-jaxws-drop.stamp stamps/download-drops.stamp: stamps/download-jaxp-drop.stamp \ stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp mkdir -p stamps - touch stamps/download-drops.stamp - -stamps/download.stamp: stamps/hgforest.stamp stamps/download-drops.stamp + touch $@ + +clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \ + clean-download-jaxws-drop + if [ -e drops ] ; then \ + rmdir drops ; \ + fi + rm -f stamps/download-drops.stamp + +stamps/download-openjdk.stamp: stamps/hgforest.stamp if !OPENJDK_SRC_DIR_FOUND if USE_ALT_OPENJDK_SRC_ZIP else @@ -965,6 +1005,48 @@ endif endif endif endif + mkdir -p stamps + touch $@ + +clean-download-openjdk: +if !USE_ALT_OPENJDK_SRC_ZIP + if [ ! -z $(OPENJDK_SRC_ZIP) ] ; then \ + rm -f $(OPENJDK_SRC_ZIP) ; \ + fi +endif +if !USE_ALT_CORBA_SRC_ZIP + if [ ! -z $(CORBA_SRC_ZIP) ] ; then \ + rm -f $(CORBA_SRC_ZIP) ; \ + fi +endif +if !USE_ALT_JAXP_SRC_ZIP + if [ ! -z $(JAXP_SRC_ZIP) ] ; then \ + rm -f $(JAXP_SRC_ZIP) ; \ + fi +endif +if !USE_ALT_JAXWS_SRC_ZIP + if [ ! -z $(JAXWS_SRC_ZIP) ] ; then \ + rm -f $(JAXWS_SRC_ZIP) ; \ + fi +endif +if !USE_ALT_JDK_SRC_ZIP + if [ ! -z $(JDK_SRC_ZIP) ] ; then \ + rm -f $(JDK_SRC_ZIP) ; \ + fi +endif +if !USE_ALT_LANGTOOLS_SRC_ZIP + if [ ! -z $(LANGTOOLS_SRC_ZIP) ] ; then \ + rm -f $(LANGTOOLS_SRC_ZIP) ; \ + fi +endif +if !USE_ALT_HOTSPOT_SRC_ZIP + if [ ! -z $(HOTSPOT_SRC_ZIP) ] ; then \ + rm -f $(HOTSPOT_SRC_ZIP) ; \ + fi +endif + rm -f stamps/download-openjdk.stamp + +stamps/download-cacao.stamp: if BUILD_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP @@ -985,6 +1067,18 @@ endif endif endif endif + mkdir -p stamps + touch $@ + +clean-download-cacao: +if BUILD_CACAO +if !USE_ALT_CACAO_SRC_ZIP + rm -f $(CACAO_SRC_ZIP) +endif +endif + rm -f stamps/download-cacao.stamp + +stamps/download-visualvm.stamp: if WITH_VISUALVM if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ | $(MD5SUM) --check ; \ @@ -1017,62 +1111,25 @@ if WITH_VISUALVM fi endif mkdir -p stamps - touch stamps/download.stamp - -clean-download-jaxp-drop: - rm -f drops/$(JAXP_DROP_ZIP) - rm -f stamps/download-jaxp-drop.stamp - -clean-download-jaf-drop: - rm -f drops/$(JAF_DROP_ZIP) - rm -f stamps/download-jaf-drop.stamp - -clean-download-jaxws-drop: - rm -f drops/$(JAXWS_DROP_ZIP) - rm -f stamps/download-jaxws-drop.stamp - -clean-drops: clean-download-jaxp-drop clean-download-jaf-drop \ - clean-download-jaxws-drop - rm -f stamps/download-drops.stamp - -clean-download: clean-drops - rm -f $(OPENJDK_SRC_ZIP) -if BUILD_CACAO - rm -f $(CACAO_SRC_ZIP) -endif + touch $@ + +clean-download-visualvm: if WITH_VISUALVM rm -f $(VISUALVM_SRC_ZIP) rm -f $(NETBEANS_PROFILER_SRC_ZIP) endif -if WITH_VISUALVM - rm -f $(VISUALVM_SRC_ZIP) - rm -f $(NETBEANS_PROFILER_SRC_ZIP) -endif - rm -f stamps/download.stamp - -stamps/hgforest.stamp: -if OPENJDK_SRC_DIR_FOUND -else -if USE_ALT_OPENJDK_SRC_ZIP -else -if !USE_HG -else - if ! $(HG) fclone -h; \ - then \ - echo "No forest extension found. Please refer to" \ - "http://selenic.com/mercurial/wiki/index.cgi/ForestExtension"; \ - exit 1; \ - fi; -endif -endif -endif - mkdir -p stamps - touch stamps/hgforest.stamp - -clean-hgforest: - rm -f stamps/hgforest.stamp - -stamps/extract.stamp: stamps/download.stamp + rm -f stamps/download-visualvm.stamp + +stamps/extract.stamp: stamps/extract-openjdk.stamp \ + stamps/extract-visualvm.stamp stamps/extract-cacao.stamp + mkdir -p stamps + touch $@ + +clean-extract: clean-extract-openjdk clean-extract-visualvm \ + clean-extract-cacao + rm -f stamps/extract.stamp + +stamps/extract-openjdk.stamp: stamps/download-openjdk.stamp if OPENJDK_SRC_DIR_FOUND cp -a $(OPENJDK_SRC_DIR) openjdk else @@ -1175,13 +1232,14 @@ endif find openjdk -name '*.java' \ -exec sed -i 's/^[[:space:]]*@Override//' {} + ; \ mkdir -p stamps - touch stamps/extract.stamp - -clean-extract: - rm -f stamps/extract.stamp + touch $@ + +clean-extract-openjdk: clean-overlay clean-versioning \ + clean-ports clean-patch-fsg rm -rf openjdk - -stamps/extract-visualvm.stamp: + rm -f stamps/extract-openjdk.stamp + +stamps/extract-visualvm.stamp: stamps/download-visualvm.stamp if WITH_VISUALVM if ! test -d netbeans ; \ then \ @@ -1197,16 +1255,16 @@ endif mkdir -p stamps touch $@ -clean-extract-visualvm.stamp: +clean-extract-visualvm: if WITH_VISUALVM rm -rf netbeans visualvm endif rm -f stamps/extract-visualvm.stamp -stamps/extract-cacao.stamp: stamps/extract.stamp +stamps/extract-cacao.stamp: stamps/download-cacao.stamp if BUILD_CACAO if !USE_SYSTEM_CACAO - if ! test -d cacao ; \ + if ! test -d cacao/cacao ; \ then \ mkdir cacao ; \ $(TAR) xjf $(CACAO_SRC_ZIP) -C cacao ; \ @@ -1218,18 +1276,13 @@ endif endif endif mkdir -p stamps - touch stamps/extract-cacao.stamp - -clean-extract-cacao: -if BUILD_CACAO -if !USE_SYSTEM_CACAO - rm -rf cacao -endif -endif + touch $@ + +clean-extract-cacao: clean-cacao rm -f stamps/extract-cacao.stamp # Link ports sources into tree -stamps/ports.stamp: stamps/extract-cacao.stamp +stamps/ports.stamp: stamps/extract.stamp for target in $(abs_top_srcdir)/ports/hotspot/make/*/makefiles/* \ $(abs_top_srcdir)/ports/hotspot/src/cpu/zero/vm/* \ $(abs_top_srcdir)/ports/hotspot/src/share/vm/*; do \ @@ -1247,7 +1300,18 @@ stamps/ports.stamp: stamps/extract-cacao openjdk/jdk/src/solaris/bin/ergo_$(BUILD_ARCH_DIR).c; \ fi mkdir -p stamps |
| Free embeddable forum powered by Nabble | Forum Help |
