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 16:41:12 +02:00
commit 2f47ee7bbd
5 changed files with 101 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -9,3 +9,4 @@ cbc8ad9dd0e085a607427ea35411990982f19a36 jdk7-b25
64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32 64da805be725721bf2004e7409a0d7a16fc8ddbc jdk7-b32
bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33 bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33
46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34 46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34
143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35

113
README-builds.html
View File

@ -5,7 +5,7 @@
</head> </head>
<body style="background-color:lightcyan"> <body style="background-color:lightcyan">
<!-- ====================================================== --> <!-- ====================================================== -->
+ <table width="100%"> <table width="100%">
<tr> <tr>
<td align="center"> <td align="center">
<img alt="OpenJDK" <img alt="OpenJDK"
@ -39,6 +39,11 @@
<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></li>
<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>
</ul>
<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>
@ -182,14 +187,64 @@
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</a></h3> <h3><a name="fedora">Fedora 9</a></h3>
<blockquote> <blockquote>
TBD 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>
</blockquote>
<p>
Always a good idea to do a complete Software Update/Refresh
after you get all the packages installed.
</blockquote> </blockquote>
<!-- ------------------------------------------------------ --> <!-- ------------------------------------------------------ -->
<h3><a name="debian">Debian</a></h3> <h3><a name="centos">CentOS 5.2</a></h3>
<blockquote> <blockquote>
TBD After installing
<a href="http://www.centos.org/">CentOS 5.2</a>
you need to make sure you have
the following Development bundles installed:
<blockquote>
<ul>
<li>Development Libraries</li>
<li>Development Tools</li>
<li>Java Development</li>
<li>X Software Development</li>
</ul>
</blockquote>
<p>
Plus the following packages:
<blockquote>
<ul>
<li>cups devel: Cups Development Package</li>
<li>alsa devel: Alsa Development Package</li>
<li>ant: Ant Package</li>
<li>Xi devel: libXi.so Development Package</li>
</ul>
</blockquote>
<p>
The freetype 2.3 packages don't seem to be available,
but the freetype 2.3 sources can be downloaded, built,
and installed easily enough from
<a href="http://downloads.sourceforge.net/freetype">
the freetype site</a>.
Build and install with something like:
<blockquote>
<tt>./configure && make && sudo -u root make install</tt>
</blockquote>
<p>
Mercurial packages could not be found easily, but a Google
search should find ones, and they usually include Python if
it's needed.
</blockquote> </blockquote>
<!-- ------------------------------------------------------ --> <!-- ------------------------------------------------------ -->
<h3><a name="ubuntu">Ubuntu</a></h3> <h3><a name="ubuntu">Ubuntu</a></h3>
@ -664,8 +719,8 @@
</li> </li>
<li> <li>
Install the Install the
<a href="#msvc">Microsoft Visual Studio .NET 2003 Professional</a> or the <a href="#msvc">Microsoft Visual Studio .NET 2003 Professional</a> (32bit) or the
<a href="#mssdk">Microsoft Platform SDK</a>. <a href="#mssdk">Microsoft Platform SDK</a> (64bit).
</li> </li>
<li> <li>
Setup all environment variables for compilers Setup all environment variables for compilers
@ -871,6 +926,11 @@
The Microsoft Visual Studio .NET 2005 (VS2005) compiler The Microsoft Visual Studio .NET 2005 (VS2005) compiler
will not work at this time due to the new runtime dll will not work at this time due to the new runtime dll
and the manifest requirements. and the manifest requirements.
<p>
<b>WARNING:</b> Make sure you check out the
<a href="#cygwin">CYGWIN link.exe WARNING</a>.
The path <tt>/usr/bin</tt> must be after the path to the
Visual Studio product.
</blockquote> </blockquote>
<strong><a name="mssdk">Windows X64: Microsoft Platform SDK April 2005</a></strong> <strong><a name="mssdk">Windows X64: Microsoft Platform SDK April 2005</a></strong>
<blockquote> <blockquote>
@ -1079,6 +1139,7 @@
<thead> <thead>
<tr> <tr>
<td>Binary Name</td> <td>Binary Name</td>
<td>Category</td>
<td>Package</td> <td>Package</td>
<td>Description</td> <td>Description</td>
</tr> </tr>
@ -1087,50 +1148,59 @@
<tr> <tr>
<td>ar.exe</td> <td>ar.exe</td>
<td>Devel</td> <td>Devel</td>
<td>binutils: The GNU assembler, linker and binary <td>binutils</td>
<td>The GNU assembler, linker and binary
utilities</td> utilities</td>
</tr> </tr>
<tr> <tr>
<td>make.exe</td> <td>make.exe</td>
<td>Devel</td> <td>Devel</td>
<td>make: The GNU version of the 'make' utility<br> <td>make</td>
<td>The GNU version of the 'make' utility built for CYGWIN.<br>
<b>NOTE</b>: See <a href="#gmake">the GNU make section</a></td> <b>NOTE</b>: See <a href="#gmake">the GNU make section</a></td>
</tr> </tr>
<tr> <tr>
<td>m4.exe</td> <td>m4.exe</td>
<td>Interpreters</td> <td>Interpreters</td>
<td>m4: GNU implementation of the traditional Unix macro <td>m4</td>
<td>GNU implementation of the traditional Unix macro
processor</td> processor</td>
</tr> </tr>
<tr> <tr>
<td>cpio.exe</td> <td>cpio.exe</td>
<td>Utils</td> <td>Utils</td>
<td>cpio: A program to manage archives of files</td> <td>cpio</td>
<td>A program to manage archives of files</td>
</tr> </tr>
<tr> <tr>
<td>gawk.exe</td> <td>gawk.exe</td>
<td>Utils</td> <td>Utils</td>
<td>awk: Pattern-directed scanning and processing language</td> <td>awk</td>
<td>Pattern-directed scanning and processing language</td>
</tr> </tr>
<tr> <tr>
<td>file.exe</td> <td>file.exe</td>
<td>Utils</td> <td>Utils</td>
<td>file: Determines file type using 'magic' numbers</td> <td>file</td>
<td>Determines file type using 'magic' numbers</td>
</tr> </tr>
<tr> <tr>
<td>zip.exe</td> <td>zip.exe</td>
<td>Archive</td> <td>Archive</td>
<td>zip: Package and compress (archive) files</td> <td>zip</td>
<td>Package and compress (archive) files</td>
</tr> </tr>
<tr> <tr>
<td>unzip.exe</td> <td>unzip.exe</td>
<td>Archive</td> <td>Archive</td>
<td>unzip: Extract compressed files in a ZIP archive</td> <td>unzip</td>
<td>Extract compressed files in a ZIP archive</td>
</tr> </tr>
<tr> <tr>
<td>free.exe</td> <td>free.exe</td>
<td>Procps</td> <td>System</td>
<td>free: Display amount of free and used memory in the system</td> <td>procps</td>
<td>Display amount of free and used memory in the system</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -1144,6 +1214,13 @@
section on section on
<a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank"> <a href="http://cygwin.com/faq/faq.using.html#faq.using.bloda" target="_blank">
BLODA (applications that interfere with CYGWIN)</a>. BLODA (applications that interfere with CYGWIN)</a>.
<p>
<b>WARNING:</b>
Be very careful with <b><tt>link.exe</tt></b>, it will conflict
with the Visual Studio version. You need the Visual Studio
version of <tt>link.exe</tt>, not the CYGWIN one.
So it's important that the Visual Studio paths in PATH preceed
the CYGWIN path <tt>/usr/bin</tt>.
</blockquote> </blockquote>
<strong><a name="dxsdk">Microsoft DirectX 9.0 SDK header files and libraries</a></strong> <strong><a name="dxsdk">Microsoft DirectX 9.0 SDK header files and libraries</a></strong>
<blockquote> <blockquote>
@ -1429,7 +1506,7 @@
build output is to go. build output is to go.
The default output directory will be build/<i>platform</i>. The default output directory will be build/<i>platform</i>.
</dd> </dd>
<dt><a name="ALT_SLASHJAVA"><tt>ALT_SLASHJAVA</tt></a></dt> <dt><a name="ALT_SLASH_JAVA"><tt>ALT_SLASH_JAVA</tt></a></dt>
<dd> <dd>
The default root location for many of the ALT path locations The default root location for many of the ALT path locations
of the following ALT variables. of the following ALT variables.

5
make/Defs-internal.gmk
View File

@ -257,8 +257,3 @@ ifdef ANT_HOME
COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)" COMMON_BUILD_ARGUMENTS += ANT_HOME="$(ANT_HOME)"
endif endif
ifdef FINDBUGS_HOME
COMMON_BUILD_ARGUMENTS += FINDBUGS_HOME="$(FINDBUGS_HOME)"
endif

1
make/README.pre-components
View File

@ -20,7 +20,6 @@ The make/makefile rules are:
VARIANT If DBG, debug build, if OPT, optimized build VARIANT If DBG, debug build, if OPT, optimized build
TARGET_CLASS_VERSION The classfile version number (currently 5) TARGET_CLASS_VERSION The classfile version number (currently 5)
ANT_HOME Home of ant to use, if provided ANT_HOME Home of ant to use, if provided
FINDBUGS_HOME Home of findbugs to use, if provided
QUIET If defined, be quiet QUIET If defined, be quiet
VERBOSE If defined, be verbose VERBOSE If defined, be verbose
JDK_VERSION Version being built JDK_VERSION Version being built

14
make/jprt.config
View File

@ -1,7 +1,7 @@
#!echo "This is not a shell script" #!echo "This is not a shell script"
############################################################################# #############################################################################
# #
# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved. # Copyright 2006-2008 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
@ -100,20 +100,16 @@ share="${jdk_devtools}/share"
# Needed for langtools, maybe other parts of the build # Needed for langtools, maybe other parts of the build
ANT_HOME="${share}/ant/latest" ANT_HOME="${share}/ant/latest"
export ANT_HOME export ANT_HOME
FINDBUGS_HOME="${share}/findbugs/latest"
export FINDBUGS_HOME
# The 3 bin directories in common to all platforms # The 3 bin directories in common to all platforms
sharebin="${share}/bin" sharebin="${share}/bin"
antbin="${ANT_HOME}/bin" antbin="${ANT_HOME}/bin"
findbugsbin="${FINDBUGS_HOME}/bin"
# Check input # Check input
dirMustExist "${bootdir}" ALT_BOOTDIR dirMustExist "${bootdir}" ALT_BOOTDIR
dirMustExist "${slashjava}" ALT_SLASH_JAVA dirMustExist "${slashjava}" ALT_SLASH_JAVA
dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH
dirMustExist "${ANT_HOME}" ANT_HOME dirMustExist "${ANT_HOME}" ANT_HOME
dirMustExist "${FINDBUGS_HOME}" FINDBUGS_HOME
# If ALT_PREVIOUS_RELEASE_IMAGE not defined, set it to the bootdir area for # If ALT_PREVIOUS_RELEASE_IMAGE not defined, set it to the bootdir area for
# any possible image comparisons. # any possible image comparisons.
@ -152,7 +148,7 @@ if [ "${osname}" = SunOS ] ; then
ALT_COMPILER_PATH="${compiler_path}" ALT_COMPILER_PATH="${compiler_path}"
export ALT_COMPILER_PATH export ALT_COMPILER_PATH
dirMustExist "${compiler_path}" ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH
path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} path4sdk=${compiler_path}:${sharebin}:${antbin}
# Add basic solaris system paths # Add basic solaris system paths
path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
@ -189,7 +185,7 @@ elif [ "${osname}" = Linux ] ; then
ALT_COMPILER_PATH="${compiler_path}" ALT_COMPILER_PATH="${compiler_path}"
export ALT_COMPILER_PATH export ALT_COMPILER_PATH
dirMustExist "${compiler_path}" ALT_COMPILER_PATH dirMustExist "${compiler_path}" ALT_COMPILER_PATH
path4sdk=${compiler_path}:${sharebin}:${antbin}:${findbugsbin} path4sdk=${compiler_path}:${sharebin}:${antbin}
# Add basic paths # Add basic paths
path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
@ -237,7 +233,7 @@ else
dosname="${mkshome}/mksnt/dosname -s" dosname="${mkshome}/mksnt/dosname -s"
# Most unix utilities are in the mksnt directory of ROOTDIR # Most unix utilities are in the mksnt directory of ROOTDIR
unixcommand_path="${mkshome}/mksnt" unixcommand_path="${mkshome}/mksnt"
path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" path4sdk="${sharebin};${antbin};${unixcommand_path}"
dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
devtools_path="${jdk_devtools}/win32/bin" devtools_path="${jdk_devtools}/win32/bin"
path4sdk="${devtools_path};${path4sdk}" path4sdk="${devtools_path};${path4sdk}"
@ -255,7 +251,7 @@ else
dosname="/usr/bin/cygpath -a -m -s" dosname="/usr/bin/cygpath -a -m -s"
# Most unix utilities are in the /usr/bin # Most unix utilities are in the /usr/bin
unixcommand_path="/usr/bin" unixcommand_path="/usr/bin"
path4sdk="${sharebin};${antbin};${findbugsbin};${unixcommand_path}" path4sdk="${sharebin};${antbin};${unixcommand_path}"
dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH
# Find GNU make # Find GNU make
make="${unixcommand_path}/make.exe" make="${unixcommand_path}/make.exe"