diff options
| author | Robin Watts <robin.watts@artifex.com> | 2018-07-09 11:15:00 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2018-09-06 13:14:32 +0100 |
| commit | bc1d2d9742c960f1d4905f43810be072c5d92390 (patch) | |
| tree | 92eee1e0df546b5e3c5e463845bc3df88bad4850 /lib | |
| parent | 68eca5e94e6f63f4392b15581ad41af52e0edfd9 (diff) | |
| download | ghostpdl-bc1d2d9742c960f1d4905f43810be072c5d92390.tar.gz | |
Bug 691725: Tweak gssetgs*.bat files.
The existing scripts assume that the gs binaries are on the path.
The tweaked scripts check to see if there is a binary in the same
directory as the .bat file, and if there is, use that in preference
to any version on the path.
Otherwise functionality is identical.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gssetgs.bat | 9 | ||||
| -rw-r--r-- | lib/gssetgs32.bat | 9 | ||||
| -rw-r--r-- | lib/gssetgs64.bat | 9 |
3 files changed, 24 insertions, 3 deletions
diff --git a/lib/gssetgs.bat b/lib/gssetgs.bat index 91aeb3d87..e28056177 100644 --- a/lib/gssetgs.bat +++ b/lib/gssetgs.bat @@ -3,5 +3,12 @@ rem Set default values for GS (gs with graphics window) and GSC rem (console mode gs) if the user hasn't set them. -if %GS%/==/ set GS=gswin32 +if NOT %GS%/==/ goto :gsset +if EXIST %~dp0..\bin\gswin32.exe set GS=%~dp0..\bin\gswin32 +if %GS/==/ set GS=gswin32 +:gsset + +if NOT %GSC%/==/ goto :gscset +if EXIST %~dp0..\bin\gswin32c.exe set GSC=%~dp0..\bin\gswin32c if %GSC%/==/ set GSC=gswin32c +:gscset diff --git a/lib/gssetgs32.bat b/lib/gssetgs32.bat index 91aeb3d87..e28056177 100644 --- a/lib/gssetgs32.bat +++ b/lib/gssetgs32.bat @@ -3,5 +3,12 @@ rem Set default values for GS (gs with graphics window) and GSC rem (console mode gs) if the user hasn't set them. -if %GS%/==/ set GS=gswin32 +if NOT %GS%/==/ goto :gsset +if EXIST %~dp0..\bin\gswin32.exe set GS=%~dp0..\bin\gswin32 +if %GS/==/ set GS=gswin32 +:gsset + +if NOT %GSC%/==/ goto :gscset +if EXIST %~dp0..\bin\gswin32c.exe set GSC=%~dp0..\bin\gswin32c if %GSC%/==/ set GSC=gswin32c +:gscset diff --git a/lib/gssetgs64.bat b/lib/gssetgs64.bat index 083e9273f..4bdd367a8 100644 --- a/lib/gssetgs64.bat +++ b/lib/gssetgs64.bat @@ -3,5 +3,12 @@ rem Set default values for GS (gs with graphics window) and GSC rem (console mode gs) if the user hasn't set them. -if %GS%/==/ set GS=gswin64 +if NOT %GS%/==/ goto :gsset +if EXIST %~dp0..\bin\gswin64.exe set GS=%~dp0..\bin\gswin64 +if %GS/==/ set GS=gswin64 +:gsset + +if NOT %GSC%/==/ goto :gscset +if EXIST %~dp0..\bin\gswin64c.exe set GSC=%~dp0..\bin\gswin64c if %GSC%/==/ set GSC=gswin64c +:gscset |