Update JDK bundle to jdk6u26 b03 release70
authorYulia Novozhilova <ynov@netbeans.org>
Mon, 23 May 2011 16:09:37 +0400
branchrelease70
changeset 1989303a0dff26175e
parent 197369 afaed2d6a775
Update JDK bundle to jdk6u26 b03
installer/infra/build/build.xml
installer/infra/build/products/jdk/build_jdk6.properties
     1.1 --- a/installer/infra/build/build.xml	Mon May 02 17:49:00 2011 +0200
     1.2 +++ b/installer/infra/build/build.xml	Mon May 23 16:09:37 2011 +0400
     1.3 @@ -2163,8 +2163,8 @@
     1.4      <target name="generate-jdk6-bundles" if="do.build.jdk6">
     1.5          <!-- JavaSE + JDK6 bundles -->
     1.6  	<antcall target="generate-jdk-bundle-single">
     1.7 -	    <param name="jdk.bundle.files.prefix" value="jdk-6u25"/>
     1.8 -	    <param name="jdk.full.version" value="1.6.0.25.6"/>
     1.9 +	    <param name="jdk.bundle.files.prefix" value="jdk-6u26"/>
    1.10 +	    <param name="jdk.full.version" value="1.6.0.26.3"/>
    1.11  	    <param name="bundled.jvm.file.prefix" value="jre-6u20"/>
    1.12  	    <param name="license.resource" value="$S{nbi.overall.license.jdk6.resource}"/>
    1.13  	</antcall>	
     2.1 --- a/installer/infra/build/products/jdk/build_jdk6.properties	Mon May 02 17:49:00 2011 +0200
     2.2 +++ b/installer/infra/build/products/jdk/build_jdk6.properties	Mon May 23 16:09:37 2011 +0400
     2.3 @@ -64,7 +64,7 @@
     2.4  # * ${product.platforms} - the list of platforms that are supported by this 
     2.5  #   product (note that this property is not related to native libraries)
     2.6  product.uid=jdk
     2.7 -product.version=1.6.0.25.6
     2.8 +product.version=1.6.0.26.3
     2.9  #product.platforms= - will be overriden, as we need to build several times 
    2.10  #                     for several platforms
    2.11  
    2.12 @@ -108,11 +108,11 @@
    2.13  product.data.length.solaris-x86=1
    2.14  product.data.length.solaris-sparc=1
    2.15  
    2.16 -product.data.1.uri.prefix=${glassfish.builds.host}/java/re/j2sdk/6u25/promoted/fcs/b06/bundles/
    2.17 -product.data.1.uri.windows=${product.data.1.uri.prefix}/windows-i586/jdk-6u25-windows-i586.exe
    2.18 -product.data.1.uri.linux=${product.data.1.uri.prefix}/linux-i586/jdk-6u25-linux-i586.bin
    2.19 -product.data.1.uri.solaris-x86=${product.data.1.uri.prefix}/solaris-i586/jdk-6u25-solaris-i586.sh
    2.20 -product.data.1.uri.solaris-sparc=${product.data.1.uri.prefix}/solaris-sparc/jdk-6u25-solaris-sparc.sh
    2.21 +product.data.1.uri.prefix=${glassfish.builds.host}/java/re/j2sdk/6u26/promoted/fcs/b03/bundles/
    2.22 +product.data.1.uri.windows=${product.data.1.uri.prefix}/windows-i586/jdk-6u26-windows-i586.exe
    2.23 +product.data.1.uri.linux=${product.data.1.uri.prefix}/linux-i586/jdk-6u26-linux-i586.bin
    2.24 +product.data.1.uri.solaris-x86=${product.data.1.uri.prefix}/solaris-i586/jdk-6u26-solaris-i586.sh
    2.25 +product.data.1.uri.solaris-sparc=${product.data.1.uri.prefix}/solaris-sparc/jdk-6u26-solaris-sparc.sh
    2.26  product.data.1.uri=${product.data.1.uri.${product.platforms}}
    2.27  product.data.1.zip=false
    2.28  
    2.29 @@ -164,9 +164,9 @@
    2.30  # * properties are not i18n compliant
    2.31  product.properties.length=2
    2.32  product.properties.1.name=installation.location
    2.33 -product.properties.1.value=$N{install}/jdk1.6.0_25
    2.34 +product.properties.1.value=$N{install}/jdk1.6.0_26
    2.35  product.properties.2.name=installation.location.windows
    2.36 -product.properties.2.value=$N{install}/Java/jdk1.6.0_25
    2.37 +product.properties.2.value=$N{install}/Java/jdk1.6.0_26
    2.38  
    2.39  
    2.40  # sources parameters; a search-and-replace will be run over the sources after 
    2.41 @@ -176,15 +176,15 @@
    2.42  # * parameters are not i18n compliant
    2.43  sources.params.length=4
    2.44  sources.params.1.token={display-version}
    2.45 -sources.params.1.value=6 Update 25
    2.46 +sources.params.1.value=6 Update 26
    2.47  sources.params.2.token={jdk-installer-file}
    2.48 -sources.params.2.value.windows=jdk-6u25-windows-i586.exe
    2.49 -sources.params.2.value.linux=jdk-6u25-linux-i586.bin
    2.50 -sources.params.2.value.solaris-x86=jdk-6u25-solaris-i586.sh
    2.51 -sources.params.2.value.solaris-sparc=jdk-6u25-solaris-sparc.sh
    2.52 +sources.params.2.value.windows=jdk-6u26-windows-i586.exe
    2.53 +sources.params.2.value.linux=jdk-6u26-linux-i586.bin
    2.54 +sources.params.2.value.solaris-x86=jdk-6u26-solaris-i586.sh
    2.55 +sources.params.2.value.solaris-sparc=jdk-6u26-solaris-sparc.sh
    2.56  sources.params.2.value=${sources.params.2.value.${product.platforms}}
    2.57  sources.params.3.token={jdk-install-dir}
    2.58 -sources.params.3.value=jdk1.6.0_25
    2.59 +sources.params.3.value=jdk1.6.0_26
    2.60  sources.params.4.token={jdk-base-dir}
    2.61  sources.params.4.value=jdk1.6.0.b105
    2.62  #sources.params.5.token={jre-installer-file}