Fix helpers module path lookup on newer Perl versions.

(cherry picked from commit 5104549) (cherry picked from commit 3bfd9a1)
alliedmodders · Jun 24, 2022 · 80e8ff0 · 80e8ff0
1 parent d45dd28
commit 80e8ff0
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 65 deletions.
diff --git a/support/buildbot/bootstrap.pl b/support/buildbot/bootstrap.pl
@@ -9,6 +9,8 @@
 my ($myself, $path) = fileparse($0);
 chdir($path);
 
+use FindBin;
+use lib $FindBin::Bin;
 require 'helpers.pm';
 
 #Go back above build dir

diff --git a/support/buildbot/package.pl b/support/buildbot/package.pl
@@ -26,6 +26,8 @@
 my ($myself, $path) = fileparse($0);
 chdir($path);
 
+use FindBin;
+use lib $FindBin::Bin;
 require 'helpers.pm';
 
 #Switch to the output folder.

diff --git a/support/buildbot/startbuild.pl b/support/buildbot/startbuild.pl
@@ -6,6 +6,8 @@
 my ($myself, $path) = fileparse($0);
 chdir($path);
 
+use FindBin;
+use lib $FindBin::Bin;
 require 'helpers.pm';
 
 chdir('../../../OUTPUT');

diff --git a/support/buildbot/symstore.pl b/support/buildbot/symstore.pl
@@ -1,65 +1,67 @@
-#!/usr/bin/perl
-
-use File::Basename;
-
-my ($myself, $path) = fileparse($0);
-chdir($path);
-
-require 'helpers.pm';
-
-chdir('..');
-chdir('..');
-
-open(PDBLOG, '../OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
-
-#Get version info
-my ($version);
-$version = Build::ProductVersion(Build::PathFormat('product.version'));
-$version =~ s/-dev//g;
-$version .= '-git' . Build::GitRevNum('.');
-
-my ($build_type);
-$build_type = Build::GetBuildType(Build::PathFormat('support/buildbot/build_type'));
-
-if ($build_type eq "dev")
-{
-	$build_type = "buildbot";
-}
-elsif ($build_type eq "rel")
-{
-	$build_type = "release";
-}
-
-my ($line);
-while (<PDBLOG>)
-{
-	$line = $_;
-	$line =~ s/\.pdb/\*/;
-	chomp $line;
-	Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s \"S:\\mmsource\" /t \"Metamod:Source\" /v \"$version\" /c \"$build_type\"");
-}
-
-close(PDBLOG);
-
-#Lowercase DLLs.  Sigh.
-my (@files);
-opendir(DIR, "S:\\mmsource") or die "Could not open mmsource symbol folder: $!\n";
-@files = readdir(DIR);
-closedir(DIR);
-
-my ($i, $j, $file, @subdirs);
-for ($i = 0; $i <= $#files; $i++)
-{
-	$file = $files[$i];
-	next unless ($file =~ /\.dll$/);
-	next unless (-d "S:\\mmsource\\$file");
-	opendir(DIR, "S:\\mmsource\\$file") or die "Could not open S:\\mmsource\\$file: $!\n";
-	@subdirs = readdir(DIR);
-	closedir(DIR);
-	for ($j = 0; $j <= $#subdirs; $j++)
-	{
-		next unless ($subdirs[$j] =~ /[A-Z]/);
-		Build::Command("rename S:\\mmsource\\$file\\" . $subdirs[$j] . " " . lc($subdirs[$j]));
-	}	
-}
-
+#!/usr/bin/perl
+
+use File::Basename;
+
+my ($myself, $path) = fileparse($0);
+chdir($path);
+
+use FindBin;
+use lib $FindBin::Bin;
+require 'helpers.pm';
+
+chdir('..');
+chdir('..');
+
+open(PDBLOG, '../OUTPUT/pdblog.txt') or die "Could not open pdblog.txt: $!\n";
+
+#Get version info
+my ($version);
+$version = Build::ProductVersion(Build::PathFormat('product.version'));
+$version =~ s/-dev//g;
+$version .= '-git' . Build::GitRevNum('.');
+
+my ($build_type);
+$build_type = Build::GetBuildType(Build::PathFormat('support/buildbot/build_type'));
+
+if ($build_type eq "dev")
+{
+	$build_type = "buildbot";
+}
+elsif ($build_type eq "rel")
+{
+	$build_type = "release";
+}
+
+my ($line);
+while (<PDBLOG>)
+{
+	$line = $_;
+	$line =~ s/\.pdb/\*/;
+	chomp $line;
+	Build::Command("symstore add /r /f \"..\\OUTPUT\\$line\" /s \"S:\\mmsource\" /t \"Metamod:Source\" /v \"$version\" /c \"$build_type\"");
+}
+
+close(PDBLOG);
+
+#Lowercase DLLs.  Sigh.
+my (@files);
+opendir(DIR, "S:\\mmsource") or die "Could not open mmsource symbol folder: $!\n";
+@files = readdir(DIR);
+closedir(DIR);
+
+my ($i, $j, $file, @subdirs);
+for ($i = 0; $i <= $#files; $i++)
+{
+	$file = $files[$i];
+	next unless ($file =~ /\.dll$/);
+	next unless (-d "S:\\mmsource\\$file");
+	opendir(DIR, "S:\\mmsource\\$file") or die "Could not open S:\\mmsource\\$file: $!\n";
+	@subdirs = readdir(DIR);
+	closedir(DIR);
+	for ($j = 0; $j <= $#subdirs; $j++)
+	{
+		next unless ($subdirs[$j] =~ /[A-Z]/);
+		Build::Command("rename S:\\mmsource\\$file\\" . $subdirs[$j] . " " . lc($subdirs[$j]));
+	}	
+}
+