1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 17:00:49 +02:00
commit 44cf49d7be
12 changed files with 267 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -46,3 +46,4 @@ e1b972ff53cd58f825791f8ed9b2deffd16e768c jdk7-b68
82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69 82e6c820c51ac27882b77755d42efefdbf1dcda0 jdk7-b69
175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70 175cb3fe615998d1004c6d3fd96e6d2e86b6772d jdk7-b70
4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71 4c36e9853dda27bdac5ef4839a610509fbe31d34 jdk7-b71
0d7e03b426df27c21dcc44ffb9178eacd1b04f10 jdk7-b72

341
README-builds.html
View File

@ -38,12 +38,17 @@
<ul> <ul>
<li><a href="#introduction">Introduction</a></li> <li><a href="#introduction">Introduction</a></li>
<li><a href="#MBE">Minimum Build Environments</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> <ul>
<li><a href="#fedora">Fedora Linux</a> </li> <li><a href="#fedora">Fedora Linux</a> </li>
<li><a href="#centos">CentOS 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> </ul>
</li>
<li><a href="#directories">Source Directory Structure</a> </li> <li><a href="#directories">Source Directory Structure</a> </li>
<li><a href="#building">Build Information</a> <li><a href="#building">Build Information</a>
<ul> <ul>
@ -209,24 +214,59 @@
we will try to provide what information we have available to us. we will try to provide what information we have available to us.
</blockquote> </blockquote>
<!-- ------------------------------------------------------ --> <!-- ------------------------------------------------------ -->
<h3><a name="fedora">Fedora 9</a></h3> <h3><a name="fedora">Fedora</a></h3>
<blockquote> <blockquote>
After installing <h4>Fedora 9</h4>
<a href="http://www.fedoraproject.org/">Fedora 9</a> <p>
you need to make sure you have <blockquote>
the "Software Development" bundle installed, plus the After installing <a href="http://fedoraproject.org">Fedora</a> 9
following packages: you need to install several build dependencies. The simplest
<blockquote> way to do it is to execute the following commands as user
<ul> <tt>root</tt>:
<li>cups devel: Cups Development Package</li> <p/>
<li>freetype 2.3+ devel: Freetype 2.3 Development Package</li> <code>yum-builddep java-openjdk</code>
<li>hg: Mercurial, if you need to clone or manage source repositories</li> <p/>
<li>ksh: May be needed when using <tt>webrev</tt></li> <code>yum install gcc gcc-c++</code>
</ul> <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>
<p> <h4>Fedora 10</h4>
Always a good idea to do a complete Software Update/Refresh <p>
after you get all the packages installed. <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> </blockquote>
<!-- ------------------------------------------------------ --> <!-- ------------------------------------------------------ -->
<h3><a name="centos">CentOS 5.2</a></h3> <h3><a name="centos">CentOS 5.2</a></h3>
@ -269,143 +309,144 @@
it's needed. it's needed.
</blockquote> </blockquote>
<!-- ------------------------------------------------------ --> <!-- ------------------------------------------------------ -->
<h3><a name="ubuntu">Ubuntu</a></h3> <h3><a name="debian">Debian</a></h3>
<blockquote> <blockquote>
In addition to needing the Bootstrap JDK and the Binary Plugs, <h4>Debian 5.0 (Lenny)</h4>
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>
<p> <p>
The following list of packages for Ubuntu 6.06 is a working set that <blockquote>
does appear to work. 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>
<h4>Ubuntu 8.04</h4>
<p> <p>
<b>Note that it's quite possible that some of these <blockquote>
packages are not required, so anyone discovering that some of the After installing <a href="http://ubuntu.org">Ubuntu</a> 8.04
packages listed below are NOT required, you need to install several build dependencies.
please let the <p/>
OpenJDK First, you need to enable the universe repository in the
team know.</b> 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> <p>
All the packages below can be installed with the <blockquote>
Synaptic Package manager provided with the base Ubuntu 6.06 release. After installing <a href="http://ubuntu.org">Ubuntu</a> 8.10
<blockquote> you need to install several build dependencies. The simplest
<ul> way to do it is to execute the following commands:
<li>binutils (2.16.1cvs20060117-1ubuntu2.1)</li> <p/>
<li>cpp (4:4.0.3-1)</li> <code>sudo aptitude build-dep openjdk-6</code>
<li>cpp-4.0 (4.0.3-1ubuntu5)</li> <p/>
<li>libfreetype6-dev</li> <code>sudo aptitude install openjdk-6-jdk</code>
<li>g++ (4:4.0.3-1)</li> <p/>
<li>g++-4.0 (4.0.3-1ubuntu5)</li> In addition, it's necessary to set a few environment variables for the build:
<li>gawk (1:3.1.5-2build1)</li> <p/>
<li>gcc (4:4.0.3-1)</li> <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
<li>gcc-4.0 (4.0.3-1ubuntu5)</li> </blockquote>
<li>libasound2-dev (1.0.10-2ubuntu4)</li> <h4>Ubuntu 9.04</h4>
<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>
<p> <p>
Using the Synaptic Package Manager, download the following <blockquote>
packages (double indented packages are automatically aquired After installing <a href="http://ubuntu.org">Ubuntu</a> 9.04
due to package dependencies): you need to install several build dependencies. The simplest
<blockquote> way to do it is to execute the following commands:
<ul> <p/>
<li>build-essential</li> <code>sudo aptitude build-dep openjdk-6</code>
<ul> <p/>
<li>dpkg-dev</li> <code>sudo aptitude install openjdk-6-jdk</code>
<li>g++</li> <p/>
<li>g++-4.1</li> In addition, it's necessary to set a few environment variables for the build:
<li>libc6-dev</li> <p/>
<li>libstdc++6.4.1-dev</li> <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-6-openjdk</code>
<li>linux-libc-dev</li> </blockquote>
</ul> </blockquote>
<li>gawk</li> <!-- ====================================================== -->
<li>m4</li> <h3><a name="opensuse">OpenSUSE</a></h3>
<li>libasound2-dev</li> <blockquote>
<li>libcupsys2-dev</li> <h4>OpenSUSE 11.1</h4>
<ul> <p>
<li>libgcrypt11-dev</li> <blockquote>
<li>lgnutls-dev</li> After installing <a href="http://opensuse.org">OpenSUSE</a> 11.1
<li>libgpg-error-dev</li> you need to install several build dependencies.
<li>liblzo-dev</li> The simplest way to install the build dependencies is to
<li>libopencdk8-dev</li> execute the following commands:
<li>libpopt-dev</li> <p/>
<li>libtasn1-3-dev</li> <code>sudo zypper source-install -d java-1_6_0-openjdk</code>
<li>zlib1g-dev</li> <p/>
</ul> <code>sudo zypper install make</code>
<li>sun-java6-jdk</li> <p/>
<ul> In addition, it is necessary to set a few environment variables for the build:
<li>java-common</li> <p/>
<li>libltdl3</li> <code>export LANG=C ALT_BOOTDIR=/usr/lib/jvm/java-1.6.0-openjdk</code>
<li>odbcinst1debian1</li> <p/>
<li>sun-java6-bin</li> Finally, you need to unset the <code>JAVA_HOME</code> environment variable:
<li>sun-java6-jre</li> <p/>
<li>unixodbc</li> <code>export -n JAVA_HOME</code>
</ul> </blockquote>
<li>xlibs-dev</li> </blockquote>
<ul> <!-- ====================================================== -->
<li>(many)</li> <h3><a name="mandriva">Mandriva</a></h3>
</ul> <blockquote>
<li>x11proto-print-dev</li> <h4>Mandriva Linux One 2009 Spring</h4>
<li>libxaw7-dev</li> <p>
<ul> <blockquote>
<li>libxaw-headers</li> After installing <a href="http://mandriva.org">Mandriva</a> Linux One 2009 Spring
</ul> you need to install several build dependencies.
<li>libxp-dev</li> The simplest way to install the build dependencies is to
<li>libfreetype6-dev</li> execute the following commands as user <tt>root</tt>:
</ul> <p/>
</blockquote> <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> </blockquote>
<!-- ------------------------------------------------------ --> <!-- ------------------------------------------------------ -->
<hr> <hr>

17
make/Defs-internal.gmk
View File

@ -28,6 +28,23 @@
# not contain rules. # 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 ifdef OPENJDK
ifneq ($(OPENJDK),true) ifneq ($(OPENJDK),true)
x:=$(error "OPENJDK (if defined) can only be set to true") x:=$(error "OPENJDK (if defined) can only be set to true")

6
make/corba-rules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -40,13 +40,17 @@ endif
corba: corba-build corba: corba-build
corba-build: corba-build:
$(MKDIR) -p $(CORBA_OUTPUTDIR) $(MKDIR) -p $(CORBA_OUTPUTDIR)
@$(call MakeStart, corba, all)
($(CD) $(CORBA_TOPDIR)/make && \ ($(CD) $(CORBA_TOPDIR)/make && \
$(MAKE) $(CORBA_BUILD_ARGUMENTS) all) $(MAKE) $(CORBA_BUILD_ARGUMENTS) all)
@$(call MakeFinish, corba, all)
corba-clobber:: corba-clobber::
$(MKDIR) -p $(CORBA_OUTPUTDIR) $(MKDIR) -p $(CORBA_OUTPUTDIR)
@$(call MakeStart, corba, clobber)
($(CD) $(CORBA_TOPDIR)/make && \ ($(CD) $(CORBA_TOPDIR)/make && \
$(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber) $(MAKE) $(CORBA_BUILD_ARGUMENTS) clobber)
@$(call MakeFinish, corba, clobber)
.PHONY: corba corba-build corba-clobber .PHONY: corba corba-build corba-clobber

8
make/deploy-rules.gmk
View File

@ -121,14 +121,18 @@ endif
deploy-build: deploy-build:
ifeq ($(BUILD_DEPLOY), true) ifeq ($(BUILD_DEPLOY), true)
@$(call MakeStart, deploy, $(DEPLOY_BUILD_TARGETS))
($(CD) $(DEPLOY_TOPDIR)/make && \ ($(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 endif
deploy-clobber:: deploy-clobber::
ifeq ($(BUILD_DEPLOY), true) ifeq ($(BUILD_DEPLOY), true)
@$(call MakeStart, deploy, clobber)
($(CD) $(DEPLOY_TOPDIR)/make && \ ($(CD) $(DEPLOY_TOPDIR)/make && \
$(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS)) $(MAKE) clobber $(DEPLOY_BUILD_ARGUMENTS))
@$(call MakeFinish, deploy, clobber)
endif endif
deploy-sanity:: deploy-sanity::

4
make/hotspot-rules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -88,8 +88,10 @@ endif
hotspot-build:: hotspot-build::
$(MKDIR) -p $(HOTSPOT_OUTPUTDIR) $(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
$(MKDIR) -p $(HOTSPOT_EXPORT_PATH) $(MKDIR) -p $(HOTSPOT_EXPORT_PATH)
@$(call MakeStart, hotspot, $(HOTSPOT_TARGET))
$(CD) $(HOTSPOT_TOPDIR)/make && \ $(CD) $(HOTSPOT_TOPDIR)/make && \
$(MAKE) $(HOTSPOT_BUILD_ARGUMENTS) $(HOTSPOT_TARGET) $(MAKE) $(HOTSPOT_BUILD_ARGUMENTS) $(HOTSPOT_TARGET)
@$(call MakeFinish, hotspot, $(HOTSPOT_TARGET))
##################### #####################
# .PHONY # .PHONY

12
make/install-rules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -57,38 +57,48 @@ install: install-build
install-build: install-build:
ifeq ($(BUILD_INSTALL), true) ifeq ($(BUILD_INSTALL), true)
@$(call MakeStart, install, $(INSTALL_BUILD_TARGETS))
($(CD) $(INSTALL_TOPDIR)/make && \ ($(CD) $(INSTALL_TOPDIR)/make && \
$(MAKE) $(INSTALL_BUILD_TARGETS) $(INSTALL_BUILD_ARGUMENTS)) $(MAKE) $(INSTALL_BUILD_TARGETS) $(INSTALL_BUILD_ARGUMENTS))
@$(call MakeFinish, install, $(INSTALL_BUILD_TARGETS))
endif endif
update-patcher: update-patcher:
ifeq ($(BUILD_INSTALL), true) ifeq ($(BUILD_INSTALL), true)
if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \
$(call MakeStart, install update, all); \
( $(CD) $(INSTALL_TOPDIR)/make/update && \ ( $(CD) $(INSTALL_TOPDIR)/make/update && \
$(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \
$(call MakeFinish, install, all); \
fi fi
endif endif
update-patchgen: update-patchgen:
ifeq ($(BUILD_INSTALL), true) ifeq ($(BUILD_INSTALL), true)
if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \ if [ -r $(INSTALL_TOPDIR)/make/update/Makefile ]; then \
$(call MakeStart, install update, patchgen); \
( $(CD) $(INSTALL_TOPDIR)/make/update && \ ( $(CD) $(INSTALL_TOPDIR)/make/update && \
$(MAKE) patchgen $(INSTALL_BUILD_ARGUMENTS) ); \ $(MAKE) patchgen $(INSTALL_BUILD_ARGUMENTS) ); \
$(call MakeFinish, install, patchgen); \
fi fi
endif endif
installer: installer:
ifeq ($(BUILD_INSTALL), true) ifeq ($(BUILD_INSTALL), true)
if [ -r $(INSTALL_TOPDIR)/make/installer/Makefile ]; then \ if [ -r $(INSTALL_TOPDIR)/make/installer/Makefile ]; then \
$(call MakeStart, install installer, all); \
( $(CD) $(INSTALL_TOPDIR)/make/installer && \ ( $(CD) $(INSTALL_TOPDIR)/make/installer && \
$(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \ $(MAKE) all $(INSTALL_BUILD_ARGUMENTS) ); \
$(call MakeFinish, install, all); \
fi fi
endif endif
install-clobber: install-clobber:
ifeq ($(BUILD_INSTALL), true) ifeq ($(BUILD_INSTALL), true)
@$(call MakeStart, install, clobber)
($(CD) $(INSTALL_TOPDIR)/make && \ ($(CD) $(INSTALL_TOPDIR)/make && \
$(MAKE) clobber $(INSTALL_BUILD_ARGUMENTS)) $(MAKE) clobber $(INSTALL_BUILD_ARGUMENTS))
@$(call MakeFinish, install, clobber)
endif endif
install-sanity:: install-sanity::

6
make/jaxp-rules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -40,13 +40,17 @@ endif
jaxp: jaxp-build jaxp: jaxp-build
jaxp-build: jaxp-build:
$(MKDIR) -p $(JAXP_OUTPUTDIR) $(MKDIR) -p $(JAXP_OUTPUTDIR)
@$(call MakeStart, jaxp, all)
($(CD) $(JAXP_TOPDIR)/make && \ ($(CD) $(JAXP_TOPDIR)/make && \
$(MAKE) $(JAXP_BUILD_ARGUMENTS) all) $(MAKE) $(JAXP_BUILD_ARGUMENTS) all)
@$(call MakeFinish, jaxp, all)
jaxp-clobber:: jaxp-clobber::
$(MKDIR) -p $(JAXP_OUTPUTDIR) $(MKDIR) -p $(JAXP_OUTPUTDIR)
@$(call MakeStart, jaxp, clobber)
($(CD) $(JAXP_TOPDIR)/make && \ ($(CD) $(JAXP_TOPDIR)/make && \
$(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber) $(MAKE) $(JAXP_BUILD_ARGUMENTS) clobber)
@$(call MakeFinish, jaxp, clobber)
.PHONY: jaxp jaxp-build jaxp-clobber .PHONY: jaxp jaxp-build jaxp-clobber

6
make/jaxws-rules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -40,13 +40,17 @@ endif
jaxws: jaxws-build jaxws: jaxws-build
jaxws-build: jaxws-build:
$(MKDIR) -p $(JAXWS_OUTPUTDIR) $(MKDIR) -p $(JAXWS_OUTPUTDIR)
@$(call MakeStart, jaxws, all)
($(CD) $(JAXWS_TOPDIR)/make && \ ($(CD) $(JAXWS_TOPDIR)/make && \
$(MAKE) $(JAXWS_BUILD_ARGUMENTS) all) $(MAKE) $(JAXWS_BUILD_ARGUMENTS) all)
@$(call MakeFinish, jaxws, all)
jaxws-clobber:: jaxws-clobber::
$(MKDIR) -p $(JAXWS_OUTPUTDIR) $(MKDIR) -p $(JAXWS_OUTPUTDIR)
@$(call MakeStart, jaxws, clobber)
($(CD) $(JAXWS_TOPDIR)/make && \ ($(CD) $(JAXWS_TOPDIR)/make && \
$(MAKE) $(JAXWS_BUILD_ARGUMENTS) clobber) $(MAKE) $(JAXWS_BUILD_ARGUMENTS) clobber)
@$(call MakeFinish, jaxws, clobber)
.PHONY: jaxws jaxws-build jaxws-clobber .PHONY: jaxws jaxws-build jaxws-clobber

8
make/jdk-rules.gmk
View File

@ -98,12 +98,16 @@ $(JDK_JAVA_EXE):: jdk-build
jdk: jdk-build jdk: jdk-build
jdk-build: jdk-build:
@$(call MakeStart, jdk, $(JDK_BUILD_TARGETS))
( $(CD) $(JDK_TOPDIR)/make && \ ( $(CD) $(JDK_TOPDIR)/make && \
$(MAKE) $(JDK_BUILD_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) $(MAKE) $(JDK_BUILD_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
@$(call MakeFinish, jdk, $(JDK_BUILD_TARGETS))
jdk-clobber:: jdk-clobber::
@$(call MakeStart, jdk, $(JDK_CLOBBER_TARGETS))
( $(CD) $(JDK_TOPDIR)/make && \ ( $(CD) $(JDK_TOPDIR)/make && \
$(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; ) $(MAKE) $(JDK_CLOBBER_TARGETS) $(JDK_BUILD_ARGUMENTS) ; )
@$(call MakeFinish, jdk, $(JDK_CLOBBER_TARGETS))
jdk-sanity:: jdk-sanity::
( $(CD) $(JDK_TOPDIR)/make && \ ( $(CD) $(JDK_TOPDIR)/make && \
@ -111,13 +115,17 @@ jdk-sanity::
compare-images: compare-image compare-images: compare-image
compare-image: compare-image:
@$(call MakeStart, jdk, compare-image)
( $(CD) $(JDK_TOPDIR)/make && \ ( $(CD) $(JDK_TOPDIR)/make && \
$(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image ) $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image )
@$(call MakeFinish, jdk, compare-image)
compare-images-clobber: compare-image-clobber compare-images-clobber: compare-image-clobber
compare-image-clobber: compare-image-clobber:
@$(call MakeStart, jdk, compare-image-clobber)
( $(CD) $(JDK_TOPDIR)/make && \ ( $(CD) $(JDK_TOPDIR)/make && \
$(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image-clobber ) $(MAKE) ALT_OUTPUTDIR=$(ABS_OUTPUTDIR) compare-image-clobber )
@$(call MakeFinish, jdk, compare-image-clobber)
.PHONY: jdk jdk-build jdk-clobber jdk-sanity .PHONY: jdk jdk-build jdk-clobber jdk-sanity

10
make/langtools-rules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -35,13 +35,17 @@ LANGTOOLS_BUILD_ARGUMENTS = \
langtools: langtools-build langtools: langtools-build
langtools-build: langtools-build:
$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)
@$(call MakeStart, langtools, all)
($(CD) $(LANGTOOLS_TOPDIR)/make && \ ($(CD) $(LANGTOOLS_TOPDIR)/make && \
$(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all) $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) all)
@$(call MakeFinish, langtools, all)
langtools-clobber:: langtools-clobber::
$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR) $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)
@$(call MakeStart, langtools, clobber)
($(CD) $(LANGTOOLS_TOPDIR)/make && \ ($(CD) $(LANGTOOLS_TOPDIR)/make && \
$(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber) $(MAKE) $(LANGTOOLS_BUILD_ARGUMENTS) clobber)
@$(call MakeFinish, langtools, clobber)
.PHONY: langtools langtools-build langtools-clobber .PHONY: langtools langtools-build langtools-clobber

6
make/sponsors-rules.gmk
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -59,8 +59,10 @@ endif
sponsors-build: sponsors-build:
ifeq ($(ARCH_DATA_MODEL), 32) ifeq ($(ARCH_DATA_MODEL), 32)
ifeq ($(BUILD_SPONSORS), true) ifeq ($(BUILD_SPONSORS), true)
@$(call MakeStart, sponsors, $(SPONSORS_BUILD_TARGETS))
($(CD) $(SPONSORS_TOPDIR)/make && \ ($(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
endif endif