UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated buildbot scripts to support clang builders.

Browse Source
This commit is contained in:
Scott Ehlert 2011-05-01 00:17:11 -05:00
parent 7e514f5d34
commit b63b94bc81
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

@ -155,6 +155,8 @@ class SM:
#Platform-specifics #Platform-specifics
if AMBuild.target['platform'] == 'linux': if AMBuild.target['platform'] == 'linux':
self.compiler.AddToListVar('CDEFINES', '_LINUX') self.compiler.AddToListVar('CDEFINES', '_LINUX')
if self.vendor == 'clang':
self.compiler.AddToListVar('POSTLINKFLAGS', '-lgcc_eh')
elif AMBuild.target['platform'] == 'darwin': elif AMBuild.target['platform'] == 'darwin':
self.compiler.AddToListVar('CFLAGS', ['-isysroot', self.compiler.AddToListVar('CFLAGS', ['-isysroot',
'/Developer/SDKs/MacOSX10.5.sdk']) '/Developer/SDKs/MacOSX10.5.sdk'])

17
tools/buildbot/bootstrap.pl
View File

@ -43,14 +43,19 @@ 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 ($^O eq "linux") { if ($argn > 0 && $^O !~ /MSWin/) {
$result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`; $result = `CC=$ARGV[0] CXX=$ARGV[0] python3.1 ../build/configure.py --enable-optimize`;
} elsif ($^O eq "darwin") {
$result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
} else { } else {
$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`; if ($^O eq "linux") {
$result = `CC=gcc-4.1 CXX=gcc-4.1 python3.1 ../build/configure.py --enable-optimize`;
} elsif ($^O eq "darwin") {
$result = `CC=gcc-4.2 CXX=gcc-4.2 python3.1 ../build/configure.py --enable-optimize`;
} else {
$result = `C:\\Python31\\Python.exe ..\\build\\configure.py --enable-optimize`;
}
} }
print "$result\n"; print "$result\n";
if ($? != 0) { if ($? != 0) {

8
tools/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 = 'sourcemod-' . $version; $filename = 'sourcemod-' . $version;
if ($^O eq "linux") if ($^O eq "linux")