source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-09 03:18:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated buildbot scripts to support clang builders (bug 4897, r=dvander).

Browse Source
This commit is contained in:
Scott Ehlert 2011-04-30 22:41:54 -05:00
parent 8c6aa2f62c
commit 699de95eb7
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AMBuildScript
View File

@ -100,6 +100,8 @@ class MMS:
self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H') self.compiler.AddToListVar('CDEFINES', 'HAVE_STDINT_H')
if self.vendor == 'gcc': if self.vendor == 'gcc':
self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse') self.compiler.AddToListVar('CFLAGS', '-mfpmath=sse')
else:
self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh')
elif isinstance(cxx, Cpp.MSVC): elif isinstance(cxx, Cpp.MSVC):
self.vendor = 'msvc' self.vendor = 'msvc'
if AMBuild.options.debug == '1': if AMBuild.options.debug == '1':

7
support/buildbot/bootstrap.pl
View File

@ -43,8 +43,12 @@ if ($reconf) {
rmtree('OUTPUT'); rmtree('OUTPUT');
mkdir('OUTPUT') or die("Failed to create output folder: $!\n"); mkdir('OUTPUT') or die("Failed to create output folder: $!\n");
chdir('OUTPUT'); chdir('OUTPUT');
my ($result); my ($result, $argn);
$argn = $#ARGV + 1;
print "Attempting to reconfigure...\n"; print "Attempting to reconfigure...\n";
if ($argn > 0 && $^O !~ /MSWin/) {
$result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`;
} else {
if ($^O eq "linux") { if ($^O eq "linux") {
$result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`; $result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`;
} elsif ($^O eq "darwin") { } elsif ($^O eq "darwin") {
@ -52,6 +56,7 @@ if ($reconf) {
} else { } else {
$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`; $result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
} }
}
print "$result\n"; print "$result\n";
if ($? != 0) { if ($? != 0) {
die('Could not configure!'); die('Could not configure!');

8
support/buildbot/package.pl
View File

@ -5,9 +5,10 @@ use Cwd;
use File::Basename; use File::Basename;
use Net::FTP; use Net::FTP;
my ($ftp_file, $ftp_host, $ftp_user, $ftp_pass, $ftp_path); my ($ftp_file, $ftp_host, $ftp_user, $ftp_pass, $ftp_path, $tag);
$ftp_file = shift; $ftp_file = shift;
$tag = shift;
open(FTP, $ftp_file) or die "Unable to read FTP config file $ftp_file: $!\n"; open(FTP, $ftp_file) or die "Unable to read FTP config file $ftp_file: $!\n";
$ftp_host = <FTP>; $ftp_host = <FTP>;
@ -49,6 +50,11 @@ else
$version .= '-' . $^O; $version .= '-' . $^O;
} }
if (defined $tag)
{
$version .= '-' . $tag;
}
my ($filename); my ($filename);
$filename = 'mmsource-' . $version; $filename = 'mmsource-' . $version;
if ($^O eq "linux") if ($^O eq "linux")