summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2022-09-05 19:26:00 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2022-09-05 19:26:00 +0000
commit71b44089a400cb95737e9d6434c0f8ddaeb731ee (patch)
tree8c1a4fe5891044f9302637c2d9898218caa18066
parent74cc2173608e141854ec12ee77e84f48fad6fd37 (diff)
Adjustments on w32 for added 64-bit Ghostscript
git-svn-id: svn://tug.org/texlive/trunk@64296 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/bin/win32/runscript.tlu14
-rwxr-xr-xMaster/texmf-dist/scripts/epstopdf/epstopdf.pl16
2 files changed, 22 insertions, 8 deletions
diff --git a/Master/bin/win32/runscript.tlu b/Master/bin/win32/runscript.tlu
index 2ec625c9ed0..58ea0c4742d 100755
--- a/Master/bin/win32/runscript.tlu
+++ b/Master/bin/win32/runscript.tlu
@@ -712,12 +712,18 @@ else
..TEXDIR..'/tlpkg/tlgs/Resource;'
..TEXDIR..'/tlpkg/tlgs/kanji;'
..os.getenv('WINDIR')..'/Fonts;'..TEXMFDIST..'/fonts')
- os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll')
- GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe'
- GSNAME = 'gswin32c.exe'
- GSDIR = TEXDIR..'/tlpkg/tlgs/bin'
+ if is_64bit_windows_os() then
+ os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll64.dll')
+ GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin64c.exe'
+ GSNAME = 'gswin64c.exe'
+ else
+ os.setenv('GS_DLL', TEXDIR..'/tlpkg/tlgs/bin/gsdll32.dll')
+ GSEXE = TEXDIR..'/tlpkg/tlgs/bin/gswin32c.exe'
+ GSNAME = 'gswin32c.exe'
+ end
end
-- now setup the path so that the gs program will be found
+GSDIR = TEXDIR..'/tlpkg/tlgs/bin'
PATH = prepend_path(PATH, GSDIR, BINDIR)
os.setenv('PATH', PATH);
diff --git a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
index 43ce79e5206..a84ec10097f 100755
--- a/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
+++ b/Master/texmf-dist/scripts/epstopdf/epstopdf.pl
@@ -35,7 +35,8 @@
#
# emacs-page
#
-my $ver = "2.29";
+my $ver = "2.30";
+# 2022/09/05 v2.30 (Siep Kroonenberg)
# 2022/08/29 v2.29 (Karl Berry)
# 2018/09/17 v2.28 (Karl Berry)
# * use gswin64c on 64-bit Windows.
@@ -207,11 +208,18 @@ my $on_windows_or_cygwin = $on_windows || $^O eq "cygwin";
### ghostscript command name
my $GS = "gs";
if ($on_windows) {
+ $GS = "gswin32c";
if ($ENV{"PROCESSOR_ARCHITECTURE"} eq "AMD64"
|| $ENV{"PROCESSOR_ARCHITEW6432"} eq "AMD64") {
- $GS = "gswin64c";
- } else {
- $GS = "gswin32c";
+ # prefer gswin64c.exe if on searchpath
+ my @pdirs = split( /;/, $ENV{"PATH"});
+ foreach $d (@pdirs) {
+ $d = substr ($d, 1, -1) if (substr ($d,1,1) eq '"');
+ if (-f $d . "/gswin64c.exe") {
+ $GS = "gswin64c";
+ last;
+ }
+ }
}
}