mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more wJRE cleanup

Browse Source
This commit is contained in:
Andras Timar
2012-01-06 19:16:03 +01:00
parent d19667fc1a
commit 1204483c13
7 changed files with 1 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
instsetoo_native/util/openoffice.lst
View File

@@ -127,7 +127,7 @@ LibreOffice_Dev
REGISTRYLAYERNAME LayerDev REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
UPDATEURL http://update.libreoffice.org/check.php UPDATEURL http://update.libreoffice.org/check.php
ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt
ADDSYSTEMINTEGRATION 1 ADDSYSTEMINTEGRATION 1
EVAL EVAL
FILEFORMATNAME OpenOffice.org FILEFORMATNAME OpenOffice.org

1
scp2/source/ooo/installation_ooo.scp
View File

@@ -32,7 +32,6 @@ Installation gid_Installation_Ooo
ProductVersion = "${PRODUCTVERSION}"; ProductVersion = "${PRODUCTVERSION}";
ProductExtension = "${PRODUCTEXTENSION}"; ProductExtension = "${PRODUCTEXTENSION}";
UserDirProductVersion = "${USERDIRPRODUCTVERSION}"; UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
JavaVersion = "${JAVAVERSION}";
SxwFormatName = "OpenOffice.org"; SxwFormatName = "OpenOffice.org";
SxwFormatVersion = "1.1"; SxwFormatVersion = "1.1";
VendorName = "OpenOffice.org"; VendorName = "OpenOffice.org";

2
setup_native/prj/d.lst
View File

@@ -30,8 +30,6 @@ mkdir: %_DEST%\bin\osolsmf
..\source\mac\ooo\DS_Store %_DEST%\bin\osl\DS_Store ..\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_Dev %_DEST%\bin\osl\DS_Store_Dev
..\source\mac\ooo\DS_Store_Langpack %_DEST%\bin\osl\DS_Store_Langpack ..\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\installed %_DEST%\bin\osolsmf\installed
..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README ..\source\opensolaris\bundledextensions\README %_DEST%\bin\osolsmf\README
..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml ..\source\opensolaris\bundledextensions\ooo_bundled_extensions.xml %_DEST%\bin\osolsmf\ooo_bundled_extensions.xml

57
setup_native/source/java/javaversion.dat
View File

@@ -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

57
setup_native/source/java/javaversion2.dat
View File

@@ -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

13
solenv/bin/modules/installer/worker.pm
View File

@@ -2011,19 +2011,6 @@ sub add_variables_from_inc_to_hashref
} }
} }
} }
# Allowing different Java versions for Windows and Unix. Instead of "JAVAVERSION"
# the property "WINDOWSJAVAVERSION" has to be used, if it is set.
if ( $installer::globals::iswindowsbuild )
{
if (( exists($allvariables->{'WINDOWSJAVAVERSION'})) && ( $allvariables->{'WINDOWSJAVAVERSION'} ne "" ))
{
$allvariables->{'JAVAVERSION'} = $allvariables->{'WINDOWSJAVAVERSION'};
$infoline = "Changing value of property \"JAVAVERSION\" to $allvariables->{'JAVAVERSION'} (property \"WINDOWSJAVAVERSION\").\n";
push( @installer::globals::globallogfileinfo, $infoline);
}
}
} }
############################################## ##############################################

7
solenv/bin/modules/installer/xpdinstaller.pm
View File

@@ -377,14 +377,7 @@ sub get_applicationmodule_value
sub get_isjavamodule_value sub get_isjavamodule_value
{ {
my ( $module ) = @_;
my $value = "false"; my $value = "false";
my $styles = "";
if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
if ( $styles =~ /\bJAVAMODULE\b/ ) { $value = "true"; }
return $value; return $value;
} }