summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-18 07:34:48 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-18 07:34:48 +0000
commitca769690e3b52cc87feb63a3429c781c539a0d8e (patch)
tree18b783251b11f66d3051398bbe686d6cd5fd7f73 /solenv
parentc8700f8fb87a62b5f91af03ef3721dd555b029a2 (diff)
INTEGRATION: CWS nativefixer1 (1.18.2); FILE MERGED
2004/11/11 11:33:18 is 1.18.2.4: #i34221# language pack name with language 2004/11/03 11:25:04 is 1.18.2.3: #i36570# version for assemblies 2004/10/25 11:07:15 is 1.18.2.2: #i34221# introducing format variable for epm 2004/10/22 13:04:15 is 1.18.2.1: #i34221# resolve merge conflict in header
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/globals.pm8
1 files changed, 3 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 09e46505a181..fbce427376a7 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -2,8 +2,6 @@
#
# $RCSfile: globals.pm,v $
#
-# $Revision: 1.20 $
-# last change: $Author: hr $ $Date: 2004-11-09 18:32:15 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -86,8 +84,6 @@ BEGIN
$lastminor = "";
$compiler = "";
$pro = 0;
- $rpm = 0;
- $debian = 0;
$dounzip = 1;
$languages_defined_in_productlist = 0;
$setupscript_defined_in_productlist = 0;
@@ -100,6 +96,7 @@ BEGIN
$islinuxbuild = 0;
$islinuxrpmbuild = 0;
$issolarisbuild = 0;
+ $issolarispkgbuild = 0;
$issolarissparcbuild = 0;
$issolarisx86build = 0;
$unpackpath = "";
@@ -196,10 +193,11 @@ BEGIN
@selfreglibraries = (); # to be removed after scp changes, see parameter.pm
@binarytablefiles = ("gid_File_Lib_Reg4msdocmsi", "gid_File_Lib_Regactivex_Msi", "gid_File_Lib_Jfregca", "gid_File_Lib_Netframework", "gid_File_Lib_Qslnkmsi", "gid_File_Lib_Sdqsmsi", "gid_File_Lib_Shlxtmsi", "gid_File_Lib_Instooofiltmsi"); # to be removed after scp changes, see parameter.pm
@msiassemblyfiles = ("gid_File_Lib_Cli_Basetypes", "gid_File_Lib_Cli_Types_Assembly", "gid_File_Lib_Cli_Cppuhelper_Assembly", "gid_File_Lib_Cli_Ure_Assembly"); # to be removed after scp changes
- @msiassemblynamecontent = ("gid_File_Lib_Cli_Basetypes", "cli_basetypes", "ce2cb7e279207b9e", "1.0.0.0", "gid_File_Lib_Cli_Types_Assembly", "cli_types", "ce2cb7e279207b9e", "1.0.0.0", "gid_File_Lib_Cli_Cppuhelper_Assembly", "cli_cppuhelper", "ce2cb7e279207b9e", "1.0.0.0", "gid_File_Lib_Cli_Ure_Assembly", "cli_ure", "ce2cb7e279207b9e", "1.0.0.0"); # to be removed after scp changes
+ @msiassemblynamecontent = ("gid_File_Lib_Cli_Basetypes", "cli_basetypes", "ce2cb7e279207b9e", "1.0.0.0", "gid_File_Lib_Cli_Types_Assembly", "cli_types", "ce2cb7e279207b9e", "1.1.0.0", "gid_File_Lib_Cli_Cppuhelper_Assembly", "cli_cppuhelper", "ce2cb7e279207b9e", "1.0.0.0", "gid_File_Lib_Cli_Ure_Assembly", "cli_ure", "ce2cb7e279207b9e", "1.0.0.0"); # to be removed after scp changes
@add_unocomponent_libraries = ("gid_File_Lib_Gnomevfs"); # to be removed after scp changes
@languagepackfeature =();
$langpackfilename = "Langpack.mlf";
+ $languagenames = "";
@removedirs = ();