Mercurial > hg > release > icedtea7-forest-2.2
changeset 143:a580d2beece9
Merge
author | andrew |
---|---|
date | Fri, 02 Oct 2009 23:32:43 +0100 |
parents | 717f2b969919 (current diff) 3ac6dcf78232 (diff) |
children | f8e6c40ffac8 |
files | make/hotspot-rules.gmk |
diffstat | 12 files changed, 264 insertions(+), 163 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Sep 28 23:50:11 2009 +0100 +++ b/.hgtags Fri Oct 02 23:32:43 2009 +0100 @@ -46,3 +46,4 @@ 82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69 175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70 4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71 +0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72
--- a/README-builds.html Mon Sep 28 23:50:11 2009 +0100 +++ b/README-builds.html Fri Oct 02 23:32:43 2009 +0100 @@ -38,12 +38,17 @@ <ul> <li><a href="#introduction">Introduction</a></li> <li><a href="#MBE">Minimum Build Environments</a></li> - <li><a href="#SDBE">Specific Developer Build Environments</a></li> + <li><a href="#SDBE">Specific Developer Build Environments</a> <ul> <li><a href="#fedora">Fedora Linux</a> </li> <li><a href="#centos">CentOS Linux</a> </li> - <li><a href="#ubuntu">Ubuntu Linux</a> </li> + <li><a href="#debian">Debian GNU/Linux</a></li> + <li><a href="#ubuntu">Ubuntu Linux</a> </li> + <li><a href="#opensuse">OpenSUSE</a></li> + <li><a href="#mandriva">Mandriva</a></li> + <li><a href="#opensolaris">OpenSolaris</a></li> </ul> + </li> <li><a href="#directories">Source Directory Structure</a> </li> <li><a href="#building">Build Information</a> <ul> @@ -209,24 +214,59 @@ we will try to provide what information we have available to us. </blockquote> <!-- ------------------------------------------------------ --> - <h3><a name="fedora">Fedora 9</a></h3> + <h3><a name="fedora">Fedora</a></h3> <blockquote> - After installing - <a href="http://www.fedoraproject.org/">Fedora 9</a> - you need to make sure you have - the "Software Development" bundle installed, plus the - following packages: - <blockquote> - <ul> - <li>cups devel: Cups Development Package</li> - <li>freetype 2.3+ devel: Freetype 2.3 Development Package</li> - <li>hg: Mercurial, if you need to clone or manage source repositories</li> - <li>ksh: May be needed when using <tt>webrev</tt></li> - </ul> + <h4>Fedora 9</h4> + <p> + <blockquote> + After installing <a href="http://fedoraproject.org">Fedora</a> 9 + you need to install several build dependencies. The simplest + way to do it is to execute the following commands as user + <tt>root</tt>: + <p/> + <code>yum-builddep java-openjdk</code> + <p/> + <code>yum install gcc gcc-c++</code> + <p/> + In addition, it's necessary to set a few environment variables for the build: + + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code> </blockquote> - <p> - Always a good idea to do a complete Software Update/Refresh - after you get all the packages installed. + <h4>Fedora 10</h4> + <p> + <blockquote> + After installing <a href="http://fedoraproject.org">Fedora</a> 10 + you need to install several build dependencies. The simplest + way to do it is to execute the following commands as user + <tt>root</tt>: + <p/> + <code>yum-builddep java-1.6.0-openjdk</code> + <p/> + <code>yum install gcc gcc-c++</code> + <p/> + In addition, it's necessary to set a few environment variables for the build: + + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code> + </blockquote> + <h4>Fedora 11</h4> + <p> + <blockquote> + After installing <a href="http://fedoraproject.org">Fedora</a> 11 + you need to install several build dependencies. The simplest + way to do it is to execute the following commands as user + <tt>root</tt>: + <p/> + <code>yum-builddep java-1.6.0-openjdk</code> + <p/> + <code>yum install gcc gcc-c++</code> + <p/> + In addition, it's necessary to set a few environment variables for the build: + + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-openjdk</code> + </blockquote> </blockquote> <!-- ------------------------------------------------------ --> <h3><a name="centos">CentOS 5.2</a></h3> @@ -269,145 +309,146 @@ it's needed. </blockquote> <!-- ------------------------------------------------------ --> - <h3><a name="ubuntu">Ubuntu</a></h3> + <h3><a name="debian">Debian</a></h3> + <blockquote> + <h4>Debian 5.0 (Lenny)</h4> + <p> + <blockquote> + After installing <a href="http://debian.org">Debian</a> 5 + you need to install several build dependencies. + The simplest way to install the build dependencies is to + execute the following commands as user <tt>root</tt>: + <p/> + <code>aptitude build-dep openjdk-6</code> + <p/> + <code>aptitude install openjdk-6-jdk libmotif-dev</code> + <p/> + In addition, it's necessary to set a few environment variables for the build: + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code> + </blockquote> + </blockquote> + <!-- ====================================================== --> + <h3><a name="ubuntu">Ubuntu</a></h3> <blockquote> - In addition to needing the Bootstrap JDK and the Binary Plugs, - when building on Ubuntu you will need to - make sure certain packages are installed. - In particular, certain X11 packages, make, m4, gawk, gcc 4, - binutils, cups, freetype - and alsa. - <!-- ------------------------------------------------------ --> - <h4>Ubuntu 6.06</h4> + <h4>Ubuntu 8.04</h4> <p> - The following list of packages for Ubuntu 6.06 is a working set that - does appear to work. + <blockquote> + After installing <a href="http://ubuntu.org">Ubuntu</a> 8.04 + you need to install several build dependencies. + <p/> + First, you need to enable the universe repository in the + Software Sources application and reload the repository + information. The Software Sources application is available + under the System/Administration menu. + <p/> + The simplest way to install the build dependencies is to + execute the following commands: + <p/> + <code>sudo aptitude build-dep openjdk-6</code> + <p/> + <code>sudo aptitude install openjdk-6-jdk</code> + <p/> + In addition, it's necessary to set a few environment variables for the build: + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code> + </blockquote> + <h4>Ubuntu 8.10</h4> <p> - <b>Note that it's quite possible that some of these - packages are not required, so anyone discovering that some of the - packages listed below are NOT required, - please let the - OpenJDK - team know.</b> + <blockquote> + After installing <a href="http://ubuntu.org">Ubuntu</a> 8.10 + you need to install several build dependencies. The simplest + way to do it is to execute the following commands: + <p/> + <code>sudo aptitude build-dep openjdk-6</code> + <p/> + <code>sudo aptitude install openjdk-6-jdk</code> + <p/> + In addition, it's necessary to set a few environment variables for the build: + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code> + </blockquote> + <h4>Ubuntu 9.04</h4> <p> - All the packages below can be installed with the - Synaptic Package manager provided with the base Ubuntu 6.06 release. - <blockquote> - <ul> - <li>binutils (2.16.1cvs20060117-1ubuntu2.1)</li> - <li>cpp (4:4.0.3-1)</li> - <li>cpp-4.0 (4.0.3-1ubuntu5)</li> - <li>libfreetype6-dev</li> - <li>g++ (4:4.0.3-1)</li> - <li>g++-4.0 (4.0.3-1ubuntu5)</li> - <li>gawk (1:3.1.5-2build1)</li> - <li>gcc (4:4.0.3-1)</li> - <li>gcc-4.0 (4.0.3-1ubuntu5)</li> - <li>libasound2-dev (1.0.10-2ubuntu4)</li> - <li>libc6 (2.3.6-0ubuntu20) to 2.3.6-0ubuntu20.4</li> - <li>libc6-dev (2.3.6-0ubuntu20.4)</li> - <li>libc6-i686 (2.3.6-0ubuntu20) to 2.3.6-0ubuntu20.4</li> - <li>libcupsys2-dev (1.2.2-0ubuntu0.6.06)</li> - <li>libgcrypt11-dev (1.2.2-1)</li> - <li>libgnutls-dev (1.2.9-2ubuntu1.1)</li> - <li>libgnutls12 (1.2.9-2ubuntu1) to 1.2.9-2ubuntu1.1</li> - <li>libgpg-error-dev (1.1-4)</li> - <li>libice-dev (2:1.0.0-0ubuntu2)</li> - <li>liblockfile1 (1.06.1)</li> - <li>libopencdk8-dev (0.5.7-2)</li> - <li>libpopt-dev (1.7-5)</li> - <li>libsm-dev (2:1.0.0-0ubuntu2)</li> - <li>libstdc++6-4.0-dev (4.0.3-1ubuntu5)</li> - <li>libtasn1-2-dev (0.2.17-1ubuntu1)</li> - <li>libx11-dev (2:1.0.0-0ubuntu9)</li> - <li>libxau-dev (1:1.0.0-0ubuntu4)</li> - <li>libxaw-headers (2:1.0.1-0ubuntu3)</li> - <li>libxaw7-dev (2:1.0.1-0ubuntu3)</li> - <li>libxdmcp-dev (1:1.0.0-0ubuntu2)</li> - <li>libxext-dev (2:1.0.0-0ubuntu4)</li> - <li>libxi-dev (2:1.0.0-0ubuntu3) </li> - <li>libxmu-dev (2:1.0.0-0ubuntu3)</li> - <li>libxmu-headers (2:1.0.0-0ubuntu3)</li> - <li>libxmuu-dev (2:1.0.0-0ubuntu3)</li> - <li>libxp-dev (6.8.2-11ubuntu2)</li> - <li>libxpm-dev (1:3.5.4.2-0ubuntu3)</li> - <li>libxrandr-dev (1:1.1.0.2-0ubuntu4)</li> - <li>libxt-dev (1:1.0.0-0ubuntu3)</li> - <li>libxtrap-dev (2:1.0.0-0ubuntu2)</li> - <li>libxtst-dev (2:1.0.1-0ubuntu2)</li> - <li>libxv-dev (2:1.0.1-0ubuntu3)</li> - <li>linux-kernel-headers (2.6.11.2-0ubuntu18)</li> - <li>m4 (1.4.4-1)</li> - <li>make (3.80+3.81.b4-1)</li> - <li>ssl-cert (1.0.13)</li> - <li>x-dev (7.0.4-0ubuntu2)</li> - <li>x11proto-core-dev (7.0.4-0ubuntu2)</li> - <li>x11proto-input-dev (1.3.2-0ubuntu2)</li> - <li>x11proto-kb-dev (1.0.2-0ubuntu2)</li> - <li>x11proto-randr-dev (1.1.2-0ubuntu2)</li> - <li>x11proto-record-dev (1.13.2-0ubuntu2)</li> - <li>x11proto-trap-dev (3.4.3-0ubuntu2)</li> - <li>x11proto-video-dev (2.2.2-0ubuntu2)</li> - <li>x11proto-xext-dev (7.0.2-0ubuntu2)</li> - <li>xlibs-dev (7.0.0-0ubuntu45)</li> - <li>zlib1g-dev (1:1.2.3-6ubuntu4)</li> - </ul> - </blockquote> - <!-- ------------------------------------------------------ --> - <h4>Ubuntu 7.04</h4> + <blockquote> + After installing <a href="http://ubuntu.org">Ubuntu</a> 9.04 + you need to install several build dependencies. The simplest + way to do it is to execute the following commands: + <p/> + <code>sudo aptitude build-dep openjdk-6</code> + <p/> + <code>sudo aptitude install openjdk-6-jdk</code> + <p/> + In addition, it's necessary to set a few environment variables for the build: + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code> + </blockquote> + </blockquote> + <!-- ====================================================== --> + <h3><a name="opensuse">OpenSUSE</a></h3> + <blockquote> + <h4>OpenSUSE 11.1</h4> <p> - Using the Synaptic Package Manager, download the following - packages (double indented packages are automatically aquired - due to package dependencies): - <blockquote> - <ul> - <li>build-essential</li> - <ul> - <li>dpkg-dev</li> - <li>g++</li> - <li>g++-4.1</li> - <li>libc6-dev</li> - <li>libstdc++6.4.1-dev</li> - <li>linux-libc-dev</li> - </ul> - <li>gawk</li> - <li>m4</li> - <li>libasound2-dev</li> - <li>libcupsys2-dev</li> - <ul> - <li>libgcrypt11-dev</li> - <li>lgnutls-dev</li> - <li>libgpg-error-dev</li> - <li>liblzo-dev</li> - <li>libopencdk8-dev</li> - <li>libpopt-dev</li> - <li>libtasn1-3-dev</li> - <li>zlib1g-dev</li> - </ul> - <li>sun-java6-jdk</li> - <ul> - <li>java-common</li> - <li>libltdl3</li> - <li>odbcinst1debian1</li> - <li>sun-java6-bin</li> - <li>sun-java6-jre</li> - <li>unixodbc</li> - </ul> - <li>xlibs-dev</li> - <ul> - <li>(many)</li> - </ul> - <li>x11proto-print-dev</li> - <li>libxaw7-dev</li> - <ul> - <li>libxaw-headers</li> - </ul> - <li>libxp-dev</li> - <li>libfreetype6-dev</li> - </ul> - </blockquote> + <blockquote> + After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1 + you need to install several build dependencies. + The simplest way to install the build dependencies is to + execute the following commands: + <p/> + <code>sudo zypper source-install -d java-1_6_0-openjdk</code> + <p/> + <code>sudo zypper install make</code> + <p/> + In addition, it is necessary to set a few environment variables for the build: + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code> + <p/> + Finally, you need to unset the <code>JAVA_HOME</code> environment variable: + <p/> + <code>export -n JAVA_HOME</code> + </blockquote> + </blockquote> + <!-- ====================================================== --> + <h3><a name="mandriva">Mandriva</a></h3> + <blockquote> + <h4>Mandriva Linux One 2009 Spring</h4> + <p> + <blockquote> + After installing <a href="http://mandriva.org">Mandriva</a> Linux One 2009 Spring + you need to install several build dependencies. + The simplest way to install the build dependencies is to + execute the following commands as user <tt>root</tt>: + <p/> + <code>urpmi java-1.6.0-openjdk-devel ant make gcc gcc-c++ freetype-devel zip unzip libcups2-devel libxrender1-devel libalsa2-devel libstc++-static-devel libxtst6-devel libxi-devel</code> + <p/> + In addition, it is necessary to set a few environment variables for the build: + <p/> + <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code> + </blockquote> </blockquote> - <!-- ------------------------------------------------------ --> + <!-- ====================================================== --> + <h3><a name="opensolaris">OpenSolaris</a></h3> + <blockquote> + <h4>OpenSolaris 2009.06</h4> + <p> + <blockquote> + After installing <a href="http://opensolaris.org">OpenSolaris</a> 2009.06 + you need to install several build dependencies. + The simplest way to install the build dependencies is to + execute the following commands: + <p/> + <code>pfexec pkg install SUNWgmake SUNWj6dev SUNWant sunstudioexpress SUNWcups SUNWzip SUNWunzip SUNWxwhl SUNWxorg-headers SUNWaudh SUNWfreetype2</code> + <p/> + In addition, it is necessary to set a few environment variables for the build: + <p/> + <code>export LANG=C ALT_COMPILER_PATH=/opt/SunStudioExpress/bin/ ALT_CUPS_HEADERS_PATH=/usr/include/</code> + <p/> + Finally, you need to make sure that the build process can find the Sun Studio compilers: + <p/> + <code>export PATH=$PATH:/opt/SunStudioExpress/bin/</code> + </blockquote> + </blockquote> + <!-- ------------------------------------------------------ --> <hr> <h2><a name="directories">Source Directory Structure</a></h2> <blockquote>
--- a/make/Defs-internal.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/Defs-internal.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -28,6 +28,23 @@ # not contain rules. # +# Indicate that we are visiting a separate repo or component +define MakeStart +$(PRINTF) "\n\n%s\n%s\n##### %-60.60s #####\n%s\n" \ +"########################################################################" \ +"########################################################################" \ +"Entering $1 for target $2" \ +"########################################################################" +endef + +define MakeFinish +$(PRINTF) "%s\n##### %-60.60s #####\n%s\n%s\n\n" \ +"########################################################################" \ +"Leaving $1 for target $2" \ +"########################################################################" \ +"########################################################################" +endef + ifdef OPENJDK ifneq ($(OPENJDK),true) x:=$(error "OPENJDK (if defined) can only be set to true")
--- a/make/corba-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/corba-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -40,13 +40,17 @@ corba: corba-build corba-build: $(MKDIR) -p $(CORBA_OUTPUTDIR) + @$(call MakeStart, corba, all) ($(CD) $(CORBA_TOPDIR)/make && \ $(MAKE) $(CORBA_BUILD_ARGUMENTS) all) + @$(call MakeFinish, corba, all) corba-clobber:: $(MKDIR) -p $(CORBA_OUTPUTDIR) + @$(call MakeStart, corba, clobber) ($(CD) $(CORBA_TOPDIR)/make && \ $(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber) + @$(call MakeFinish, corba, clobber) .PHONY: corba corba-build corba-clobber
--- a/make/deploy-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/deploy-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -121,14 +121,18 @@ deploy-build: ifeq ($(BUILD_DEPLOY), true) + @$(call MakeStart, deploy, $(DEPLOY_BUILD_TARGETS)) ($(CD) $(DEPLOY_TOPDIR)/make && \ - $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS)) + $(MAKE) $(DEPLOY_BUILD_TARGETS) $(DEPLOY_BUILD_ARGUMENTS)) + @$(call MakeFinish, deploy, $(DEPLOY_BUILD_TARGETS)) endif deploy-clobber:: ifeq ($(BUILD_DEPLOY), true) + @$(call MakeStart, deploy, clobber) ($(CD) $(DEPLOY_TOPDIR)/make && \ - $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS)) + $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS)) + @$(call MakeFinish, deploy, clobber) endif deploy-sanity::
--- a/make/hotspot-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/hotspot-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -92,8 +92,10 @@ hotspot-build:: $(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH) + @$(call MakeStart, hotspot, $(HOTSPOT_TARGET)) $(CD) $(HOTSPOT_TOPDIR)/make && \ $(MAKE) $(HOTSPOT_BUILD_ARGUMENTS) $(HOTSPOT_TARGET) + @$(call MakeFinish, hotspot, $(HOTSPOT_TARGET)) ##################### # .PHONY
--- a/make/install-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/install-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2002-2009 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -57,38 +57,48 @@ install-build: ifeq ($(BUILD_INSTALL), true) + @$(call MakeStart, install, $(INSTALL_BUILD_TARGETS)) ($(CD) $(INSTALL_TOPDIR)/make && \ $(MAKE) $(INSTALL_BUILD_TARGETS) $(INSTALL_BUILD_ARGUMENTS)) + @$(call MakeFinish, install, $(INSTALL_BUILD_TARGETS)) endif update-patcher: ifeq ($(BUILD_INSTALL), true) if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ + $(call MakeStart, install update, all); \ ( $(CD) $(INSTALL_TOPDIR)/make/update && \ $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ + $(call MakeFinish, install, all); \ fi endif update-patchgen: ifeq ($(BUILD_INSTALL), true) if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ + $(call MakeStart, install update, patchgen); \ ( $(CD) $(INSTALL_TOPDIR)/make/update && \ $(MAKE) patchgen $(INSTALL_BUILD_ARGUMENTS) ); \ + $(call MakeFinish, install, patchgen); \ fi endif installer: ifeq ($(BUILD_INSTALL), true) if [ -r $(INSTALL_TOPDIR)/make/installer/Makefile ]; then \ + $(call MakeStart, install installer, all); \ ( $(CD) $(INSTALL_TOPDIR)/make/installer && \ $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ + $(call MakeFinish, install, all); \ fi endif install-clobber: ifeq ($(BUILD_INSTALL), true) + @$(call MakeStart, install, clobber) ($(CD) $(INSTALL_TOPDIR)/make && \ $(MAKE) clobber $(INSTALL_BUILD_ARGUMENTS)) + @$(call MakeFinish, install, clobber) endif install-sanity::
--- a/make/jaxp-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/jaxp-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -40,13 +40,17 @@ jaxp: jaxp-build jaxp-build: $(MKDIR) -p $(JAXP_OUTPUTDIR) + @$(call MakeStart, jaxp, all) ($(CD) $(JAXP_TOPDIR)/make && \ $(MAKE) $(JAXP_BUILD_ARGUMENTS) all) + @$(call MakeFinish, jaxp, all) jaxp-clobber:: $(MKDIR) -p $(JAXP_OUTPUTDIR) + @$(call MakeStart, jaxp, clobber) ($(CD) $(JAXP_TOPDIR)/make && \ $(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber) + @$(call MakeFinish, jaxp, clobber) .PHONY: jaxp jaxp-build jaxp-clobber
--- a/make/jaxws-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/jaxws-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -40,13 +40,17 @@ jaxws: jaxws-build jaxws-build: $(MKDIR) -p $(JAXWS_OUTPUTDIR) + @$(call MakeStart, jaxws, all) ($(CD) $(JAXWS_TOPDIR)/make && \ $(MAKE) $(JAXWS_BUILD_ARGUMENTS) all) + @$(call MakeFinish, jaxws, all) jaxws-clobber:: $(MKDIR) -p $(JAXWS_OUTPUTDIR) + @$(call MakeStart, jaxws, clobber) ($(CD) $(JAXWS_TOPDIR)/make && \ $(MAKE) $(JAXWS_BUILD_ARGUMENTS) clobber) + @$(call MakeFinish, jaxws, clobber) .PHONY: jaxws jaxws-build jaxws-clobber
--- a/make/jdk-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/jdk-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -98,12 +98,16 @@ jdk: jdk-build jdk-build: + @$(call MakeStart, jdk, $(JDK_BUILD_TARGETS)) ( $(CD) $(JDK_TOPDIR)/make && \ $(MAKE) $(JDK_BUILD_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) + @$(call MakeFinish, jdk, $(JDK_BUILD_TARGETS)) jdk-clobber:: + @$(call MakeStart, jdk, $(JDK_CLOBBER_TARGETS)) ( $(CD) $(JDK_TOPDIR)/make && \ $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) + @$(call MakeFinish, jdk, $(JDK_CLOBBER_TARGETS)) jdk-sanity:: ( $(CD) $(JDK_TOPDIR)/make && \ @@ -111,13 +115,17 @@ compare-images: compare-image compare-image: + @$(call MakeStart, jdk, compare-image) ( $(CD) $(JDK_TOPDIR)/make && \ $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image ) + @$(call MakeFinish, jdk, compare-image) compare-images-clobber: compare-image-clobber compare-image-clobber: + @$(call MakeStart, jdk, compare-image-clobber) ( $(CD) $(JDK_TOPDIR)/make && \ $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image-clobber ) + @$(call MakeFinish, jdk, compare-image-clobber) .PHONY: jdk jdk-build jdk-clobber jdk-sanity
--- a/make/langtools-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/langtools-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2001-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2001-2009 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -35,13 +35,17 @@ langtools: langtools-build langtools-build: $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) + @$(call MakeStart, langtools, all) ($(CD) $(LANGTOOLS_TOPDIR)/make && \ - $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all) + $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all) + @$(call MakeFinish, langtools, all) langtools-clobber:: $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) + @$(call MakeStart, langtools, clobber) ($(CD) $(LANGTOOLS_TOPDIR)/make && \ - $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber) + $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber) + @$(call MakeFinish, langtools, clobber) .PHONY: langtools langtools-build langtools-clobber
--- a/make/sponsors-rules.gmk Mon Sep 28 23:50:11 2009 +0100 +++ b/make/sponsors-rules.gmk Fri Oct 02 23:32:43 2009 +0100 @@ -1,5 +1,5 @@ # -# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. +# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -59,8 +59,10 @@ sponsors-build: ifeq ($(ARCH_DATA_MODEL), 32) ifeq ($(BUILD_SPONSORS), true) + @$(call MakeStart, sponsors, $(SPONSORS_BUILD_TARGETS)) ($(CD) $(SPONSORS_TOPDIR)/make && \ - $(MAKE) $(SPONSORS_BUILD_TARGETS) $(SPONSORS_BUILD_ARGUMENTS)) + $(MAKE) $(SPONSORS_BUILD_TARGETS) $(SPONSORS_BUILD_ARGUMENTS)) + @$(call MakeFinish, sponsors, $(SPONSORS_BUILD_TARGETS)) endif endif