diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:26:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:26:34 +0000 |
| commit | 3d446937ebb1eb5fd10f1ae8f49bef242eef4fb4 (patch) | |
| tree | 6194ef950167e838bd89a88f3631183507435da0 /solenv | |
| parent | 5d78e5e1aa6dbb041bb78a6dd2d18f1986b85958 (diff) | |
INTEGRATION: CWS nowrapcmd2 (1.87.4); FILE MERGED
2008/02/29 21:54:52 vq 1.87.4.1: #i85207# Remove WRAPCMDs.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 9650c07034e6..c633d63ef627 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -4,9 +4,9 @@ # # $RCSfile: globals.pm,v $ # -# $Revision: 1.87 $ +# $Revision: 1.88 $ # -# last change: $Author: obo $ $Date: 2008-02-27 09:04:43 $ +# last change: $Author: kz $ $Date: 2008-03-05 16:26:34 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -344,7 +344,6 @@ BEGIN $isunix = 0; $iswin = 1; $archiveformat = ".zip"; - $wrapcmd = ""; %savedmapping = (); %savedrevmapping = (); %savedrev83mapping = (); @@ -362,12 +361,6 @@ BEGIN $quote = "\'"; $isunix = 0; $iswin = 1; - if ( defined $ENV{'WRAPCMD'} && "$ENV{'WRAPCMD'}" ne "" ) - { - $wrapcmd = "guw.exe -env"; - } else { - $wrapcmd = ""; - } $archiveformat = ".zip"; %savedmapping = (); %savedrevmapping = (); @@ -395,8 +388,10 @@ BEGIN $quote = "\'"; $isunix = 1; $iswin = 0; - $wrapcmd = ""; } + # WRAPCMD is gone - remove this and all related + # $installer::globals::wrapcmd entries + $wrapcmd = ""; if ( $plat =~ /linux/i ) { $islinux = 1; } if ( $plat =~ /solaris/i ) { $issolaris = 1; } |