Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Thu, 07 May 2009 10:30:10 -0700
- author
- xdono
- date
- Thu, 07 May 2009 10:30:10 -0700
- changeset 81
- f5ab6d6ae4b1
- parent 80
- a942ea653d97
- parent 77
- 59b497130f82
- child 83
- b284e021293c
Merge
| make/jprt.config | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Fri Apr 17 15:37:20 2009 +0100 1.2 +++ b/.hgtags Thu May 07 10:30:10 2009 -0700 1.3 @@ -30,3 +30,5 @@ 1.4 c235f4a8559d196879c56af80159f67ee5d0e720 jdk7-b53 1.5 2ef382b1bbd58a68e668391c6145a4b2066c5b96 jdk7-b54 1.6 aea0ace7a1e43619800931d42bbf69c579361c2d jdk7-b55 1.7 +ba12117a5e6c918578d6b2a8c693232a33289024 jdk7-b56 1.8 +ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
2.1 --- a/README-builds.html Fri Apr 17 15:37:20 2009 +0100 2.2 +++ b/README-builds.html Thu May 07 10:30:10 2009 -0700 2.3 @@ -68,6 +68,7 @@ 2.4 </li> 2.5 <li><a href="#zip">Zip and Unzip</a> </li> 2.6 <li><a href="#freetype">FreeType2 Fonts</a> </li> 2.7 + <li><a href="#jibx">JIBX Libraries</a> </li> 2.8 <li>Linux and Solaris: 2.9 <ul> 2.10 <li><a href="#cups">CUPS Include files</a> </li> 2.11 @@ -586,6 +587,11 @@ 2.12 package</a>. 2.13 </li> 2.14 <li> 2.15 + Install the 2.16 + <a href="#jibx">JIBX Libraries</a>, set 2.17 + <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>. 2.18 + </li> 2.19 + <li> 2.20 Install 2.21 <a href="#ant">Ant</a>, 2.22 make sure it is in your PATH. 2.23 @@ -651,6 +657,11 @@ 2.24 <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>. 2.25 </li> 2.26 <li> 2.27 + Install the 2.28 + <a href="#jibx">JIBX Libraries</a>, set 2.29 + <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>. 2.30 + </li> 2.31 + <li> 2.32 Install 2.33 <a href="#ant">Ant</a>, 2.34 make sure it is in your PATH. 2.35 @@ -746,6 +757,11 @@ 2.36 <a href="#dxsdk">Microsoft DirectX SDK</a>. 2.37 </li> 2.38 <li> 2.39 + Install the 2.40 + <a href="#jibx">JIBX Libraries</a>, set 2.41 + <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>. 2.42 + </li> 2.43 + <li> 2.44 Install 2.45 <a href="#ant">Ant</a>, 2.46 make sure it is in your PATH and set 2.47 @@ -874,6 +890,27 @@ 2.48 fine for most JDK developers. 2.49 </blockquote> 2.50 <!-- ------------------------------------------------------ --> 2.51 + <h4><a name="jibx">JIBX</a></h4> 2.52 + <blockquote> 2.53 + JIBX libraries version 1.1.5 is required for building the OpenJDK. 2.54 + Namely, the following JAR files from the JIBX distribution package 2.55 + are required: 2.56 + <ul> 2.57 + <li>bcel.jar 2.58 + <li>jibx-bind.jar 2.59 + <li>jibx-run.jar 2.60 + <li>xpp3.jar 2.61 + </ul> 2.62 + <p> 2.63 + You can download the package from the 2.64 + <a href="http://jibx.sourceforge.net" target="_blank">JIBX site</a>. 2.65 + <p> 2.66 + You will need to set the 2.67 + <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt> 2.68 + environment variable to refer to place where the JAR files, 2.69 + above, are located. 2.70 + </blockquote> 2.71 + <!-- ------------------------------------------------------ --> 2.72 <h4><a name="compilers">Compilers</a></h4> 2.73 <blockquote> 2.74 <strong><a name="gcc">Linux gcc/binutils</a></strong> 2.75 @@ -1425,6 +1462,12 @@ 2.76 The default will refer to 2.77 <tt>jdk/src/share/lib/security/cacerts</tt>. 2.78 </dd> 2.79 + <dt><tt><a name="ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt></dt> 2.80 + <dd> 2.81 + The location of the <a href="#jibx">JIBX libraries</a> file. 2.82 + The default value is 2.83 + <tt>$(ALT_SLASH_JAVA)/devtools/share/jibx/lib</tt>. 2.84 + </dd> 2.85 <dt><a name="ALT_CUPS_HEADERS_PATH"><tt>ALT_CUPS_HEADERS_PATH</tt></a> </dt> 2.86 <dd> 2.87 The location of the CUPS header files.
3.1 --- a/make/jprt.config Fri Apr 17 15:37:20 2009 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,379 +0,0 @@ 3.4 -#!echo "This is not a shell script" 3.5 -############################################################################# 3.6 -# 3.7 -# Copyright 2006-2009 Sun Microsystems, Inc. All Rights Reserved. 3.8 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.9 -# 3.10 -# This code is free software; you can redistribute it and/or modify it 3.11 -# under the terms of the GNU General Public License version 2 only, as 3.12 -# published by the Free Software Foundation. Sun designates this 3.13 -# particular file as subject to the "Classpath" exception as provided 3.14 -# by Sun in the LICENSE file that accompanied this code. 3.15 -# 3.16 -# This code is distributed in the hope that it will be useful, but WITHOUT 3.17 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.18 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.19 -# version 2 for more details (a copy is included in the LICENSE file that 3.20 -# accompanied this code). 3.21 -# 3.22 -# You should have received a copy of the GNU General Public License version 3.23 -# 2 along with this work; if not, write to the Free Software Foundation, 3.24 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.25 -# 3.26 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 3.27 -# CA 95054 USA or visit www.sun.com if you need additional information or 3.28 -# have any questions. 3.29 -# 3.30 -############################################################################# 3.31 -# 3.32 -# JPRT shell configuration for building. 3.33 -# 3.34 -# Input environment variables: 3.35 -# ALT_BOOTDIR 3.36 -# ALT_SLASH_JAVA 3.37 -# ALT_JDK_IMPORT_PATH 3.38 -# OPENJDK 3.39 -# Windows Only: 3.40 -# PATH 3.41 -# VS71COMNTOOLS 3.42 -# PROCESSOR_IDENTIFIER 3.43 -# ROOTDIR 3.44 -# 3.45 -# Output variable settings: 3.46 -# make Full path to GNU make 3.47 -# compiler_path Path to compiler bin directory 3.48 -# compiler_name Unique name of this compiler 3.49 -# 3.50 -# Output environment variables: 3.51 -# PATH 3.52 -# ALT_COMPILER_PATH 3.53 -# OPENJDK only: 3.54 -# ALT_CLOSED_JDK_IMPORT_PATH 3.55 -# ALT_JDK_DEVTOOLS_DIR 3.56 -# Windows Only: 3.57 -# ALT_MSDEVTOOLS_PATH 3.58 -# ALT_DEVTOOLS_PATH (To avoid the C:/UTILS default) 3.59 -# LIB 3.60 -# INCLUDE 3.61 -# 3.62 -# After JDK6, most settings will be found via ALT_SLASH_JAVA or 3.63 -# by way of other system environment variables. If this was JDK5 3.64 -# or an older JDK, you might need to export more ALT_* variables. 3.65 -# 3.66 -# On Windows AMD64, if MSSDK is not set, assumes Platform SDK is installed at: 3.67 -# C:/Program Files/Microsoft Platform SDK 3.68 -# 3.69 -############################################################################# 3.70 - 3.71 -############################################################################# 3.72 -# Error 3.73 -error() # message 3.74 -{ 3.75 - echo "ERROR: $1" 3.76 - exit 6 3.77 -} 3.78 -# Directory must exist 3.79 -dirMustExist() # dir name 3.80 -{ 3.81 - if [ ! -d "$1" ] ; then 3.82 - error "Directory for $2 does not exist: $1" 3.83 - fi 3.84 -} 3.85 -# File must exist 3.86 -fileMustExist() # dir name 3.87 -{ 3.88 - if [ ! -f "$1" ] ; then 3.89 - error "File for $2 does not exist: $1" 3.90 - fi 3.91 -} 3.92 -############################################################################# 3.93 - 3.94 -# Should be set by JPRT as the 3 basic inputs 3.95 -bootdir="${ALT_BOOTDIR}" 3.96 -slashjava="${ALT_SLASH_JAVA}" 3.97 -jdk_import="${ALT_JDK_IMPORT_PATH}" 3.98 - 3.99 -# The /java/devtools items 3.100 -jdk_devtools="${slashjava}/devtools" 3.101 -share="${jdk_devtools}/share" 3.102 - 3.103 -# Needed for langtools, maybe other parts of the build 3.104 -ANT_HOME="${share}/ant/latest" 3.105 -export ANT_HOME 3.106 - 3.107 -# The 3 bin directories in common to all platforms 3.108 -sharebin="${share}/bin" 3.109 -antbin="${ANT_HOME}/bin" 3.110 - 3.111 -# Check input 3.112 -dirMustExist "${bootdir}" ALT_BOOTDIR 3.113 -dirMustExist "${slashjava}" ALT_SLASH_JAVA 3.114 -dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH 3.115 -dirMustExist "${ANT_HOME}" ANT_HOME 3.116 - 3.117 -# If ALT_PREVIOUS_RELEASE_IMAGE not defined, set it to the bootdir area for 3.118 -# any possible image comparisons. 3.119 -# We assume bootdir is a previous jdk release image, valid for comparison 3.120 -# reasons. 3.121 -if [ "${ALT_PREVIOUS_RELEASE_IMAGE}" = "" ] ; then 3.122 - ALT_PREVIOUS_RELEASE_IMAGE="${bootdir}" 3.123 - export ALT_PREVIOUS_RELEASE_IMAGE 3.124 -fi 3.125 - 3.126 -# Use the JDK import for now (FIXME: use the binary plugs?) 3.127 -if [ "${OPENJDK}" = true ] ; then 3.128 - ALT_CLOSED_JDK_IMPORT_PATH="${jdk_import}" 3.129 - export ALT_CLOSED_JDK_IMPORT_PATH 3.130 -fi 3.131 - 3.132 -# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. 3.133 -osname=`uname -s` 3.134 -if [ "${osname}" = SunOS ] ; then 3.135 - 3.136 - # SOLARIS: Sparc or X86 3.137 - osarch=`uname -p` 3.138 - if [ "${osarch}" = sparc ] ; then 3.139 - solaris_arch=sparc 3.140 - else 3.141 - solaris_arch=i386 3.142 - fi 3.143 - 3.144 - # Get the compilers into path (make sure it matches ALT setting) 3.145 - if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then 3.146 - compiler_name=${JPRT_SOLARIS_COMPILER_NAME} 3.147 - else 3.148 - compiler_name=SS12 3.149 - fi 3.150 - compiler_path=${jdk_devtools}/${solaris_arch}/SUNWspro/${compiler_name}/bin 3.151 - ALT_COMPILER_PATH="${compiler_path}" 3.152 - export ALT_COMPILER_PATH 3.153 - dirMustExist "${compiler_path}" ALT_COMPILER_PATH 3.154 - path4sdk=${compiler_path}:${sharebin}:${antbin} 3.155 - 3.156 - # Add basic solaris system paths 3.157 - path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin 3.158 - 3.159 - # Get the previous JDK to be used to bootstrap the build 3.160 - path4sdk=${bootdir}/bin:${path4sdk} 3.161 - 3.162 - # Find GNU make 3.163 - make=/usr/sfw/bin/gmake 3.164 - if [ ! -f ${make} ] ; then 3.165 - make=/opt/sfw/bin/gmake 3.166 - if [ ! -f ${make} ] ; then 3.167 - make=${jdk_devtools}/${solaris_arch}/bin/gnumake 3.168 - fi 3.169 - fi 3.170 - fileMustExist "${make}" make 3.171 - 3.172 - # File creation mask 3.173 - umask 002 3.174 - 3.175 -elif [ "${osname}" = Linux ] ; then 3.176 - 3.177 - # LINUX: X86, AMD64 3.178 - osarch=`uname -m` 3.179 - if [ "${osarch}" = i686 ] ; then 3.180 - linux_arch=i586 3.181 - elif [ "${osarch}" = x86_64 ] ; then 3.182 - linux_arch=amd64 3.183 - fi 3.184 - 3.185 - # Get the compilers into path (make sure it matches ALT setting) 3.186 - compiler_path=/usr/bin 3.187 - compiler_name=usr_bin 3.188 - ALT_COMPILER_PATH="${compiler_path}" 3.189 - export ALT_COMPILER_PATH 3.190 - dirMustExist "${compiler_path}" ALT_COMPILER_PATH 3.191 - path4sdk=${compiler_path}:${sharebin}:${antbin} 3.192 - 3.193 - # Add basic paths 3.194 - path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin 3.195 - 3.196 - # Get the previous JDK to be used to bootstrap the build 3.197 - path4sdk=${bootdir}/bin:${path4sdk} 3.198 - 3.199 - # Find GNU make 3.200 - make=/usr/bin/make 3.201 - fileMustExist "${make}" make 3.202 - 3.203 - umask 002 3.204 - 3.205 - # Linux platform may be old, use motif files from the devtools area 3.206 - if [ "${OPENJDK}" = true ] ; then 3.207 - ALT_JDK_DEVTOOLS_DIR="${jdk_devtools}" 3.208 - export ALT_JDK_DEVTOOLS_DIR 3.209 - fi 3.210 - 3.211 - 3.212 -else 3.213 - 3.214 - # Windows: Differs on CYGWIN vs. MKS, and the compiler available. 3.215 - # Also, blanks in pathnames gives GNU make headaches, so anything placed 3.216 - # in any ALT_* variable should be the short windows dosname. 3.217 - 3.218 - # WINDOWS: Install and use MKS or CYGWIN (should have already been done) 3.219 - # Assumption here is that you are in a shell window via MKS or cygwin. 3.220 - # MKS install should have defined the environment variable ROOTDIR. 3.221 - # We also need to figure out which one we have: X86, AMD64 3.222 - if [ "`echo ${PROCESSOR_IDENTIFIER} | fgrep AMD64`" != "" ] ; then 3.223 - windows_arch=amd64 3.224 - else 3.225 - windows_arch=i586 3.226 - fi 3.227 - 3.228 - # We need to determine if we are running a CYGWIN shell or an MKS shell 3.229 - # (if uname isn't available, then it will be unix_toolset=unknown) 3.230 - unix_toolset=unknown 3.231 - if [ "`uname -a | fgrep Cygwin`" = "" -a -d "${ROOTDIR}" ] ; then 3.232 - # We kind of assume ROOTDIR is where MKS is and it's ok 3.233 - unix_toolset=MKS 3.234 - mkshome=`dosname -s "${ROOTDIR}"` 3.235 - # Utility to convert to short pathnames without spaces 3.236 - dosname="${mkshome}/mksnt/dosname -s" 3.237 - # Most unix utilities are in the mksnt directory of ROOTDIR 3.238 - unixcommand_path="${mkshome}/mksnt" 3.239 - path4sdk="${sharebin};${antbin};${unixcommand_path}" 3.240 - dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH 3.241 - devtools_path="${jdk_devtools}/win32/bin" 3.242 - path4sdk="${devtools_path};${path4sdk}" 3.243 - # Normally this need not be set, but on Windows it's default is C:/UTILS 3.244 - ALT_DEVTOOLS_PATH="${devtools_path}" 3.245 - export ALT_DEVTOOLS_PATH 3.246 - dirMustExist "${devtools_path}" ALT_DEVTOOLS_PATH 3.247 - # Find GNU make 3.248 - make="${devtools_path}/gnumake.exe" 3.249 - fileMustExist "${make}" make 3.250 - elif [ "`uname -a | fgrep Cygwin`" != "" -a -f /bin/cygpath ] ; then 3.251 - # For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist 3.252 - unix_toolset=CYGWIN 3.253 - # Utility to convert to short pathnames without spaces 3.254 - dosname="/usr/bin/cygpath -a -m -s" 3.255 - # Most unix utilities are in the /usr/bin 3.256 - unixcommand_path="/usr/bin" 3.257 - path4sdk="${sharebin};${antbin};${unixcommand_path}" 3.258 - dirMustExist "${unixcommand_path}" ALT_UNIXCOMMAND_PATH 3.259 - # Find GNU make 3.260 - make="${unixcommand_path}/make.exe" 3.261 - fileMustExist "${make}" make 3.262 - else 3.263 - echo "WARNING: Cannot figure out if this is MKS or CYGWIN" 3.264 - fi 3.265 - 3.266 - # WINDOWS: Compiler setup (nasty part) 3.267 - # NOTE: You can use vcvars32.bat to set PATH, LIB, and INCLUDE. 3.268 - # NOTE: CYGWIN has a link.exe too, make sure the compilers are first 3.269 - if [ "${windows_arch}" = i586 ] ; then 3.270 - # 32bit Windows compiler settings 3.271 - # VisualStudio .NET 2003 VC++ 7.1 (VS71COMNTOOLS should be defined) 3.272 - vs_root=`${dosname} "${VS71COMNTOOLS}/../.."` 3.273 - # Fill in PATH, LIB, and INCLUDE (unset all others to make sure) 3.274 - msdev_root="${vs_root}/Common7/Tools" 3.275 - msdevtools_path="${msdev_root}/bin" 3.276 - vc7_root="${vs_root}/Vc7" 3.277 - compiler_path="${vc7_root}/bin" 3.278 - compiler_name=VS2003 3.279 - platform_sdk="${vc7_root}/PlatformSDK" 3.280 - # LIB and INCLUDE must use ; as a separator 3.281 - include4sdk="${vc7_root}/atlmfc/include" 3.282 - include4sdk="${include4sdk};${vc7_root}/include" 3.283 - include4sdk="${include4sdk};${platform_sdk}/include/prerelease" 3.284 - include4sdk="${include4sdk};${platform_sdk}/include" 3.285 - include4sdk="${include4sdk};${vs_root}/SDK/v1.1/include" 3.286 - lib4sdk="${vc7_root}/atlmfc/lib" 3.287 - lib4sdk="${lib4sdk};${vc7_root}/lib" 3.288 - lib4sdk="${lib4sdk};${platform_sdk}/lib/prerelease" 3.289 - lib4sdk="${lib4sdk};${platform_sdk}/lib" 3.290 - lib4sdk="${lib4sdk};${vs_root}/SDK/v1.1/lib" 3.291 - # Search path and DLL locating path 3.292 - # WARNING: CYGWIN has a link.exe too, make sure compilers are first 3.293 - path4sdk="${vs_root}/Common7/Tools/bin;${path4sdk}" 3.294 - path4sdk="${vs_root}/SDK/v1.1/bin;${path4sdk}" 3.295 - path4sdk="${vs_root}/Common7/Tools;${path4sdk}" 3.296 - path4sdk="${vs_root}/Common7/Tools/bin/prerelease;${path4sdk}" 3.297 - path4sdk="${vs_root}/Common7/IDE;${path4sdk}" 3.298 - path4sdk="${compiler_path};${path4sdk}" 3.299 - elif [ "${windows_arch}" = amd64 ] ; then 3.300 - # AMD64 64bit Windows compiler settings 3.301 - if [ "${MSSDK}" != "" ] ; then 3.302 - platform_sdk="${MSSDK}" 3.303 - else 3.304 - platform_sdk=`${dosname} "C:/Program Files/Microsoft Platform SDK/"` 3.305 - fi 3.306 - compiler_path="${platform_sdk}/Bin/win64/x86/AMD64" 3.307 - compiler_name=VS2005_PSDK 3.308 - msdevtools_path="${platform_sdk}/Bin" 3.309 - # LIB and INCLUDE must use ; as a separator 3.310 - include4sdk="${platform_sdk}/Include" 3.311 - include4sdk="${include4sdk};${platform_sdk}/Include/crt/sys" 3.312 - include4sdk="${include4sdk};${platform_sdk}/Include/mfc" 3.313 - include4sdk="${include4sdk};${platform_sdk}/Include/atl" 3.314 - include4sdk="${include4sdk};${platform_sdk}/Include/crt" 3.315 - lib4sdk="${platform_sdk}/Lib/AMD64" 3.316 - lib4sdk="${lib4sdk};${platform_sdk}/Lib/AMD64/atlmfc" 3.317 - # Search path and DLL locating path 3.318 - # WARNING: CYGWIN has a link.exe too, make sure compilers are first 3.319 - path4sdk="${platform_sdk}/bin;${path4sdk}" 3.320 - path4sdk="${compiler_path};${path4sdk}" 3.321 - fi 3.322 - # Export LIB and INCLUDE 3.323 - unset lib 3.324 - unset Lib 3.325 - LIB="${lib4sdk}" 3.326 - export LIB 3.327 - unset include 3.328 - unset Include 3.329 - INCLUDE="${include4sdk}" 3.330 - export INCLUDE 3.331 - # Set the ALT variable 3.332 - ALT_COMPILER_PATH=`${dosname} "${compiler_path}"` 3.333 - export ALT_COMPILER_PATH 3.334 - dirMustExist "${compiler_path}" ALT_COMPILER_PATH 3.335 - ALT_MSDEVTOOLS_PATH=`${dosname} "${msdevtools_path}"` 3.336 - export ALT_MSDEVTOOLS_PATH 3.337 - dirMustExist "${msdevtools_path}" ALT_MSDEVTOOLS_PATH 3.338 - 3.339 - # WINDOWS: Get the previous JDK to be used to bootstrap the build 3.340 - path4sdk="${bootdir}/bin;${path4sdk}" 3.341 - 3.342 - # Turn all \\ into /, remove duplicates and trailing / 3.343 - slash_path="`echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g'`" 3.344 - 3.345 - # For windows, it's hard to know where the system is, so we just add this 3.346 - # to PATH. 3.347 - path4sdk="${slash_path};${PATH}" 3.348 - 3.349 - # Convert path4sdk to cygwin style 3.350 - if [ "${unix_toolset}" = CYGWIN ] ; then 3.351 - path4sdk="`/usr/bin/cygpath -p ${path4sdk}`" 3.352 - fi 3.353 - 3.354 - # Set special windows ALT variables 3.355 - ALT_ISHIELDDIR="C:/ishield802" 3.356 - export ALT_ISHIELDDIR 3.357 - 3.358 - # Sponsors binaries 3.359 - ALT_SPONSOR1DIR=C:/sponsor_binaries 3.360 - export ALT_SPONSOR1DIR 3.361 - ALT_SPONSOR2DIR=C:/sponsor_binaries 3.362 - export ALT_SPONSOR2DIR 3.363 - 3.364 - # JPRT systems can never run msival2.exe, set this to avoid them 3.365 - SKIP_MSIVAL2=true 3.366 - export SKIP_MSIVAL2 3.367 - # Not easy to do 3.368 - SKIP_COMPARE_IMAGES=true 3.369 - export SKIP_COMPARE_IMAGES 3.370 - 3.371 -fi 3.372 - 3.373 -# Export PATH setting 3.374 -PATH="${path4sdk}" 3.375 -export PATH 3.376 - 3.377 -# Things we need to unset 3.378 -unset LD_LIBRARY_PATH 3.379 -unset LD_LIBRARY_PATH_32 3.380 -unset LD_LIBRARY_PATH_64 3.381 -unset JAVA_HOME 3.382 -
4.1 --- a/make/jprt.properties Fri Apr 17 15:37:20 2009 +0100 4.2 +++ b/make/jprt.properties Thu May 07 10:30:10 2009 -0700 4.3 @@ -32,8 +32,8 @@ 4.4 solaris_sparcv9_5.10,\ 4.5 solaris_i586_5.10,\ 4.6 solaris_x64_5.10,\ 4.7 -linux_i586,\ 4.8 -linux_x64,\ 4.9 +linux_i586_2.6,\ 4.10 +linux_x64_2.6,\ 4.11 windows_i586,\ 4.12 windows_x64 4.13
