From d897361c7567ada5d11e3ee40e29a947264e3ecf Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Fri, 7 Jan 2022 16:07:45 -0500 Subject: [PATCH] Allow MSVC .bat wrappers to be called from anywhere Instead of using a hardcoded or default path to the perl file the .bat file is a wrapper for, we use a path that means the file is found in the same directory as the .bat file. Patch by Anton Voloshin, slightly tweaked by me. Backpatch to all live branches Discussion: https://postgr.es/m/2b7a674b-5fb0-d264-75ef-ecc7a31e54f8@postgrespro.ru --- src/tools/msvc/build.bat | 2 +- src/tools/msvc/install.bat | 2 +- src/tools/msvc/pgbison.bat | 2 +- src/tools/msvc/pgflex.bat | 2 +- src/tools/msvc/vcregress.bat | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/msvc/build.bat b/src/tools/msvc/build.bat index 4001ac1d0d1..171f7498e2f 100755 --- a/src/tools/msvc/build.bat +++ b/src/tools/msvc/build.bat @@ -3,4 +3,4 @@ REM src/tools/msvc/build.bat REM all the logic for this now belongs in build.pl. This file really REM only exists so you don't have to type "perl build.pl" REM Resist any temptation to add any logic here. -@perl build.pl %* +@perl %~dp0/build.pl %* diff --git a/src/tools/msvc/install.bat b/src/tools/msvc/install.bat index d03277eff2b..d02b80826b7 100644 --- a/src/tools/msvc/install.bat +++ b/src/tools/msvc/install.bat @@ -3,4 +3,4 @@ REM src/tools/msvc/install.bat REM all the logic for this now belongs in install.pl. This file really REM only exists so you don't have to type "perl install.pl" REM Resist any temptation to add any logic here. -@perl install.pl %* +@perl %~dp0/install.pl %* diff --git a/src/tools/msvc/pgbison.bat b/src/tools/msvc/pgbison.bat index d976750c9c7..dc8ac4a2cf2 100755 --- a/src/tools/msvc/pgbison.bat +++ b/src/tools/msvc/pgbison.bat @@ -4,4 +4,4 @@ REM src/tools/msvc/pgbison.bat REM all the logic for this now belongs in pgbison.pl. This file really REM only exists so you don't have to type "perl src/tools/msvc/pgbison.pl" REM Resist any temptation to add any logic here. -@perl src/tools/msvc/pgbison.pl %* +@perl %~dp0/pgbison.pl %* diff --git a/src/tools/msvc/pgflex.bat b/src/tools/msvc/pgflex.bat index 3c7afe9c317..f20834ba9b1 100755 --- a/src/tools/msvc/pgflex.bat +++ b/src/tools/msvc/pgflex.bat @@ -4,4 +4,4 @@ REM src/tools/msvc/pgflex.bat REM all the logic for this now belongs in pgflex.pl. This file really REM only exists so you don't have to type "perl src/tools/msvc/pgflex.pl" REM Resist any temptation to add any logic here. -@perl src/tools/msvc/pgflex.pl %* +@perl %~dp0/pgflex.pl %* diff --git a/src/tools/msvc/vcregress.bat b/src/tools/msvc/vcregress.bat index a981d3a6aa1..7fba45c1e77 100644 --- a/src/tools/msvc/vcregress.bat +++ b/src/tools/msvc/vcregress.bat @@ -3,4 +3,4 @@ REM src/tools/msvc/vcregress.bat REM all the logic for this now belongs in vcregress.pl. This file really REM only exists so you don't have to type "perl vcregress.pl" REM Resist any temptation to add any logic here. -@perl vcregress.pl %* +@perl %~dp0/vcregress.pl %*