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

Use Python 3.8 on the Windows buildbot.

Browse Source
This commit is contained in:
David Anderson 2020-08-19 00:39:54 -07:00
parent d49b92603a
commit 9acf2b5cda
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AMBuildScript
View File

@ -667,6 +667,12 @@ class SMConfig(object):
self.ConfigureForExtension(context, binary.compiler) self.ConfigureForExtension(context, binary.compiler)
return binary return binary
if getattr(builder, 'target', None) is not None:
sys.stderr.write("Your output folder was configured for AMBuild 2.1, and SourceMod is now\n")
sys.stderr.write("configured to use AMBuild 2.2. Please remove your output folder and\n")
sys.stderr.write("reconfigure to continue.\n")
os._exit(1)
SM = SMConfig() SM = SMConfig()
SM.detectProductVersion() SM.detectProductVersion()
SM.detectSDKs() SM.detectSDKs()

2
tools/buildbot/bootstrap.pl
View File

@ -74,7 +74,7 @@ if ($argn > 0 && $^O !~ /MSWin/) {
$result = `CC=$ARGV[0] CXX=$ARGV[1] python ../build/configure.py $conf_args`; $result = `CC=$ARGV[0] CXX=$ARGV[1] python ../build/configure.py $conf_args`;
} else { } else {
if ($^O =~ /MSWin/) { if ($^O =~ /MSWin/) {
$result = `C:\\Python27\\Python.exe ..\\build\\configure.py $conf_args`; $result = `C:\\Python38\\Python.exe ..\\build\\configure.py $conf_args`;
} else { } else {
$result = `CC=clang CXX=clang python ../build/configure.py $conf_args`; $result = `CC=clang CXX=clang python ../build/configure.py $conf_args`;
} }

6
tools/buildbot/startbuild.pl
View File

@ -16,7 +16,11 @@ if ($argn > 0) {
$ENV{CXX} = $ARGV[1]; $ENV{CXX} = $ARGV[1];
} }
system("ambuild --no-color 2>&1"); if ($^O !~ /MSWin/) {
system("ambuild --no-color 2>&1");
} else {
system("C:\\Python38\\scripts\\ambuild --no-color 2>&1");
}
if ($? != 0) if ($? != 0)
{ {