[Libreoffice-commits] .: 3 commits - instsetoo_native/util scp2/source scp2/util setup_native/prj setup_native/source solenv/bin
Andras Timar
timar at kemper.freedesktop.org
Fri Jan 6 10:16:18 PST 2012
instsetoo_native/util/openoffice.lst | 2
scp2/source/ooo/file_jre_ooo.scp | 49 --------
scp2/source/ooo/installation_ooo.scp | 1
scp2/source/ooo/makefile.mk | 3
scp2/source/ooo/module_java.scp | 100 ------------------
scp2/source/ooo/module_java.ulf | 32 -----
scp2/util/makefile.mk | 30 +----
setup_native/prj/d.lst | 2
setup_native/source/java/javaversion.dat | 57 ----------
setup_native/source/java/javaversion2.dat | 57 ----------
solenv/bin/make_installer.pl | 2
solenv/bin/modules/installer/control.pm | 4
solenv/bin/modules/installer/epmfile.pm | 14 --
solenv/bin/modules/installer/globals.pm | 4
solenv/bin/modules/installer/windows/feature.pm | 2
solenv/bin/modules/installer/windows/file.pm | 1
solenv/bin/modules/installer/windows/idtglobal.pm | 75 -------------
solenv/bin/modules/installer/windows/java.pm | 120 ----------------------
solenv/bin/modules/installer/windows/msiglobal.pm | 10 -
solenv/bin/modules/installer/worker.pm | 13 --
solenv/bin/modules/installer/xpdinstaller.pm | 7 -
21 files changed, 11 insertions(+), 574 deletions(-)
New commits:
commit 1204483c13d093b202f6fc254b745156f2cb94e4
Author: Andras Timar <atimar at suse.com>
Date: Fri Jan 6 19:16:03 2012 +0100
more wJRE cleanup
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 934126e..e928530 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -127,7 +127,7 @@ LibreOffice_Dev
REGISTRYLAYERNAME LayerDev
SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93
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
EVAL
FILEFORMATNAME OpenOffice.org
diff --git a/scp2/source/ooo/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp
index 331748a..3fc27cb 100644
--- a/scp2/source/ooo/installation_ooo.scp
+++ b/scp2/source/ooo/installation_ooo.scp
@@ -32,7 +32,6 @@ Installation gid_Installation_Ooo
ProductVersion = "${PRODUCTVERSION}";
ProductExtension = "${PRODUCTEXTENSION}";
UserDirProductVersion = "${USERDIRPRODUCTVERSION}";
- JavaVersion = "${JAVAVERSION}";
SxwFormatName = "OpenOffice.org";
SxwFormatVersion = "1.1";
VendorName = "OpenOffice.org";
diff --git a/setup_native/prj/d.lst b/setup_native/prj/d.lst
index 1f0ed2a..0056694 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 a647694..0000000
--- 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 a647694..0000000
--- 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
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index 7959274..c91ece7 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -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);
- }
- }
}
##############################################
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index 3b72889..ac38b64 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -377,14 +377,7 @@ sub get_applicationmodule_value
sub get_isjavamodule_value
{
- my ( $module ) = @_;
-
my $value = "false";
-
- my $styles = "";
- if ( $module->{'Styles'} ) { $styles = $module->{'Styles'}; }
- if ( $styles =~ /\bJAVAMODULE\b/ ) { $value = "true"; }
-
return $value;
}
commit d19667fc1ab4739295ee5305456a79e4dd56fa59
Author: Andras Timar <atimar at suse.com>
Date: Fri Jan 6 19:02:17 2012 +0100
remove support of the 'bundle Adabas' feature of installer
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index aacc15e..0b10320 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -483,8 +483,7 @@ sub set_addchildprojects
{
my ($allvariables) = @_;
- if (( $allvariables->{'ADAPRODUCT'} ) ||
- ( $allvariables->{'UREPRODUCT'} ) ||
+ if (( $allvariables->{'UREPRODUCT'} ) ||
( $allvariables->{'ADDREQUIREDPACKAGES'} )) { $installer::globals::addchildprojects = 1; }
if ( $installer::globals::patch )
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index ec133cb..8d78f62 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2956,12 +2956,6 @@ sub put_childprojects_into_installset
my $sourcefile = "";
- # Finding the modules defined in scp (with flag JAVAMODULE, ADAMODULE, ...)
- # Getting name of package from scp-Module
- # Copy file into installation set
- # Create xpd file and put it into xpd directory
- # xpd file has to be created completely from module and package itself (-> no packagelist!)
-
# Adding additional required packages (freetype).
# This package names are stored in global array @installer::globals::requiredpackages
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 94d09f5..d570ec0 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -388,8 +388,6 @@ sub create_feature_table
# Java and Ada only, if the correct settings are set
my $styles = "";
if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }
- if ( $styles =~ /\bJAVAMODULE\b/ ) { next; }
- if (( $styles =~ /\bADAMODULE\b/ ) && ( ! ($allvariableshashref->{'ADAPRODUCT'} ))) { next; }
# Controlling the language!
# Only language independent feature or feature with the correct language will be included into the table
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 53044f4..76e4988 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1754,34 +1754,10 @@ sub add_childprojects
}
# Content for InstallUISequence table
- # InstallAdabas &gm_o_Adabas=3 825
- # InstallJava &gm_o_Java=3 827
my $number = "";
my $featurename = "";
- if ( $allvariables->{'ADAPRODUCT'} )
- {
- $number = get_free_number_in_uisequence_table($installuitable);
- $featurename = get_feature_name("_Adabas", $featuretable);
- $line = "InstallAdabas\t\&$featurename\=3 And Not Installed And Not PATCH\t$number\n";
- push(@{$installuitable} ,$line);
- installer::remover::remove_leading_and_ending_whitespaces(\$line);
- $infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
- if ( $allvariables->{'ADAPRODUCT'} )
- {
- $number = get_free_number_in_uisequence_table($installuitable) + 4;
- $featurename = get_feature_name("_Adabas", $featuretable);
- $line = "MaintenanceAdabas\t\&$featurename\=3 And Installed And Not PATCH\t$number\n";
- push(@{$installuitable} ,$line);
- installer::remover::remove_leading_and_ending_whitespaces(\$line);
- $infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
if ( $allvariables->{'UREPRODUCT'} )
{
$number = get_free_number_in_uisequence_table($installuitable) + 8;
commit 40d6a46770a82ffd78e676d0b1fe6eed9a1987da
Author: Andras Timar <atimar at suse.com>
Date: Fri Jan 6 18:56:40 2012 +0100
remove support of the 'with JRE' installer
diff --git a/scp2/source/ooo/file_jre_ooo.scp b/scp2/source/ooo/file_jre_ooo.scp
deleted file mode 100644
index 8800db4..0000000
--- a/scp2/source/ooo/file_jre_ooo.scp
+++ /dev/null
@@ -1,49 +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.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-#ifdef WNT
-Directory gid_Dir_Jre
- ParentID = PREDEFINED_PROGDIR;
- HostName = "JRE";
-End
-#endif
-
-File gid_File_Exe_Java
- BIN_FILE_BODY;
- #ifdef WNT
- InstallName = "jre-windows-i586.exe";
- Styles = (DONT_PACK,JAVAFILE,SUBST_FILENAME);
- #else
- Styles = (DONT_PACK,JAVAFILE);
- #endif
- Dir = gid_Dir_Jre;
- Name = "${WINDOWSJAVAFILENAME}";
- Javaversion = "${WINDOWSJAVAREGISTRYENTRY}";
- Subdir = "java";
-End
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index be79403..96bcb5f 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -328,7 +328,6 @@ PARFILES= \
module_lang_template.par \
module_helppack.par \
module_help_template.par \
- module_java.par \
module_systemint.par \
profile_ooo.par \
profileitem_ooo.par \
@@ -341,7 +340,6 @@ PARFILES= \
.IF "$(GUI)"=="WNT"
PARFILES += \
- file_jre_ooo.par \
folder_ooo.par \
folderitem_ooo.par \
registryitem_ooo.par \
@@ -356,7 +354,6 @@ ULFFILES= \
module_ooo.ulf \
module_langpack.ulf \
module_helppack.ulf \
- module_java.ulf \
registryitem_ooo.ulf \
module_systemint.ulf
diff --git a/scp2/source/ooo/module_java.scp b/scp2/source/ooo/module_java.scp
deleted file mode 100644
index e93721c..0000000
--- a/scp2/source/ooo/module_java.scp
+++ /dev/null
@@ -1,100 +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.
- *
- ************************************************************************/
-
-#include "macros.inc"
-
-// Java modules
-
-Module gid_Module_Optional_Java
- ParentID = gid_Module_Optional;
- Sortkey = "100";
- MOD_NAME_DESC ( MODULE_OPTIONAL_JAVA );
- #ifdef WNT
- Styles = (JAVAMODULE);
- #elif defined (SOLARIS)
- Styles = (JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
- #else
- Styles = (JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE,DONTSHOWINUSERINSTALL);
- #endif
- #ifdef LINUX
- #ifdef X86_64
- PackageName = "${LINUXX64JAVAFILENAME}";
- #else
- PackageName = "${LINUXJAVAFILENAME}";
- #endif
- #else
- PackageName = "";
- #endif
-End
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Runtime
- ParentID = gid_Module_Optional_Java;
- Name = "gid_Module_Optional_Java_Runtime";
- Description = "gid_Module_Optional_Java_Runtime";
- Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
- #if defined (SOLARIS) && defined (SPARC)
- PackageName = "${SOLSJAVARTPACKED}";
- #elif defined (SOLARIS) && defined (INTEL)
- PackageName = "${SOLIJAVARTPACKED}";
- #else
- PackageName = "";
- #endif
-End
-#endif
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Config
- ParentID = gid_Module_Optional_Java;
- Name = "gid_Module_Optional_Java_Config";
- Description = "gid_Module_Optional_Java_Config";
- Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
- #if defined (SOLARIS) && defined (SPARC)
- PackageName = "${SOLSJAVACFGPACKED}";
- #elif defined (SOLARIS) && defined (INTEL)
- PackageName = "${SOLIJAVACFGPACKED}";
- #else
- PackageName = "";
- #endif
-End
-#endif
-
-#ifdef SOLARIS
-Module gid_Module_Optional_Java_Manual
- ParentID = gid_Module_Optional_Java;
- Name = "gid_Module_Optional_Java_Manual";
- Description = "gid_Module_Optional_Java_Manual";
- Styles = (HIDDEN_ROOT,JAVAMODULE,DONTUNINSTALL,NOTRELOCATABLE);
- #if defined (SOLARIS) && defined (SPARC)
- PackageName = "${SOLSJAVAMANPACKED}";
- #elif defined (SOLARIS) && defined (INTEL)
- PackageName = "${SOLIJAVAMANPACKED}";
- #else
- PackageName = "";
- #endif
-End
-#endif
diff --git a/scp2/source/ooo/module_java.ulf b/scp2/source/ooo/module_java.ulf
deleted file mode 100644
index c3ccedc..0000000
--- a/scp2/source/ooo/module_java.ulf
+++ /dev/null
@@ -1,32 +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.
- *
- ************************************************************************/
-
-[STR_NAME_MODULE_OPTIONAL_JAVA]
-en-US = "Java Runtime Environment (%JAVAVERSION)"
-
-[STR_DESC_MODULE_OPTIONAL_JAVA]
-en-US = "Component for setting up the Java Environment"
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 86831d5..9af2c3a 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -222,40 +222,28 @@ SCP1FILES += \
.ENDIF
# ------------------------------------------------------------------------
-# OpenOffice.org with JRE
-
-SCP2LINK_PRODUCT_TYPE=osl
-SCP2TARGET = setup_osljre
-SCP2FILES = $(SCP1FILES) \
- module_java.par
-
-.IF "$(GUI)"=="WNT"
-SCP2FILES += file_jre_ooo.par
-.ENDIF
-
-# ------------------------------------------------------------------------
# URE
.IF "$(OS)" != "MACOSX"
-SCP3LINK_PRODUCT_TYPE = osl
-SCP3TARGET = ure
-SCP3FILES = ure_standalone.par \
+SCP2LINK_PRODUCT_TYPE = osl
+SCP2TARGET = ure
+SCP2FILES = ure_standalone.par \
ure.par
.ENDIF
# ------------------------------------------------------------------------
# SDK
-SCP4LINK_PRODUCT_TYPE = osl
-SCP4TARGET = sdkoo
-SCP4FILES = sdkoo.par
+SCP3LINK_PRODUCT_TYPE = osl
+SCP3TARGET = sdkoo
+SCP3FILES = sdkoo.par
# ------------------------------------------------------------------------
# Test
-SCP5LINK_PRODUCT_TYPE = osl
-SCP5TARGET = test
-SCP5FILES = smoketest.par
+SCP4LINK_PRODUCT_TYPE = osl
+SCP4TARGET = test
+SCP4FILES = smoketest.par
# --- target -------------------------------------------------------------
.INCLUDE : target.mk
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 64e4c04..57dd86c 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2064,8 +2064,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
{
# Adding child projects to installation dynamically (also in feature table)
installer::windows::idtglobal::add_childprojects($languageidtdir, $filesinproductlanguageresolvedarrayref, $allvariableshashref);
- # setting Java variables for Java products
- if ( $allvariableshashref->{'JAVAPRODUCT'} ) { installer::windows::java::update_java_tables($languageidtdir, $allvariableshashref); }
}
# Then the language specific msi database can be created
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index b0824ef..aacc15e 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -483,8 +483,7 @@ sub set_addchildprojects
{
my ($allvariables) = @_;
- if (( $allvariables->{'JAVAPRODUCT'} ) ||
- ( $allvariables->{'ADAPRODUCT'} ) ||
+ if (( $allvariables->{'ADAPRODUCT'} ) ||
( $allvariables->{'UREPRODUCT'} ) ||
( $allvariables->{'ADDREQUIREDPACKAGES'} )) { $installer::globals::addchildprojects = 1; }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 76c1792..ec133cb 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2962,14 +2962,6 @@ sub put_childprojects_into_installset
# Create xpd file and put it into xpd directory
# xpd file has to be created completely from module and package itself (-> no packagelist!)
- if ( $allvariables->{'JAVAPRODUCT'} )
- {
- # Collect all modules with flag "JAVAMODULE"
- my $allmodules = collect_modules_with_style("JAVAMODULE", $modulesarrayref);
- $allmodules = remove_modules_without_package($allmodules);
- copy_childproject_files($allmodules, $sopackpath, $destdir, $modulesarrayref, $allvariables, "jre", $includepatharrayref, 1);
- }
-
# Adding additional required packages (freetype).
# This package names are stored in global array @installer::globals::requiredpackages
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index ea352ba..33d6e0a 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -425,10 +425,6 @@ BEGIN
$localinstalldirset = 0;
$localinstalldir = "";
- $javafilename = "";
- $javafilename2 = "";
- $javafilename3 = "";
- $javafile = "";
$urefile = "";
$postprocess_specialepm = 0;
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index b057b0e..94d09f5 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -388,7 +388,7 @@ sub create_feature_table
# Java and Ada only, if the correct settings are set
my $styles = "";
if ( $onefeature->{'Styles'} ) { $styles = $onefeature->{'Styles'}; }
- if (( $styles =~ /\bJAVAMODULE\b/ ) && ( ! ($allvariableshashref->{'JAVAPRODUCT'} ))) { next; }
+ if ( $styles =~ /\bJAVAMODULE\b/ ) { next; }
if (( $styles =~ /\bADAMODULE\b/ ) && ( ! ($allvariableshashref->{'ADAPRODUCT'} ))) { next; }
# Controlling the language!
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index c4315b4..044a1af 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -892,7 +892,6 @@ sub create_files_table
my $styles = "";
if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
- if (( $styles =~ /\bJAVAFILE\b/ ) && ( ! ($allvariables->{'JAVAPRODUCT'} ))) { next; }
$file{'Component_'} = get_file_component_name($onefile, $filesref);
$file{'File'} = generate_unique_filename_for_filetable($onefile, $file{'Component_'}, $uniquefilenamehashref);
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 94b5dcc..53044f4 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -1682,10 +1682,8 @@ sub add_childprojects
my $infoline = "";
my $line = "";
- $installer::globals::javafile = installer::worker::return_first_item_with_special_flag($filesref ,"JAVAFILE");
$installer::globals::urefile = installer::worker::return_first_item_with_special_flag($filesref ,"UREFILE");
- if (( $installer::globals::javafile eq "" ) && ( $allvariables->{'JAVAPRODUCT'} )) { installer::exiter::exit_program("ERROR: No JAVAFILE found in files collector!", "add_childprojects"); }
if (( $installer::globals::urefile eq "" ) && ( $allvariables->{'UREPRODUCT'} )) { installer::exiter::exit_program("ERROR: No UREFILE found in files collector!", "add_childprojects"); }
# Content for Directory table
@@ -1724,12 +1722,6 @@ sub add_childprojects
my $subjavadir = "";
my $suburedir = "";
- if ( $allvariables->{'JAVAPRODUCT'} )
- {
- $dirname = get_directory_name_from_file($installer::globals::javafile);
- $subjavadir = include_subdirname_into_directory_table($dirname, $directorytable, $directorytablename, $installer::globals::javafile);
- }
-
if ( $allvariables->{'UREPRODUCT'} )
{
$dirname = get_directory_name_from_file($installer::globals::urefile);
@@ -1739,20 +1731,10 @@ sub add_childprojects
# Content for the Component table
# The Java and Ada components have new directories
- if ( $allvariables->{'JAVAPRODUCT'} ) { include_subdir_into_componenttable($subjavadir, $installer::globals::javafile, $componenttable); }
if ( $allvariables->{'UREPRODUCT'} ) { include_subdir_into_componenttable($suburedir, $installer::globals::urefile, $componenttable); }
# Content for CustomAction table
- if ( $allvariables->{'JAVAPRODUCT'} )
- {
- $line = "InstallJava\t98\tSystemFolder\t[SourceDir]$installer::globals::javafile->{'Subdir'}\\$installer::globals::javafile->{'Name'} \/qb REBOOT=Suppress SPONSORS=0 DISABLEAD=1\n";
- push(@{$customactiontable} ,$line);
- installer::remover::remove_leading_and_ending_whitespaces(\$line);
- $infoline = "Added $line into table $customactiontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
if ( $allvariables->{'UREPRODUCT'} )
{
$line = "InstallUre\t98\tSystemFolder\t$installer::globals::urefile->{'Subdir'}\\$installer::globals::urefile->{'Name'} /S\n";
@@ -1762,15 +1744,6 @@ sub add_childprojects
push(@installer::globals::logfileinfo, $infoline);
}
- if ( $allvariables->{'JAVAPRODUCT'} )
- {
- $line = "MaintenanceJava\t82\t$installer::globals::javafile->{'uniquename'}\t\/qb REBOOT=Suppress SPONSORS=0 DISABLEAD=1\n";
- push(@{$customactiontable} ,$line);
- installer::remover::remove_leading_and_ending_whitespaces(\$line);
- $infoline = "Added $line into table $customactiontablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
if ( $allvariables->{'UREPRODUCT'} )
{
$line = "MaintenanceUre\t82\t$installer::globals::urefile->{'uniquename'}\t\/S\n";
@@ -1798,18 +1771,6 @@ sub add_childprojects
push(@installer::globals::logfileinfo, $infoline);
}
- if ( $allvariables->{'JAVAPRODUCT'} )
- {
- $number = get_free_number_in_uisequence_table($installuitable) + 2;
- $featurename = get_feature_name("_Java", $featuretable);
- if ( $featurename ) { $line = "InstallJava\t\&$featurename\=3 And Not Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; }
- else { $line = "InstallJava\tNot Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; } # feature belongs to root
- push(@{$installuitable} ,$line);
- installer::remover::remove_leading_and_ending_whitespaces(\$line);
- $infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
if ( $allvariables->{'ADAPRODUCT'} )
{
$number = get_free_number_in_uisequence_table($installuitable) + 4;
@@ -1821,18 +1782,6 @@ sub add_childprojects
push(@installer::globals::logfileinfo, $infoline);
}
- if ( $allvariables->{'JAVAPRODUCT'} )
- {
- $number = get_free_number_in_uisequence_table($installuitable) + 6;
- $featurename = get_feature_name("_Java", $featuretable);
- if ( $featurename ) { $line = "MaintenanceJava\t\&$featurename\=3 And Installed And JAVAPATH\=\"\" And Not PATCH\t$number\n"; }
- else { $line = "MaintenanceJava\tInstalled And JAVAPATH\=\"\" And Not PATCH\t$number\n"; } # feature belongs to root
- push(@{$installuitable} ,$line);
- installer::remover::remove_leading_and_ending_whitespaces(\$line);
- $infoline = "Added $line into table $installuitablename\n";
- push(@installer::globals::logfileinfo, $infoline);
- }
-
if ( $allvariables->{'UREPRODUCT'} )
{
$number = get_free_number_in_uisequence_table($installuitable) + 8;
diff --git a/solenv/bin/modules/installer/windows/java.pm b/solenv/bin/modules/installer/windows/java.pm
deleted file mode 100644
index 11ccd70..0000000
--- a/solenv/bin/modules/installer/windows/java.pm
+++ /dev/null
@@ -1,120 +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.
-#
-#*************************************************************************
-
-package installer::windows::java;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-####################################################################################
-# Writing content into RegLocat.idt and AppSearc.idt to find Java on system
-####################################################################################
-
-sub update_java_tables
-{
- my ($basedir, $allvariables) = @_;
-
- my $reglocatfile = "";
- my $appsearchfile = "";
-
- my $reglocatfilename = $basedir . $installer::globals::separator . "RegLocat.idt";
- my $appsearchfilename = $basedir . $installer::globals::separator . "AppSearc.idt";
- my $signaturefilename = $basedir . $installer::globals::separator . "Signatur.idt";
-
- if ( -f $reglocatfilename )
- {
- $reglocatfile = installer::files::read_file($reglocatfilename);
- }
- else
- {
- my @reglocattable = ();
- $reglocatfile = \@reglocattable;
- installer::windows::idtglobal::write_idt_header($reglocatfile, "reglocat");
- }
-
- if ( -f $appsearchfilename )
- {
- $appsearchfile = installer::files::read_file($appsearchfilename);
- }
- else
- {
- my @appsearchtable = ();
- $appsearchfile = \@appsearchtable;
- installer::windows::idtglobal::write_idt_header($appsearchfile, "appsearch");
- }
-
- if ( -f $signaturefilename )
- {
- $signaturefile = installer::files::read_file($signaturefilename);
- }
- else
- {
- my @signaturetable = ();
- $signaturefile = \@signaturetable;
- installer::windows::idtglobal::write_idt_header($signaturefile, "signatur");
- }
-
- # Writing content into this tables
- # Java version is saved in scp project
- # $installer::globals::javafile was defined in installer::windows::idtglobal::add_childprojects
-
- if ( ! $installer::globals::javafile->{'Javaversion'} ) { installer::exiter::exit_program("ERROR: \"Javaversion\" has to be defined in $installer::globals::javafile->{'gid'} in scp project!", "update_java_tables"); }
-
- my $javastring = $installer::globals::javafile->{'Javaversion'};
-
- my $signature = "JavaReg";
- my $rootvalue = "2";
- my $key = "Software\\JavaSoft\\Java Runtime Environment\\" . $javastring;
- my $name = "JavaHome";
- my $type = 2;
- my $property = "JAVAPATH";
-
- my $oneline = $signature . "\t" . $rootvalue . "\t" . $key . "\t" . $name . "\t" . $type . "\n";
- push(@{$reglocatfile}, $oneline);
-
- $oneline = $property . "\t" . $signature . "\n";
- push(@{$appsearchfile}, $oneline);
-
- # Saving the files
-
- installer::files::save_file($reglocatfilename ,$reglocatfile);
- my $infoline = "Updated idt file for Java: $reglocatfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
- installer::files::save_file($appsearchfilename ,$appsearchfile);
- $infoline = "Updated idt file for Java: $appsearchfilename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
- installer::files::save_file($signaturefilename ,$signaturefile);
- $infoline = "Updated idt file: $signaturefilename\n";
- push(@installer::globals::logfileinfo, $infoline);
-
-}
-
-1;
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 43e6ee3..8b8007a 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1235,16 +1235,6 @@ sub copy_child_projects_into_installset
my $sourcefile = "";
my $destdir = "";
- # adding Java
-
- if ( $allvariables->{'JAVAPRODUCT'} )
- {
- $sourcefile = $installer::globals::javafile->{'sourcepath'};
- $destdir = $installdir . $installer::globals::separator . $installer::globals::javafile->{'Subdir'};
- if ( ! -d $destdir) { installer::systemactions::create_directory($destdir); }
- installer::systemactions::copy_one_file($sourcefile, $destdir);
- }
-
if ( $allvariables->{'UREPRODUCT'} )
{
$sourcefile = $installer::globals::urefile->{'sourcepath'};
More information about the Libreoffice-commits
mailing list