diff options
author | Andras Timar <atimar@suse.com> | 2012-01-06 19:16:03 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-01-06 19:16:35 +0100 |
commit | 1204483c13d093b202f6fc254b745156f2cb94e4 (patch) | |
tree | a485456feee24accfebd340127300d83318d3379 /setup_native | |
parent | d19667fc1ab4739295ee5305456a79e4dd56fa59 (diff) |
more wJRE cleanup
Diffstat (limited to 'setup_native')
-rw-r--r-- | setup_native/prj/d.lst | 2 | ||||
-rwxr-xr-x | setup_native/source/java/javaversion.dat | 57 | ||||
-rw-r--r-- | setup_native/source/java/javaversion2.dat | 57 |
3 files changed, 0 insertions, 116 deletions
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst index 1f0ed2a7f29e..0056694df617 100644 --- a/setup_native/prj/d.lst +++ b/setup_native/prj/d.lst @@ -30,8 +30,6 @@ mkdir: %_DEST%\bin\osolsmf ..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store ..\source\mac\ooo\DS_Store_Dev %_DEST%\bin\osl\DS_Store_Dev ..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack -..\source\java\javaversion.dat %_DEST%\bin\javaversion.dat -..\source\java\javaversion2.dat %_DEST%\bin\javaversion2.dat ..\source\opensolaris\bundledextensions\installed %_DEST%\bin\osolsmf\installed ..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README ..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat deleted file mode 100755 index a647694a7619..000000000000 --- a/setup_native/source/java/javaversion.dat +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 22 -WINDOWSJAVAVERSION=Java 6 Update 22 - -# Windows (scp2 and downloadtemplate.nsi) -WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe -WINDOWSJAVAREGISTRYENTRY=1.6.0_22 - -# Linux (scp2) -LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm -# Linux (rpmUnit.xml, rpm -qp <filename> ) -LINUXJAVANAME=jre-1.6.0_22-fcs - -# Linux-x64 (scp2) -LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm - -# Solaris Sparc (scp2) -SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz -SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz -SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz - -# Solaris x86 (scp2) -SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz -SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz -SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz - -# Solaris (pkgUnit.xml, needs only to be changed in major changes) -SOLARISJAVART=SUNWj6rt -SOLARISJAVACFG=SUNWj6cfg -SOLARISJAVAMAN=SUNWj6man diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat deleted file mode 100644 index a647694a7619..000000000000 --- a/setup_native/source/java/javaversion2.dat +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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 22 -WINDOWSJAVAVERSION=Java 6 Update 22 - -# Windows (scp2 and downloadtemplate.nsi) -WINDOWSJAVAFILENAME=jre-6u22-windows-i586.exe -WINDOWSJAVAREGISTRYENTRY=1.6.0_22 - -# Linux (scp2) -LINUXJAVAFILENAME=jre-6u22-linux-i586.rpm -# Linux (rpmUnit.xml, rpm -qp <filename> ) -LINUXJAVANAME=jre-1.6.0_22-fcs - -# Linux-x64 (scp2) -LINUXX64JAVAFILENAME=jre-6u22-linux-amd64.rpm - -# Solaris Sparc (scp2) -SOLSJAVARTPACKED=SUNWj6rt_1_6_0_22_sparc.tar.gz -SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_22_sparc.tar.gz -SOLSJAVAMANPACKED=SUNWj6man_1_6_0_22_sparc.tar.gz - -# Solaris x86 (scp2) -SOLIJAVARTPACKED=SUNWj6rt_1_6_0_22_x86.tar.gz -SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_22_x86.tar.gz -SOLIJAVAMANPACKED=SUNWj6man_1_6_0_22_x86.tar.gz - -# Solaris (pkgUnit.xml, needs only to be changed in major changes) -SOLARISJAVART=SUNWj6rt -SOLARISJAVACFG=SUNWj6cfg -SOLARISJAVAMAN=SUNWj6man |