strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS native82 (1.66.24); FILE MERGED

Browse source 
2007/04/20 09:20:20 is 1.66.24.6: #i74914# Windows Installer patching
2007/04/11 11:39:37 is 1.66.24.5: RESYNC: (1.67-1.68); FILE MERGED
2007/03/29 11:47:18 is 1.66.24.4: RESYNC: (1.66-1.67); FILE MERGED
2007/03/27 11:15:34 is 1.66.24.3: #i75652# extension installation also for installed and archive
2007/03/22 11:06:01 is 1.66.24.2: #i74914# preparing Windows patch
2007/03/20 10:45:24 is 1.66.24.1: #i74914# windows patch preparation
This commit is contained in:
Gerd Weiss 2007-05-10 09:58:47 +00:00
parent ebb74a7a18
commit 4148528a32
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
solenv/bin/modules/installer/globals.pm
View file

@ -4,9 +4,9 @@
#
# $RCSfile: globals.pm,v $
#
# $Revision: 1.68 $
# $Revision: 1.69 $
#
# last change: $Author: rt $ $Date: 2007-04-02 12:22:01 $
# last change: $Author: gm $ $Date: 2007-05-10 10:58:47 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -105,6 +105,7 @@ BEGIN
$msilanguage = ""; # hash reference for msi languages LCID
$sofficeiconadded = 0;
$temppath = "";
$globaltempdirname = "ooopackaging";
$cyg_temppath = "";
$temppathdefined = 0;
$jdstemppathdefined = 0;
@ -158,6 +159,7 @@ BEGIN
@errorlogfileinfo = ();
@globallogfileinfo = ();
$exitlog = "";
$globalinfo_copied = 0;
$quiet = 0;
$debug = 0;
@ -241,13 +243,16 @@ BEGIN
$number_of_cabfiles = 4; # only for $fix_number_of_cab_files = 1
$include_cab_in_msi = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
$previous_idt_dir = "";
$updatepack = 0;
$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
$localinstalldirset = 0;
$localinstalldir = "";
$adafilename = "";
$javafilename = "";
@ -291,6 +296,7 @@ BEGIN
$unzippath = "unzip.exe"; # Has to be in the path: r:\btw\unzip.exe
$zippath= "zip.exe"; # Has to be in the path: r:\btw\zip.exe
$checksumfile = "so_checksum.exe";
$unopkgfile = "unopkg.exe";
if ( $plat =~ /cygwin/i )
{
$separator = "/";
@ -307,12 +313,17 @@ BEGIN
$isunix = 0;
$iswin = 1;
$wrapcmd = "";
%savedmapping = ();
%savedrevmapping = ();
%savedrev83mapping = ();
%saved83dirmapping = ();
}
elsif (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} ne "4nt" ))
{
$unzippath = "unzip"; # Has to be in the path: /usr/bin/unzip
$zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg.exe";
$separator = "/";
$pathseparator = "\:";
$libextension = "\.dll";
@ -320,12 +331,17 @@ BEGIN
$isunix = 0;
$iswin = 1;
$wrapcmd = $ENV{'WRAPCMD'}." -env ";
%savedmapping = ();
%savedrevmapping = ();
%savedrev83mapping = ();
%saved83dirmapping = ();
}
else
{
$unzippath = "unzip"; # Has to be in the path: /usr/bin/unzip
$zippath = "zip"; # Has to be in the path: /usr/bin/zip
$checksumfile = "so_checksum";
$unopkgfile = "unopkg";
$separator = "/";
$pathseparator = "\:";
if ( $plat =~ /darwin/i )