Skip to content

C
core
Kaydet (Commit) 2d5e44f5 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Drop the $oldoutfile thing, people are used to Env.Host.sh by now surely

üst bedebfcb
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 37 deletions
set_soenv.in
Dosyayı görüntüle @ 2d5e44f5
...@@ -33,7 +33,7 @@ use File::Basename; ...@@ -33,7 +33,7 @@ use File::Basename;
# IIa. Declaring variables for the system commands, etc. # IIa. Declaring variables for the system commands, etc.
#-------------------------------------------------------- #--------------------------------------------------------
# #
my ( $oldoutfile, $outfile, $bootfile, $newline, $comment, my ( $outfile, $bootfile, $newline, $comment,
$ds, $ps, $ds, $ps,
$wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW, $wps, $cur_dir, $par_dir, $I, $L, $tmp, $MINGW,
$platform, $platform,
...@@ -168,10 +168,8 @@ if ( $platform =~ m/solaris/ ) ...@@ -168,10 +168,8 @@ if ( $platform =~ m/solaris/ )
if ($platform =~ m/^i[3456]86/) if ($platform =~ m/^i[3456]86/)
{ {
if ( $CC =~ "gcc") { if ( $CC =~ "gcc") {
$oldoutfile = "SolarisX86GccEnv.Set.sh";
$OUTPATH = "unxsogi"; $OUTPATH = "unxsogi";
} else { } else {
$oldoutfile = "SolarisX86Env.Set.sh";
$OUTPATH = "unxsoli4"; $OUTPATH = "unxsoli4";
} }
$CPU = "I"; $CPU = "I";
...@@ -184,10 +182,8 @@ if ( $platform =~ m/solaris/ ) ...@@ -184,10 +182,8 @@ if ( $platform =~ m/solaris/ )
else else
{ {
if ( $CC =~ "gcc") { if ( $CC =~ "gcc") {
$oldoutfile = "SolarisSparcGccEnv.Set.sh";
$OUTPATH = "unxsogs"; $OUTPATH = "unxsogs";
} else { } else {
$oldoutfile = "SolarisSparcEnv.Set.sh";
$OUTPATH = "unxsols4"; $OUTPATH = "unxsols4";
} }
$CPU = "S"; $CPU = "S";
...@@ -252,7 +248,6 @@ elsif ( $platform =~ m/netbsd/ ) ...@@ -252,7 +248,6 @@ elsif ( $platform =~ m/netbsd/ )
$OS = "NETBSD"; $OS = "NETBSD";
$PATH_SEPERATOR = $ps; $PATH_SEPERATOR = $ps;
$OUTPATH = "unxnbsd"; $OUTPATH = "unxnbsd";
$oldoutfile = "NetBSDEnv.Set.sh";
$INPATH = $OUTPATH.$PROEXT; $INPATH = $OUTPATH.$PROEXT;
} }
elsif ( $platform =~ m/kfreebsd/ ) elsif ( $platform =~ m/kfreebsd/ )
...@@ -268,7 +263,6 @@ elsif ( $platform =~ m/kfreebsd/ ) ...@@ -268,7 +263,6 @@ 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... ";
$oldoutfile = "GNUkFreeBSDX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
$OUTPATH = "unxkfgi6"; $OUTPATH = "unxkfgi6";
...@@ -280,7 +274,6 @@ elsif ( $platform =~ m/kfreebsd/ ) ...@@ -280,7 +274,6 @@ 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... ";
$oldoutfile = "GNUkFreeBSDX86-64Env.Set.sh";
$CPU = "X"; $CPU = "X";
$CPUNAME = "X86_64"; $CPUNAME = "X86_64";
$OUTPATH = "unxkfgx6"; $OUTPATH = "unxkfgx6";
...@@ -301,7 +294,6 @@ elsif ( $platform =~ m/freebsd/ ) ...@@ -301,7 +294,6 @@ elsif ( $platform =~ m/freebsd/ )
$PATH_SEPERATOR = $ps; $PATH_SEPERATOR = $ps;
$OSVERSION = '@OSVERSION@'; $OSVERSION = '@OSVERSION@';
$OUTPATH = 'unxfbsd'; $OUTPATH = 'unxfbsd';
$oldoutfile = 'FreeBSDEnv.Set.sh';
if ($platform =~ m/^(amd64|x86_64)/) if ($platform =~ m/^(amd64|x86_64)/)
{ my ( $JAVA_OS ); { my ( $JAVA_OS );
print "Setting FreeBSD AMD64 specific values... "; print "Setting FreeBSD AMD64 specific values... ";
...@@ -344,7 +336,6 @@ elsif ( $platform =~ m/openbsd/ ) ...@@ -344,7 +336,6 @@ elsif ( $platform =~ m/openbsd/ )
$PATH_SEPERATOR = $ps; $PATH_SEPERATOR = $ps;
$OSVERSION = '@OSVERSION@'; $OSVERSION = '@OSVERSION@';
$OUTPATH = "unxobsd"; $OUTPATH = "unxobsd";
$oldoutfile = "OpenBSDEnv.Set.sh";
if ($platform =~ m/^(amd64|x86_64)/) if ($platform =~ m/^(amd64|x86_64)/)
{ {
print "Setting OpenBSD AMD64 specific values... "; print "Setting OpenBSD AMD64 specific values... ";
...@@ -381,7 +372,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -381,7 +372,6 @@ 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... ";
$oldoutfile = "LinuxX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
...@@ -406,7 +396,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -406,7 +396,6 @@ 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... ";
$oldoutfile = "LinuxX86-64Env.Set.sh";
$CPU = "X"; $CPU = "X";
$CPUNAME = "X86_64"; $CPUNAME = "X86_64";
$OUTPATH = "unxlngx6"; $OUTPATH = "unxlngx6";
...@@ -418,7 +407,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -418,7 +407,6 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^ia64/) elsif ($platform =~ m/^ia64/)
{ print "Setting Linux ia64 specific values... "; { print "Setting Linux ia64 specific values... ";
$oldoutfile = "LinuxIA64Env.Set.sh";
$CPU = "A"; $CPU = "A";
$CPUNAME = "IA64"; $CPUNAME = "IA64";
$OUTPATH = "unxlnga"; $OUTPATH = "unxlnga";
...@@ -429,7 +417,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -429,7 +417,6 @@ elsif ( $platform =~ m/linux/ )
elsif ($platform =~ m/^sparc/) elsif ($platform =~ m/^sparc/)
{ print "Setting Linux Sparc specific values... "; { print "Setting Linux Sparc specific values... ";
$oldoutfile = "LinuxSparcEnv.Set.sh";
$CPU = "S"; $CPU = "S";
$CPUNAME = "SPARC"; $CPUNAME = "SPARC";
$OUTPATH = "unxlngs"; $OUTPATH = "unxlngs";
...@@ -441,7 +428,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -441,7 +428,6 @@ 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... ";
$oldoutfile = "LinuxPPC64Env.Set.sh";
$OUTPATH = "unxlngppc64"; $OUTPATH = "unxlngppc64";
$CPUNAME = "POWERPC64"; $CPUNAME = "POWERPC64";
...@@ -459,7 +445,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -459,7 +445,6 @@ elsif ( $platform =~ m/linux/ )
} }
else { else {
print "Setting Linux PPC specific values... "; print "Setting Linux PPC specific values... ";
$oldoutfile = "LinuxPPCEnv.Set.sh";
$OUTPATH = "unxlngppc"; $OUTPATH = "unxlngppc";
$CPUNAME = "POWERPC"; $CPUNAME = "POWERPC";
...@@ -487,14 +472,12 @@ elsif ( $platform =~ m/linux/ ) ...@@ -487,14 +472,12 @@ 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... ";
$oldoutfile = "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... ";
$oldoutfile = "LinuxS390Env.Set.sh";
$CPUNAME = "S390"; $CPUNAME = "S390";
$ARCH = "s390"; $ARCH = "s390";
$OUTPATH = "unxlngs390"; $OUTPATH = "unxlngs390";
...@@ -506,7 +489,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -506,7 +489,6 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^m68k/) elsif ($platform =~ m/^m68k/)
{ print "Setting Linux m68k specific values... "; { print "Setting Linux m68k specific values... ";
$oldoutfile = "LinuxM68KEnv.Set.sh";
$CPU = "6"; $CPU = "6";
$CPUNAME = "M68K"; $CPUNAME = "M68K";
$OUTPATH = "unxlngm68k"; $OUTPATH = "unxlngm68k";
...@@ -516,7 +498,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -516,7 +498,6 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^hppa/) elsif ($platform =~ m/^hppa/)
{ print "Setting Linux hppa specific values... "; { print "Setting Linux hppa specific values... ";
$oldoutfile = "LinuxHPPAEnv.Set.sh";
$CPU = "H"; $CPU = "H";
$CPUNAME = "HPPA"; $CPUNAME = "HPPA";
$OUTPATH = "unxlnghppa"; $OUTPATH = "unxlnghppa";
...@@ -527,7 +508,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -527,7 +508,6 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^alpha/) elsif ($platform =~ m/^alpha/)
{ print "Setting Linux Alpha specific values... "; { print "Setting Linux Alpha specific values... ";
$oldoutfile = "LinuxAlphaEnv.Set.sh";
$CPU = "L"; $CPU = "L";
$CPUNAME = "AXP"; $CPUNAME = "AXP";
$OUTPATH = "unxlngaxp"; $OUTPATH = "unxlngaxp";
...@@ -537,7 +517,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -537,7 +517,6 @@ 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... ";
$oldoutfile = "LinuxARMEnv.Set.sh";
$CPU = "R"; $CPU = "R";
$CPUNAME = "ARM"; $CPUNAME = "ARM";
$OUTPATH = "unxlngr"; $OUTPATH = "unxlngr";
...@@ -550,7 +529,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -550,7 +529,6 @@ elsif ( $platform =~ m/linux/ )
{ print "Setting Android ARM specific values... "; { print "Setting Android ARM specific values... ";
$GUIBASE = "android"; $GUIBASE = "android";
$OS = "ANDROID"; $OS = "ANDROID";
$oldoutfile = "AndroidARMEnv.Set.sh";
$CPU = "R"; $CPU = "R";
$CPUNAME = "ARM"; $CPUNAME = "ARM";
$OUTPATH = "unxandr"; $OUTPATH = "unxandr";
...@@ -561,7 +539,6 @@ elsif ( $platform =~ m/linux/ ) ...@@ -561,7 +539,6 @@ elsif ( $platform =~ m/linux/ )
} }
elsif ($platform =~ m/^mips/) elsif ($platform =~ m/^mips/)
{ print "Setting Linux MIPS specific values... "; { print "Setting Linux MIPS specific values... ";
$oldoutfile = "LinuxMIPSEnv.Set.sh";
$CPU = "M"; $CPU = "M";
$CPUNAME = "GODSON"; $CPUNAME = "GODSON";
$OUTPATH = "unxlngmips"; $OUTPATH = "unxlngmips";
...@@ -629,7 +606,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ ) ...@@ -629,7 +606,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
die 'For building natively on Windows we support only MSVC' if ('@build_os@' eq 'cygwin'); die 'For building natively on Windows we support only MSVC' if ('@build_os@' eq 'cygwin');
$PATH_SEPERATOR = ':'; $PATH_SEPERATOR = ':';
$oldoutfile = "WindowsMinGWEnv.Set.sh";
$COMPATH = PathFormat('@COMPATH@/bin'); $COMPATH = PathFormat('@COMPATH@/bin');
$COMPATH =~ s/\/bin$//i; $COMPATH =~ s/\/bin$//i;
$COM = "GCC"; $COM = "GCC";
...@@ -639,7 +615,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ ) ...@@ -639,7 +615,6 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
} }
else # The MSVC section starts here else # The MSVC section starts here
{ print "Setting Windows (MSVC) specific values... "; { print "Setting Windows (MSVC) specific values... ";
$oldoutfile = "WindowsMSVCEnv.Set.sh";
$COMPATH = PathFormat('@COMPATH@'); $COMPATH = PathFormat('@COMPATH@');
$COM = "MSC"; $COM = "MSC";
$OUTPATH = "wntmsci@COMEX@"; $OUTPATH = "wntmsci@COMEX@";
...@@ -671,7 +646,6 @@ elsif ( $platform =~ m/darwin/ ) ...@@ -671,7 +646,6 @@ elsif ( $platform =~ m/darwin/ )
if ($platform =~ m/^arm/) if ($platform =~ m/^arm/)
{ {
print "Setting values for iOS... "; print "Setting values for iOS... ";
$oldoutfile = "iOSEnv.Set.sh";
$CPU = "R"; $CPU = "R";
$CPUNAME = "ARM"; $CPUNAME = "ARM";
$OUTPATH = "unxiosr"; $OUTPATH = "unxiosr";
...@@ -682,7 +656,6 @@ elsif ( $platform =~ m/darwin/ ) ...@@ -682,7 +656,6 @@ elsif ( $platform =~ m/darwin/ )
elsif ($platform =~ m/^powerpc/) elsif ($platform =~ m/^powerpc/)
{ {
print "Setting values for Mac OS X/Darwin on PowerPC... "; print "Setting values for Mac OS X/Darwin on PowerPC... ";
$oldoutfile = "MacOSXPPCEnv.Set.sh";
$CPU = "P"; $CPU = "P";
$CPUNAME = "POWERPC"; $CPUNAME = "POWERPC";
$OUTPATH = "unxmacxp"; $OUTPATH = "unxmacxp";
...@@ -695,7 +668,6 @@ elsif ( $platform =~ m/darwin/ ) ...@@ -695,7 +668,6 @@ 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... ";
$oldoutfile = "MacOSXX86Env.Set.sh";
$CPU = "I"; $CPU = "I";
$CPUNAME = "INTEL"; $CPUNAME = "INTEL";
$OUTPATH = "unxmacxi"; $OUTPATH = "unxmacxi";
...@@ -738,13 +710,11 @@ elsif ( $platform =~ m/dragonfly/ ) ...@@ -738,13 +710,11 @@ elsif ( $platform =~ m/dragonfly/ )
$OS = "DRAGONFLY"; $OS = "DRAGONFLY";
$PATH_SEPERATOR = $ps; $PATH_SEPERATOR = $ps;
$OUTPATH = "unxdfly"; $OUTPATH = "unxdfly";
$oldoutfile = "DragonFlyEnv.Set.sh";
$INPATH = $OUTPATH.$PROEXT; $INPATH = $OUTPATH.$PROEXT;
} }
elsif ( $platform =~ m/aix/ ) elsif ( $platform =~ m/aix/ )
{ {
print "Setting AIX PPC specific values... "; print "Setting AIX PPC specific values... ";
$oldoutfile = "aixPPCEnv.Set.sh";
$CPU = "P"; $CPU = "P";
$CPUNAME = "POWERPC"; $CPUNAME = "POWERPC";
$OUTPATH = "unxaigppc"; $OUTPATH = "unxaigppc";
...@@ -1353,12 +1323,6 @@ else ...@@ -1353,12 +1323,6 @@ else
# VI. Open the output file. # VI. Open the output file.
#-------------------------- #--------------------------
# #
if (-f $SRC_ROOT.$ds.$oldoutfile) {
print "****\n";
print "**** Note: There is no $oldoutfile any more. Now it is just called Env.Host.sh\n";
print "****\n";
unlink($SRC_ROOT.$ds.$oldoutfile);
}
$outfile = 'Env.Host.sh'; $outfile = 'Env.Host.sh';
open( OUT, ">$SRC_ROOT/$outfile" ) || open( OUT, ">$SRC_ROOT/$outfile" ) ||
......
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