mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-30 19:00:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Turn install.bat into a pure one line wrapper fort he perl script.

Browse Source 
Build.bat and vcregress.bat got similar treatment years ago. I'm not sure
why install.bat wasn't treated at the same time, but it seems like a good
idea anyway.

The immediate problem with the old install.bat was that it had quoting
issues, and wouldn't work if the target directory's name contained spaces.
This fixes that problem.
This commit is contained in:
Heikki Linnakangas 2015-07-06 22:18:26 +03:00
parent 8e33fc1784
commit 6c534fd685
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/tools/msvc/install.bat
View File

@ -1,27 +1,6 @@
@echo off
REM src/tools/msvc/install.bat
if NOT "%1"=="" GOTO RUN_INSTALL
echo Invalid command line options.
echo Usage: "install.bat <path>"
echo.
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit 1
exit /b 1
:RUN_INSTALL
SETLOCAL
IF NOT EXIST buildenv.pl goto nobuildenv
perl -e "require 'buildenv.pl'; while(($k,$v) = each %%ENV) { print qq[\@SET $k=$v\n]; }" > bldenv.bat
CALL bldenv.bat
del bldenv.bat
:nobuildenv
perl install.pl "%1" %2
REM exit fix for pre-2003 shell especially if used on buildfarm
if "%XP_EXIT_FIX%" == "yes" exit %ERRORLEVEL%
exit /b %ERRORLEVEL%
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 %*

13
src/tools/msvc/install.pl
View File

@ -8,6 +8,19 @@ use warnings;
use Install qw(Install);
# buildenv.pl is for specifying the build environment settings
# it should contain lines like:
# $ENV{PATH} = "c:/path/to/bison/bin;$ENV{PATH}";
if (-e "src/tools/msvc/buildenv.pl")
{
require "src/tools/msvc/buildenv.pl";
}
elsif (-e "./buildenv.pl")
{
require "./buildenv.pl";
}
my $target = shift || Usage();
my $insttype = shift;
Install($target, $insttype);