Skip to content

C
core
Kaydet (Commit) 69e273ce authored tarafından Sebastian Spaeth's avatar Sebastian Spaeth Kaydeden (comit) Cédric Bosdonnat
Dosyalara gözat
Seçenekler

bootstrap/soenv: remove tcsh version of LinuxX86-64Env.Set 

Previously we would have been writing out LinuxX86-64Env.Set and
LinuxX86-64Env.Set.sh which made my autocompletion useless. Simplify the
set_soenv.in to actually only produce 1 version which makes us require
bash as interactive build shell.
Signed-off-by: 's avatarSebastian Spaeth <Sebastian@SSpaeth.de>
üst 48bd163f
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 75 deletions
set_soenv.in
Dosyayı görüntüle @ 69e273ce
...@@ -38,12 +38,12 @@ use File::Basename; ...@@ -38,12 +38,12 @@ use File::Basename;
# IIa. Declaring variables for the system commands, etc. # IIa. Declaring variables for the system commands, etc.
#-------------------------------------------------------- #--------------------------------------------------------
# #
my ( $outfile, $outfile_sh, $bootfile, $newline, $comment, my ( $outfile, $bootfile, $newline, $comment,
$compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps,
$wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW, $wps, $cur_dir, $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $MINGW,
$USE_MINGW, $platform, $USE_MINGW, $platform,
$cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include, $cygwinver, $empty, $no_ant, $no_stl, $no_gcc_include,
$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path); $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $exportvars, $win_format_var, $perl_os, @mingw_lib_include_paths, $mingw_lib_include_path);
# #
#------------------------------------------------- #-------------------------------------------------
# IIb. Declaring environment values (constants). # IIb. Declaring environment values (constants).
...@@ -205,10 +205,10 @@ if ( $platform =~ m/solaris/ ) ...@@ -205,10 +205,10 @@ if ( $platform =~ m/solaris/ )
if ($platform =~ m/^i[3456]86/) if ($platform =~ m/^i[3456]86/)
{ {
if ( $CC =~ "gcc") { if ( $CC =~ "gcc") {
$outfile = "SolarisX86GccEnv.Set"; $outfile = "SolarisX86GccEnv.Set.sh";
$OUTPATH = "unxsogi"; $OUTPATH = "unxsogi";
} else { } else {
$outfile = "SolarisX86Env.Set"; $outfile = "SolarisX86Env.Set.sh";
$OUTPATH = "unxsoli4"; $OUTPATH = "unxsoli4";
} }
$CPU = "I"; $CPU = "I";
...@@ -221,10 +221,10 @@ if ( $platform =~ m/solaris/ ) ...@@ -221,10 +221,10 @@ if ( $platform =~ m/solaris/ )
else else
{ {
if ( $CC =~ "gcc") { if ( $CC =~ "gcc") {
$outfile = "SolarisSparcGccEnv.Set"; $outfile = "SolarisSparcGccEnv.Set.sh";
$OUTPATH = "unxsogs"; $OUTPATH = "unxsogs";
} else { } else {
$outfile = "SolarisSparcEnv.Set"; $outfile = "SolarisSparcEnv.Set.sh";
$OUTPATH = "unxsols4"; $OUTPATH = "unxsols4";
} }
$CPU = "S"; $CPU = "S";
...@@ -256,7 +256,7 @@ elsif ( $platform =~ m/netbsd/ ) ...@@ -256,7 +256,7 @@ elsif ( $platform =~ m/netbsd/ )
#Set platform specific values: #Set platform specific values:
if ($platform =~ m/^i[3456]86/) if ($platform =~ m/^i[3456]86/)
{ print "Setting NetBSD x86 specific values... "; { print "Setting NetBSD x86 specific values... ";
$outfile = "NetBSDX86Env.Set"; $outfile = "NetBSDX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
$OUTPATH = "unxbsdi"; $OUTPATH = "unxbsdi";
...@@ -266,7 +266,7 @@ elsif ( $platform =~ m/netbsd/ ) ...@@ -266,7 +266,7 @@ elsif ( $platform =~ m/netbsd/ )
} }
elsif ($platform =~ m/^sparc/) elsif ($platform =~ m/^sparc/)
{ print "Setting NetBSD Sparc specific values... "; { print "Setting NetBSD Sparc specific values... ";
$outfile = "NetBSDSparcEnv.Set"; $outfile = "NetBSDSparcEnv.Set.sh";
$CPU = "S"; $CPU = "S";
$CPUNAME = "SPARC"; $CPUNAME = "SPARC";
$OUTPATH = "unxbsds"; $OUTPATH = "unxbsds";
...@@ -276,7 +276,7 @@ elsif ( $platform =~ m/netbsd/ ) ...@@ -276,7 +276,7 @@ elsif ( $platform =~ m/netbsd/ )
} }
elsif ($platform =~ m/powerpc/) elsif ($platform =~ m/powerpc/)
{ print "Setting NetBSD PPC specific values... "; { print "Setting NetBSD PPC specific values... ";
$outfile = "NetBSDPPCEnv.Set"; $outfile = "NetBSDPPCEnv.Set.sh";
$CPU = "P"; $CPU = "P";
$CPUNAME = "POWERPC"; $CPUNAME = "POWERPC";
$OUTPATH = "unxbsdppc"; $OUTPATH = "unxbsdppc";
...@@ -319,7 +319,7 @@ elsif ( $platform =~ m/kfreebsd/ ) ...@@ -319,7 +319,7 @@ elsif ( $platform =~ m/kfreebsd/ )
#Set platform specific values: #Set platform specific values:
if ($platform =~ m/^i[3456]86/) if ($platform =~ m/^i[3456]86/)
{ print "Setting GNU/kFreeBSD x86 specific values... "; { print "Setting GNU/kFreeBSD x86 specific values... ";
$outfile = "GNUkFreeBSDX86Env.Set"; $outfile = "GNUkFreeBSDX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
$OUTPATH = "unxkfgi6"; $OUTPATH = "unxkfgi6";
...@@ -331,7 +331,7 @@ elsif ( $platform =~ m/kfreebsd/ ) ...@@ -331,7 +331,7 @@ elsif ( $platform =~ m/kfreebsd/ )
} }
elsif ($platform =~ m/^x86_64/) elsif ($platform =~ m/^x86_64/)
{ print "Setting GNU/kFreeBSD x86-64 specific values... "; { print "Setting GNU/kFreeBSD x86-64 specific values... ";
$outfile = "GNUkFreeBSDX86-64Env.Set"; $outfile = "GNUkFreeBSDX86-64Env.Set.sh";
$CPU = "X"; $CPU = "X";
$CPUNAME = "X86_64"; $CPUNAME = "X86_64";
$OUTPATH = "unxkfgx6"; $OUTPATH = "unxkfgx6";
...@@ -357,7 +357,7 @@ elsif ( $platform =~ m/freebsd/ ) ...@@ -357,7 +357,7 @@ elsif ( $platform =~ m/freebsd/ )
if ($platform =~ m/^amd64/) if ($platform =~ m/^amd64/)
{ my ( $JAVA_OS ); { my ( $JAVA_OS );
print "Setting FreeBSD AMD64 specific values... "; print "Setting FreeBSD AMD64 specific values... ";
$outfile = "FreeBSDAMDEnv.Set"; $outfile = "FreeBSDAMDEnv.Set.sh";
$CPU = "X"; $CPU = "X";
$CPUNAME = "X86_64"; $CPUNAME = "X86_64";
$OUTPATH = "unxfbsdx"; $OUTPATH = "unxfbsdx";
...@@ -376,7 +376,7 @@ elsif ( $platform =~ m/freebsd/ ) ...@@ -376,7 +376,7 @@ elsif ( $platform =~ m/freebsd/ )
} }
elsif ($platform =~ m/^i386/) elsif ($platform =~ m/^i386/)
{ print "Setting FreeBSD x86 specific values... "; { print "Setting FreeBSD x86 specific values... ";
$outfile = "FreeBSDX86Env.Set"; $outfile = "FreeBSDX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
$OUTPATH = "unxfbsdi"; $OUTPATH = "unxfbsdi";
...@@ -410,7 +410,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -410,7 +410,7 @@ elsif ( $platform =~ m/linux/ )
#Set platform specific values: #Set platform specific values:
if ($platform =~ m/^i[3456]86/) if ($platform =~ m/^i[3456]86/)
{ print "Setting Linux x86 specific values... "; { print "Setting Linux x86 specific values... ";
$outfile = "LinuxX86Env.Set"; $outfile = "LinuxX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
...@@ -435,7 +435,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -435,7 +435,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^x86_64/) elsif ($platform =~ m/^x86_64/)
{ print "Setting Linux x86-64 specific values... "; { print "Setting Linux x86-64 specific values... ";
$outfile = "LinuxX86-64Env.Set"; $outfile = "LinuxX86-64Env.Set.sh";
$CPU = "X"; $CPU = "X";
$CPUNAME = "X86_64"; $CPUNAME = "X86_64";
$OUTPATH = "unxlngx6"; $OUTPATH = "unxlngx6";
...@@ -447,7 +447,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -447,7 +447,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^ia64/) elsif ($platform =~ m/^ia64/)
{ print "Setting Linux ia64 specific values... "; { print "Setting Linux ia64 specific values... ";
$outfile = "LinuxIA64Env.Set"; $outfile = "LinuxIA64Env.Set.sh";
$CPU = "A"; $CPU = "A";
$CPUNAME = "IA64"; $CPUNAME = "IA64";
$OUTPATH = "unxlnga"; $OUTPATH = "unxlnga";
...@@ -458,7 +458,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -458,7 +458,7 @@ elsif ( $platform =~ m/linux/ )
elsif ($platform =~ m/^sparc/) elsif ($platform =~ m/^sparc/)
{ print "Setting Linux Sparc specific values... "; { print "Setting Linux Sparc specific values... ";
$outfile = "LinuxSparcEnv.Set"; $outfile = "LinuxSparcEnv.Set.sh";
$CPU = "S"; $CPU = "S";
$CPUNAME = "SPARC"; $CPUNAME = "SPARC";
$OUTPATH = "unxlngs"; $OUTPATH = "unxlngs";
...@@ -470,7 +470,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -470,7 +470,7 @@ elsif ( $platform =~ m/linux/ )
{ {
if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) { if (($platform =~ m/^powerpc64/) && ('@SIZEOF_LONG@' eq '8')) {
print "Setting Linux PPC64 specific values... "; print "Setting Linux PPC64 specific values... ";
$outfile = "LinuxPPC64Env.Set"; $outfile = "LinuxPPC64Env.Set.sh";
$OUTPATH = "unxlngppc64"; $OUTPATH = "unxlngppc64";
$CPUNAME = "POWERPC64"; $CPUNAME = "POWERPC64";
...@@ -482,7 +482,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -482,7 +482,7 @@ elsif ( $platform =~ m/linux/ )
} }
else { else {
print "Setting Linux PPC specific values... "; print "Setting Linux PPC specific values... ";
$outfile = "LinuxPPCEnv.Set"; $outfile = "LinuxPPCEnv.Set.sh";
$OUTPATH = "unxlngppc"; $OUTPATH = "unxlngppc";
$CPUNAME = "POWERPC"; $CPUNAME = "POWERPC";
...@@ -510,14 +510,14 @@ elsif ( $platform =~ m/linux/ ) ...@@ -510,14 +510,14 @@ elsif ( $platform =~ m/linux/ )
{ {
if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) { if (($platform =~ m/^s390x/) && ('@SIZEOF_LONG@' eq '8')) {
print "Setting Linux zSeries specific values... "; print "Setting Linux zSeries specific values... ";
$outfile = "LinuxS390XEnv.Set"; $outfile = "LinuxS390XEnv.Set.sh";
$CPUNAME = "S390X"; $CPUNAME = "S390X";
$ARCH = "s390x"; $ARCH = "s390x";
$OUTPATH = "unxlngs390x"; $OUTPATH = "unxlngs390x";
} }
else { else {
print "Setting Linux S/390 specific values... "; print "Setting Linux S/390 specific values... ";
$outfile = "LinuxS390Env.Set"; $outfile = "LinuxS390Env.Set.sh";
$CPUNAME = "S390"; $CPUNAME = "S390";
$ARCH = "s390"; $ARCH = "s390";
$OUTPATH = "unxlngs390"; $OUTPATH = "unxlngs390";
...@@ -529,7 +529,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -529,7 +529,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^m68k/) elsif ($platform =~ m/^m68k/)
{ print "Setting Linux m68k specific values... "; { print "Setting Linux m68k specific values... ";
$outfile = "LinuxM68KEnv.Set"; $outfile = "LinuxM68KEnv.Set.sh";
$CPU = "6"; $CPU = "6";
$CPUNAME = "M68K"; $CPUNAME = "M68K";
$OUTPATH = "unxlngm68k"; $OUTPATH = "unxlngm68k";
...@@ -539,7 +539,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -539,7 +539,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^hppa/) elsif ($platform =~ m/^hppa/)
{ print "Setting Linux hppa specific values... "; { print "Setting Linux hppa specific values... ";
$outfile = "LinuxHPPAEnv.Set"; $outfile = "LinuxHPPAEnv.Set.sh";
$CPU = "H"; $CPU = "H";
$CPUNAME = "HPPA"; $CPUNAME = "HPPA";
$OUTPATH = "unxlnghppa"; $OUTPATH = "unxlnghppa";
...@@ -550,7 +550,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -550,7 +550,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^alpha/) elsif ($platform =~ m/^alpha/)
{ print "Setting Linux Alpha specific values... "; { print "Setting Linux Alpha specific values... ";
$outfile = "LinuxAlphaEnv.Set"; $outfile = "LinuxAlphaEnv.Set.sh";
$CPU = "L"; $CPU = "L";
$CPUNAME = "AXP"; $CPUNAME = "AXP";
$OUTPATH = "unxlngaxp"; $OUTPATH = "unxlngaxp";
...@@ -560,7 +560,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -560,7 +560,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^arm.*?l-/) elsif ($platform =~ m/^arm.*?l-/)
{ print "Setting Linux ARM specific values... "; { print "Setting Linux ARM specific values... ";
$outfile = "LinuxARMEnv.Set"; $outfile = "LinuxARMEnv.Set.sh";
$CPU = "R"; $CPU = "R";
$CPUNAME = "ARM"; $CPUNAME = "ARM";
$OUTPATH = "unxlngr"; $OUTPATH = "unxlngr";
...@@ -571,7 +571,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -571,7 +571,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^mips/) elsif ($platform =~ m/^mips/)
{ print "Setting Linux MIPS specific values... "; { print "Setting Linux MIPS specific values... ";
$outfile = "LinuxMIPSEnv.Set"; $outfile = "LinuxMIPSEnv.Set.sh";
$CPU = "M"; $CPU = "M";
$CPUNAME = "GODSON"; $CPUNAME = "GODSON";
$OUTPATH = "unxlngmips"; $OUTPATH = "unxlngmips";
...@@ -615,7 +615,7 @@ elsif ( $platform =~ m/linux/ ) ...@@ -615,7 +615,7 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ( $platform =~ m/osf1/ ) elsif ( $platform =~ m/osf1/ )
{ print "Setting Tru64 specific values... "; { print "Setting Tru64 specific values... ";
$outfile = "Tru64AlphaEnv.Set"; $outfile = "Tru64AlphaEnv.Set.sh";
$BIG_SVX = "TRUE"; $BIG_SVX = "TRUE";
$COM = "CXX"; $COM = "CXX";
$COMPATH = '@COMPATH@'; $COMPATH = '@COMPATH@';
...@@ -658,7 +658,7 @@ elsif ( $platform =~ m/cygwin/ ) ...@@ -658,7 +658,7 @@ elsif ( $platform =~ m/cygwin/ )
print "Setting Windows NT cygwin MinGW specific values... "; print "Setting Windows NT cygwin MinGW specific values... ";
$FLIPCMD = "slfl.pl"; $FLIPCMD = "slfl.pl";
$PATH_SEPERATOR = ';'; $PATH_SEPERATOR = ';';
$outfile = "winmingw.set"; $outfile = "winmingw.set.sh";
$COMPATH = PathFormat('@COMPATH@/bin'); $COMPATH = PathFormat('@COMPATH@/bin');
$COMPATH =~ s/\/bin$//i; $COMPATH =~ s/\/bin$//i;
$COM = "GCC"; $COM = "GCC";
...@@ -668,7 +668,7 @@ elsif ( $platform =~ m/cygwin/ ) ...@@ -668,7 +668,7 @@ elsif ( $platform =~ m/cygwin/ )
$ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$PSDK_HOME'.$ds."include".$ds."atl"; $ATL_INCLUDE = '$SOLARVER'.$ds.'$INPATH'.$ds."inc".$ds."external".$ds."mingw".$ds."include".$ds."atl". " ".'$PSDK_HOME'.$ds."include".$ds."atl";
} }
else # The MSVC section starts here else # The MSVC section starts here
{ $outfile = "winenv.set"; { $outfile = "winenv.set.sh";
$COMPATH = PathFormat('@COMPATH@'); $COMPATH = PathFormat('@COMPATH@');
$COM = "MSC"; $COM = "MSC";
$OUTPATH = "wntmsci@COMEX@"; $OUTPATH = "wntmsci@COMEX@";
...@@ -730,7 +730,7 @@ elsif ( $platform =~ m/os2/ ) ...@@ -730,7 +730,7 @@ elsif ( $platform =~ m/os2/ )
$use_shl_versions = "TRUE"; $use_shl_versions = "TRUE";
{ {
print "Setting OS/2 gcc 3.3.5 specific values... \n"; print "Setting OS/2 gcc 3.3.5 specific values... \n";
$outfile = "os2env.set"; $outfile = "os2env.set.sh";
$COM = "GCC"; $COM = "GCC";
$CVER = "C300"; $CVER = "C300";
$OUTPATH = "os2gcci"; $OUTPATH = "os2gcci";
...@@ -755,7 +755,7 @@ elsif ( $platform =~ m/darwin/ ) ...@@ -755,7 +755,7 @@ elsif ( $platform =~ m/darwin/ )
if ($platform =~ m/^powerpc/) if ($platform =~ m/^powerpc/)
{ {
print "Setting values for Mac OS X/Darwin on PowerPC... "; print "Setting values for Mac OS X/Darwin on PowerPC... ";
$outfile = "MacOSXPPCEnv.Set"; $outfile = "MacOSXPPCEnv.Set.sh";
$CPU = "P"; $CPU = "P";
$CPUNAME = "POWERPC"; $CPUNAME = "POWERPC";
$OUTPATH = "unxmacxp"; $OUTPATH = "unxmacxp";
...@@ -763,7 +763,7 @@ elsif ( $platform =~ m/darwin/ ) ...@@ -763,7 +763,7 @@ elsif ( $platform =~ m/darwin/ )
else else
{ {
print "Setting values for Mac OS X/Darwin on default x86... "; print "Setting values for Mac OS X/Darwin on default x86... ";
$outfile = "MacOSXX86Env.Set"; $outfile = "MacOSXX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
$OUTPATH = "unxmacxi"; $OUTPATH = "unxmacxi";
...@@ -783,7 +783,7 @@ elsif ( $platform =~ m/darwin/ ) ...@@ -783,7 +783,7 @@ elsif ( $platform =~ m/darwin/ )
elsif ( $platform =~ m/aix/ ) elsif ( $platform =~ m/aix/ )
{ {
print "Setting AIX PPC specific values... "; print "Setting AIX PPC specific values... ";
$outfile = "aixPPCEnv.Set"; $outfile = "aixPPCEnv.Set.sh";
$CPU = "P"; $CPU = "P";
$CPUNAME = "POWERPC"; $CPUNAME = "POWERPC";
$OUTPATH = "unxaigppc"; $OUTPATH = "unxaigppc";
...@@ -916,9 +916,6 @@ $USR_OPENWIN = $USR.$ds."openwin"; ...@@ -916,9 +916,6 @@ $USR_OPENWIN = $USR.$ds."openwin";
$USR_DT = $USR.$ds."dt"; $USR_DT = $USR.$ds."dt";
$COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common"; $COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common";
# Generate alternate output file for sh?
$outfile_sh = $outfile.".sh";
if ($STLPORT4 ne $no_stl) { if ($STLPORT4 ne $no_stl) {
$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64; $ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64;
$L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64; $L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64;
...@@ -1520,18 +1517,13 @@ print "done\n"; ...@@ -1520,18 +1517,13 @@ print "done\n";
open( OUT, ">$outfile" ) || open( OUT, ">$outfile" ) ||
die "Cannot open $outfile: $!\n"; die "Cannot open $outfile: $!\n";
# Create sh environment file
open( OUT_SH, ">$outfile_sh" ) ||
die "Cannot open $outfile_sh: $!\n";
# #
#------------------------------------------ #------------------------------------------
# VII. Writing the data to the output file. # VII. Writing the data to the output file.
#------------------------------------------ #------------------------------------------
# #
# Write file header. # Write file header.
CreateFileHeader( *OUT, $UPD, $platform, "(t)csh", "#" ); CreateFileHeader( *OUT, $UPD, $platform, "sh/bash/ksh", "#" );
CreateFileHeader( *OUT_SH, $UPD, $platform, "sh/bash/ksh", "#" );
ToFile( "SRC_ROOT", $SRC_ROOT, "e" ); ToFile( "SRC_ROOT", $SRC_ROOT, "e" );
ToFile( "OOO_SHELL", $OOO_SHELL, "e" ); ToFile( "OOO_SHELL", $OOO_SHELL, "e" );
...@@ -2065,10 +2057,8 @@ ToFile( "ENV_SCRIPT", "$outfile", "e" ); ...@@ -2065,10 +2057,8 @@ ToFile( "ENV_SCRIPT", "$outfile", "e" );
# #
# Writing unset variables you might not need to file. # Writing unset variables you might not need to file.
# #
print OUT $unsetvars; print OUT "export $exportvars$newline";
print OUT "unset $unsetvars$newline";
print OUT_SH "export $exportvars$newline";
print OUT_SH "unset $unsetvarssh$newline";
# #
...@@ -2078,8 +2068,6 @@ print OUT_SH "unset $unsetvarssh$newline"; ...@@ -2078,8 +2068,6 @@ print OUT_SH "unset $unsetvarssh$newline";
# #
close( OUT ) || print "Can't close $outfile: $!"; close( OUT ) || print "Can't close $outfile: $!";
close( OUT_SH ) || print "Can't close $outfile_sh: $!";
# #
#------------------------------ #------------------------------
# IX. Sourcing the output file. # IX. Sourcing the output file.
...@@ -2098,11 +2086,6 @@ if (rename( $outfile, $tmp ) ne 1) ...@@ -2098,11 +2086,6 @@ if (rename( $outfile, $tmp ) ne 1)
{ `mv -f $outfile $tmp`; { `mv -f $outfile $tmp`;
} }
$tmp = $SRC_ROOT.$ds.$outfile_sh;
if (rename( $outfile_sh, $tmp ) ne 1)
{ `mv -f $outfile_sh $tmp`;
}
# #
#-------------------------------------------------------- #--------------------------------------------------------
# XII. Message at the end. # XII. Message at the end.
...@@ -2138,7 +2121,7 @@ $bootfile = "bootstrap"; ...@@ -2138,7 +2121,7 @@ $bootfile = "bootstrap";
open( OUT, ">$bootfile" ) || open( OUT, ">$bootfile" ) ||
die "Cannot open $bootfile: $!\n"; die "Cannot open $bootfile: $!\n";
print OUT "#!/bin/sh\n"; print OUT "#!/bin/sh\n";
print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; . $SRC_ROOT/$outfile.sh\n"; print OUT "_ISBOOTSTRAP_=TRUE ; export _ISBOOTSTRAP_ ; . $SRC_ROOT/$outfile\n";
print OUT "unset _ISBOOTSTRAP_; export _ISBOOTSTRAP_\n"; print OUT "unset _ISBOOTSTRAP_; export _ISBOOTSTRAP_\n";
if ( $MINGW eq "yes" ) if ( $MINGW eq "yes" )
{ print OUT 'PATH="/usr/bin:$PATH" : export PATH'."\n"; } { print OUT 'PATH="/usr/bin:$PATH" : export PATH'."\n"; }
...@@ -2242,8 +2225,7 @@ sub CreateFileHeader ...@@ -2242,8 +2225,7 @@ sub CreateFileHeader
# c - comment # c - comment
# n - newline # n - newline
# x - raw, write as is to OUT_BAT # x - raw, write as is to OUT_BAT
# y - raw, write as is to OUT # z - raw, write as is to OUT
# z - raw, write as is to OUT_SH
# Return value: void # Return value: void
#--------------------------------------------------------- #---------------------------------------------------------
sub ToFile { sub ToFile {
...@@ -2251,28 +2233,23 @@ sub ToFile { ...@@ -2251,28 +2233,23 @@ sub ToFile {
# Write an environment variable to file. # Write an environment variable to file.
if (defined $_[ 1 ] && $_[ 1 ] ne "" ) { if (defined $_[ 1 ] && $_[ 1 ] ne "" ) {
my $envvar = $_[ 1 ]; my $envvar = $_[ 1 ];
my $envvarbash = $envvar;
# Tcsh/bash needs backslashes quoted # Tcsh/bash needs backslashes quoted
$envvar =~ s/\\/\\\\/g; $envvar =~ s/\\/\\\\/g;
$envvarbash = $envvar;
printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar) if ( '@VERBOSE@' eq 'TRUE' ); printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $envvar) if ( '@VERBOSE@' eq 'TRUE' );
print OUT "$setenv $_[ 0 ] \"$envvar\"$newline"; # to tcsh file print OUT "$_[ 0 ]=\"$envvar\"$newline"; # to sh file
print OUT_SH "$_[ 0 ]=\"$envvarbash\"$newline"; # to sh file
$exportvars .= " $_[ 0 ]"; # add to export list for sh file $exportvars .= " $_[ 0 ]"; # add to export list for sh file
} else { } else {
printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") if ( '@VERBOSE@' eq 'TRUE' ); printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") if ( '@VERBOSE@' eq 'TRUE' );
$unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file $unsetvars .= " $_[ 0 ]"; # for sh file
$unsetvarssh .= " $_[ 0 ]"; # for sh file
} }
} }
elsif ( $_[ 2 ] eq "a" ) elsif ( $_[ 2 ] eq "a" )
{ # Write an alias to file. { # Write an alias to file.
print "The $_[ 0 ] is set to: $_[ 1 ]\n" if ( '@VERBOSE@' eq 'TRUE' ); # to stdout print "The $_[ 0 ] is set to: $_[ 1 ]\n" if ( '@VERBOSE@' eq 'TRUE' ); # to stdout
print OUT "$_[ 0 ] $_[ 1 ]$newline"; # to tcsh file print OUT "$_[ 0 ]=$_[ 1 ]$newline"; # to sh file
print OUT_SH "$_[ 0 ]=$_[ 1 ]$newline"; # to sh file
} }
elsif ( $_[ 2 ] eq "c" ) elsif ( $_[ 2 ] eq "c" )
{ # Write a comment to file. { # Write a comment to file.
...@@ -2287,25 +2264,15 @@ sub ToFile { ...@@ -2287,25 +2264,15 @@ sub ToFile {
print OUT "$comment$newline"; print OUT "$comment$newline";
print OUT "$comment $_[ 0 ]$newline"; print OUT "$comment $_[ 0 ]$newline";
print OUT "$comment$newline"; print OUT "$comment$newline";
print OUT_SH "$newline";
print OUT_SH "$comment$newline";
print OUT_SH "$comment $_[ 0 ]$newline";
print OUT_SH "$comment$newline";
} }
elsif ( $_[ 2 ] eq "n" ) elsif ( $_[ 2 ] eq "n" )
{ #Write a newline to a file { #Write a newline to a file
print OUT "$newline"; print OUT "$newline";
print OUT_SH "$newline";
}
elsif ( $_[ 2 ] eq "y" )
{
#Write first argument as is, and nothing else
print OUT "$_[ 0 ]$newline";
} }
elsif ( $_[ 2 ] eq "z" ) elsif ( $_[ 2 ] eq "z" )
{ {
#Write first argument as is, and nothing else #Write first argument as is, and nothing else
print OUT_SH "$_[ 0 ]$newline"; print OUT "$_[ 0 ]$newline";
} }
else else
{ print "Unknown type!$newline"; { print "Unknown type!$newline";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment