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

INTEGRATION: CWS hr5 (1.2.36); FILE MERGED

Browse source 
2004/08/12 14:09:47 hr 1.2.36.1: #i31082#: fix module lookup, differentiate between windows perl implementations
This commit is contained in:
Rüdiger Timm 2004-08-12 14:11:19 +00:00
parent 5343277cb7
commit f03dde087e
2 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
solenv/bin/cwscreate.pl
View file

@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
# $RCSfile: cwscreate.pl,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: hr $ $Date: 2004-06-26 00:23:20 $
# last change: $Author: rt $ $Date: 2004-08-12 15:10:42 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -75,11 +75,16 @@ use Sys::Hostname;
use File::Spec;
#### module lookup
my @lib_dirs;
BEGIN {
if ( !defined($ENV{SOLARENV}) ) {
die "No environment found (environment variable SOLARENV is undefined)";
}
push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
push(@lib_dirs, "$ENV{COMMON_ENV_TOOLS}/modules") if defined($ENV{COMMON_ENV_TOOLS});
}
use lib (@lib_dirs);
use lib ("$ENV{SOLARENV}/bin/modules");
if (defined $ENV{COMMON_ENV_TOOLS}) {
unshift(@INC, "$ENV{COMMON_ENV_TOOLS}/modules");
};
use Cws;
use CvsModule;
use CwsConfig;
@ -97,7 +102,7 @@ $SIG{'INT'} = 'INT_handler' if defined($log);
( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
my $script_rev;
my $id_str = ' $Revision: 1.2 $ ';
my $id_str = ' $Revision: 1.3 $ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
@ -105,6 +110,7 @@ print "$script_name -- version: $script_rev\n";
#### hardcoded globals #####
# support for setsolar style configuration
my $b_server_wnt = 'r:/b_server/config';
my $b_server_unx = $ENV{ENV_ROOT} . '/b_server/config' if defined $ENV{ENV_ROOT};
$b_server_unx = '/so/env/b_server/config' if ! -d $b_server_unx;
@ -292,7 +298,7 @@ sub get_globalini
# default
if ( !defined($globalini) ) {
$globalini = ( $^O eq 'MSWin32' )
$globalini = ( $^O eq 'MSWin32' || $^O eq 'cygwin' )
? $b_server_wnt : $b_server_unx;
}
return $globalini;

23
solenv/bin/cwsresync.pl
View file

@ -5,9 +5,9 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#
# $RCSfile: cwsresync.pl,v $
#
# $Revision: 1.2 $
# $Revision: 1.3 $
#
# last change: $Author: hr $ $Date: 2004-06-26 00:23:20 $
# last change: $Author: rt $ $Date: 2004-08-12 15:11:19 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@ -79,11 +79,15 @@ use Getopt::Long;
use IO::Handle;
#### module lookup
use lib ("$ENV{SOLARENV}/bin/modules");
if (defined $ENV{COMMON_ENV_TOOLS}) {
unshift(@INC, "$ENV{COMMON_ENV_TOOLS}/modules");
};
my @lib_dirs;
BEGIN {
if ( !defined($ENV{SOLARENV}) ) {
die "No environment found (environment variable SOLARENV is undefined)";
}
push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
push(@lib_dirs, "$ENV{COMMON_ENV_TOOLS}/modules") if defined($ENV{COMMON_ENV_TOOLS});
}
use lib (@lib_dirs);
use Cws;
eval { require Logging; import Logging; };
@ -104,7 +108,7 @@ use CwsConfig;
( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/;
my $script_rev;
my $id_str = ' $Revision: 1.2 $ ';
my $id_str = ' $Revision: 1.3 $ ';
$id_str =~ /Revision:\s+(\S+)\s+\$/
? ($script_rev = $1) : ($script_rev = "-");
@ -873,8 +877,7 @@ sub relink_cws_action
$mws_location = get_mws_location($new_master);
if ( "$mws_location" ne "" ) {
# our OS isn't windows
if ( $^O =~ "MSWin32" )
{
if ( $^O =~ "MSWin32" || $^O =~ "cygwin" ) {
print_error("Sorry! not for windows",2);
}
$mws_accessible = 1;