Author: mseidel
Date: Fri Jun 21 15:27:49 2019
New Revision: 1861791
URL: http://svn.apache.org/viewvc?rev=1861791&view=rev
Log:
Merged r1861790 from trunk
Cleaned up whitespace
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/solenv/bin/modules/installer/globals.pm
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 21 15:27:49 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790
Modified:
openoffice/branches/AOO42X/main/solenv/bin/modules/installer/globals.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/bin/modules/installer/globals.pm?rev=1861791&r1=1861790&r2=1861791&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/bin/modules/installer/globals.pm
(original)
+++ openoffice/branches/AOO42X/main/solenv/bin/modules/installer/globals.pm Fri
Jun 21 15:27:49 2019
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -28,77 +28,77 @@ package installer::globals;
############################################
BEGIN
-{
+{
$prog="make_installer.pl";
- # WARNING: the following lines are matched verbatim in
i18npool/source/isolang/langid.pl
-
+ # WARNING: the following lines are matched verbatim in
i18npool/source/isolang/langid.pl
+
@noMSLocaleLangs = (
- "br",
- "bs",
- "dz",
- "gu",
- "km",
- "nr",
- "ns",
- "nso",
- "rw",
- "ss",
- "st",
- "tg",
- "ts",
- "tn",
- "ve",
- "xh",
- "zu",
- "ne",
- "bn",
- "bn-BD",
- "bn-IN",
- "lo",
- "cy",
- "ku",
- "as-IN",
- "te-IN",
- "ml-IN",
- "mr-IN",
- "ur-IN",
- "ta-IN",
- "or-IN",
- "ti-ER",
- "eo",
- "ka",
- "ga",
- "gd",
- "my",
- "mai",
- "brx",
- "dgo",
- "kok",
- "mni",
- "ca-XV",
- "ca-XR",
- "sat",
- "ug",
- "om",
- "si",
- "or",
- "oc",
- "ml",
- "as",
- "ast",
- "ht",
- "jbo",
- "fur",
- "ny",
- "so",
- "kab",
- "tk"
- );
+ "br",
+ "bs",
+ "dz",
+ "gu",
+ "km",
+ "nr",
+ "ns",
+ "nso",
+ "rw",
+ "ss",
+ "st",
+ "tg",
+ "ts",
+ "tn",
+ "ve",
+ "xh",
+ "zu",
+ "ne",
+ "bn",
+ "bn-BD",
+ "bn-IN",
+ "lo",
+ "cy",
+ "ku",
+ "as-IN",
+ "te-IN",
+ "ml-IN",
+ "mr-IN",
+ "ur-IN",
+ "ta-IN",
+ "or-IN",
+ "ti-ER",
+ "eo",
+ "ka",
+ "ga",
+ "gd",
+ "my",
+ "mai",
+ "brx",
+ "dgo",
+ "kok",
+ "mni",
+ "ca-XV",
+ "ca-XR",
+ "sat",
+ "ug",
+ "om",
+ "si",
+ "or",
+ "oc",
+ "ml",
+ "as",
+ "ast",
+ "ht",
+ "jbo",
+ "fur",
+ "ny",
+ "so",
+ "kab",
+ "tk"
+ );
@items_at_modules = ("Files", "Dirs", "Unixlinks");
@asianlanguages = ("ja", "ko", "zh-CN", "zh-TW");
@bidilanguages = ("ar", "he");
-
+
$ziplistname = "";
$pathfilename = "";
$setupscriptname = "";
@@ -112,7 +112,7 @@ BEGIN
$destdir = "";
$rootpath = "";
-
+
$required_dotnet_version = "2.0.0.0";
$productextension = "";
$languageproduct = undef;
@@ -124,7 +124,7 @@ BEGIN
$dounzip = 1;
$languages_defined_in_productlist = 0;
$setupscript_defined_in_productlist = 0;
- $islinux = 0;
+ $islinux = 0;
$issolaris = 0;
$ismacosx = 0;
$isos2 = 0;
@@ -171,8 +171,8 @@ BEGIN
$programmenufolder = "ProgramMenuFolder";
$systemfolder = "SystemFolder";
$encodinglistname = "msi-encodinglist.txt";
- $msiencoding = ""; # hash reference for msi encodings
- $msilanguage = ""; # hash reference for msi languages LCID
+ $msiencoding = ""; # hash reference for msi encodings
+ $msilanguage = ""; # hash reference for msi languages LCID
$sofficeiconadded = 0;
$temppath = "";
$globaltempdirname = "ooopackaging";
@@ -198,7 +198,7 @@ BEGIN
$englishsolarislicensename = "LICENSE";
$solarisdontcompress = 0;
$patharray = "";
-
+
$is_special_epm = 0;
$epm_in_path = 0;
$epm_path = "";
@@ -236,7 +236,7 @@ BEGIN
$strip = 1;
$globallogging = 0;
- $logfilename = "logfile.log"; # the default logfile name for global
errors
+ $logfilename = "logfile.log"; # the default logfile name for global
errors
# @logfileinfo = ();
# @errorlogfileinfo = ();
# @globallogfileinfo = ();
@@ -266,7 +266,7 @@ BEGIN
$manufacturer = "";
$longmanufacturer = "";
$codefilename = "codes.txt";
- $componentfilename = "components.txt";
+ $componentfilename = "components.txt";
$productcode = "";
$upgradecode = "";
$msiproductversion = "";
@@ -291,13 +291,13 @@ BEGIN
$mergedirectoriescollected = 0;
$lastsequence_before_merge = 0;
$lastcabfilename = "";
-
+
$createdxpddefaultlang = 0;
$xpddir = "";
$productxpdfile = "setup.xpd";
$xpd_files_prepared = 0;
$defaultlanguage = "";
- # @emptyxpdparents = ();
+# @emptyxpdparents = ();
@createdxpdfiles = ();
@allxpdfiles = ();
$isxpdplatform = 0;
@@ -306,7 +306,7 @@ BEGIN
$addlicensefile = 1;
$addsystemintegration = 0;
$addjavainstaller = 0;
- $added_directories = 0;
+ $added_directories = 0;
$makedownload = 1;
$makejds = 1;
$jdsexcludefilename = "";
@@ -377,7 +377,7 @@ BEGIN
%allregistrycomponents_in_this_database_ = ();
%allshortregistrycomponents = ();
%allregistryidentifier = ();
-
+
$installlocationdirectory = "";
$installlocationdirectoryset = 0;
$vendordirectory = "";
@@ -395,7 +395,7 @@ BEGIN
$uredirhostname = "";
$officedirgid = "";
$basisdirgid = "";
-
+
%sign_extensions = ("dll" => "1", "exe" => "1", "cab" => "1");
%treestyles = ();
%installlocations = ("INSTALLLOCATION" => "1");
@@ -404,23 +404,23 @@ BEGIN
%treeconditions = ();
%usedtreeconditions = ();
%moduledestination = ();
-
+
$fix_number_of_cab_files = 1;
$cabfilecompressionlevel = 2;
- $number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
+ $number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
$include_cab_in_msi = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
- $previous_idt_dir = "";
+ $previous_idt_dir = "";
$updatepack = 0;
$msitranpath = "";
$usesharepointpath = 0;
%newfilescollector = ();
$saveinstalldir = "";
- $csp_installdir = ""; # global installdir of
createsimplepackage() in simplepackage.pm
- $csp_installlogdir = ""; # global installlogdir of
createsimplepackage() in simplepackage.pm
- $csp_languagestring = ""; # global languagestring of
createsimplepackage() in simplepackage.pm
+ $csp_installdir = ""; # global installdir of createsimplepackage() in
simplepackage.pm
+ $csp_installlogdir = ""; # global installlogdir of
createsimplepackage() in simplepackage.pm
+ $csp_languagestring = ""; # global languagestring of
createsimplepackage() in simplepackage.pm
$localunpackdir = "";
$localinstalldirset = 0;
$localinstalldir = "";
@@ -433,7 +433,7 @@ BEGIN
$postprocess_specialepm = 0;
$postprocess_standardepm = 0;
-
+
$starttime = "";
@solarispatchscripts = ("checkinstall", "copyright",
"patch_checkinstall", "patch_postinstall", "postinstall", "preinstall",
"i.none");
@@ -466,19 +466,19 @@ BEGIN
%all_required_english_languagestrings = ();
@forced_properties = ("SERVICETAG_PRODUCTNAME",
"SERVICETAG_PRODUCTVERSION", "SERVICETAG_PARENTNAME", "SERVICETAG_SOURCE",
"SERVICETAG_URN");
-
+
@removedirs = ();
@jdsremovedirs = ();
@emptypackages = ();
%fontpackageexists = ();
- $exithandler = undef;
+ $exithandler = undef;
$plat = $^O;
if ( $plat =~ /cygwin/i )
{
- $zippath = "zip"; # Has
to be in the path: /usr/bin/zip
+ $zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg.exe";
$separator = "/";
@@ -486,12 +486,12 @@ BEGIN
$libextension = "\.dll";
$isunix = 0;
$iswin = 1;
- $archiveformat = ".zip";
+ $archiveformat = ".zip";
}
elsif ( $plat =~ /os2/i )
- {
+ {
print "Setup OS/2 platform\n";
- $zippath = "zip"; # Has
to be in the path: /usr/bin/zip
+ $zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg.bin";
$separator = "/";
@@ -500,11 +500,11 @@ BEGIN
$isunix = 0;
$iswin = 0;
$isos2 = 1;
- $archiveformat = ".zip";
+ $archiveformat = ".zip";
}
else
- {
- $zippath = "zip"; # Has
to be in the path: /usr/bin/zip
+ {
+ $zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg";
$separator = "/";
@@ -515,7 +515,7 @@ BEGIN
}
else
{
- $libextension = "\.so";
+ $libextension = "\.so";
}
$archiveformat = ".tar.gz";
$isunix = 1;
@@ -525,21 +525,21 @@ BEGIN
# $installer::globals::wrapcmd entries
$wrapcmd = "";
- if ( $plat =~ /linux/i ) { $islinux = 1; }
- if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
- if ( $plat =~ /solaris/i ) { $issolaris = 1; }
- if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
- if ( $plat =~ /os2/i ) { $isos2 = 1; }
+ if ( $plat =~ /linux/i ) { $islinux = 1; }
+ if ( $plat =~ /kfreebsd/i ) { $islinux = 1; }
+ if ( $plat =~ /solaris/i ) { $issolaris = 1; }
+ if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
+ if ( $plat =~ /os2/i ) { $isos2 = 1; }
# ToDo: Needs to be expanded for additional platforms
- $is_release = 0; # Is changed in parameter.pm when the -release option is
given.
- $source_version = undef;
- $target_version = undef;
- $source_msi = undef;
+ $is_release = 0; # Is changed in parameter.pm when the -release option
is given.
+ $source_version = undef;
+ $target_version = undef;
+ $source_msi = undef;
- # Is set to 1 when target_version is a major version, ie ?.0.0
- $is_major_release = 0;
+ # Is set to 1 when target_version is a major version, ie ?.0.0
+ $is_major_release = 0;
}
1;
