CWS-TOOLING: integrate CWS native211_DEV300

2 files changed, 61 insertions, 0 deletions

diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 45dc258f5c77..a5df50320a73 100644
--- a/setup_native/prj/d.lst
+++ b/setup_native/prj/d.lst
@@ -29,6 +29,7 @@ mkdir: %_DEST%\bin%_EXT%\userscripts
 ..\source\linux\*.dat %_DEST%\bin%_EXT%\*.dat
 ..\source\java\openofficeorg_setup.gif %_DEST%\bin%_EXT%\osl\Setup.gif
 ..\source\java\javaversion.dat %_DEST%\bin%_EXT%\javaversion.dat
+..\source\java\javaversion2.dat %_DEST%\bin%_EXT%\javaversion2.dat
 ..\source\packinfo\solariscopyrightfile %_DEST%\bin%_EXT%\solariscopyrightfile
 ..\source\packinfo\*.txt %_DEST%\bin%_EXT%\*.txt
 ..\source\packinfo\*.pcp %_DEST%\bin%_EXT%\*.pcp
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
new file mode 100644
index 000000000000..490e2854af55
--- /dev/null
+++ b/setup_native/source/java/javaversion2.dat
@@ -0,0 +1,60 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: header.hxx,v $
+#
+# $Revision: 1.1 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
+JAVAVERSION=Java 6 Update 11
+
+# Windows (scp2 and downloadtemplate.nsi)
+WINDOWSJAVAFILENAME=jre-6u7-windows-i586-p.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_11
+
+# Linux (scp2)
+LINUXJAVAFILENAME=jre-6u11-linux-i586.rpm
+# Linux (rpmUnit.xml, rpm -qp <filename> )
+LINUXJAVANAME=jre-1.6.0_11-fcs
+
+# Linux-x64 (scp2)
+LINUXX64JAVAFILENAME=jre-6u11-linux-amd64.rpm
+
+# Solaris Sparc (scp2)
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_11_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_11_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_11_sparc.tar.gz
+
+# Solaris x86 (scp2)
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_11_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_11_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_11_x86.tar.gz
+
+# Solaris (pkgUnit.xml, needs only to be changed in major changes)
+SOLARISJAVART=SUNWj6rt
+SOLARISJAVACFG=SUNWj6cfg
+SOLARISJAVAMAN=SUNWj6man