diff --git a/tools/buildbot/bootstrap.pl b/tools/buildbot/bootstrap.pl index e1801ddd..9cb2b585 100755 --- a/tools/buildbot/bootstrap.pl +++ b/tools/buildbot/bootstrap.pl @@ -57,7 +57,12 @@ if ($^O eq "linux") Build::Command("flip -u tools/versionchanger.pl"); Build::Command("chmod +x tools/versionchanger.pl"); } -Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); +my ($build_type); +$build_type = Build::GetBuildType(Build::PathFormat('tools/buildbot/build_type')); +if ($build_type == "dev") +{ + Build::Command(Build::PathFormat('tools/versionchanger.pl') . ' --buildstring="-dev"'); +} #Bootstrap extensions that have complex dependencies diff --git a/tools/buildbot/build_type b/tools/buildbot/build_type new file mode 100644 index 00000000..38f8e886 --- /dev/null +++ b/tools/buildbot/build_type @@ -0,0 +1 @@ +dev diff --git a/tools/buildbot/helpers.pm b/tools/buildbot/helpers.pm index 704a7b17..c30bbd5c 100644 --- a/tools/buildbot/helpers.pm +++ b/tools/buildbot/helpers.pm @@ -142,4 +142,15 @@ sub SVN_Add chdir($dir); } +sub GetBuildType +{ + my ($file)=(@_); + my ($type); + open(TYPE, $file) or die("Could not open file: $!\n"); + $type = ; + close(TYPE); + chomp $type; + return $type; +} + return 1; diff --git a/tools/buildbot/symstore.pl b/tools/buildbot/symstore.pl index 21067700..9c2369c0 100755 --- a/tools/buildbot/symstore.pl +++ b/tools/buildbot/symstore.pl @@ -22,13 +22,25 @@ my ($version); $version = Build::ProductVersion(Build::PathFormat('product.version')); $version .= '-hg' . Build::HgRevNum('.'); +my ($build_type); +$build_type = Build::GetBuildType(Build::PathFormat('tools/buildbot/build_type')); + +if ($build_type == "dev") +{ + $build_type = "buildbot"; +} +elsif ($build_type == "rel") +{ + $build_type = "release"; +} + my ($line); while () { $line = $_; $line =~ s/\.pdb/\*/; chomp $line; - Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"buildbot\""); + Build::Command("symstore add /r /f \"$line\" /s ..\\..\\symstore /t \"SourceMod\" /v \"$version\" /c \"$build_type\""); } close(PDBLOG);