summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2023-02-20 12:26:39 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2023-02-20 12:26:39 +0000
commit81765705219670c136c25ad8c26d9ba39ced2b56 (patch)
tree5d91940f01a647f7d049b2e78c47d29083951b6d /Master/tlpkg
parent04e398adab268585f8e0fa76d587ab5d5a475dc2 (diff)
Transition 32-bit => 64-bit for Windows; tlpostcode
git-svn-id: svn://tug.org/texlive/trunk@65953 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/tlpostcode/dvipdfmx.pl2
-rw-r--r--Master/tlpkg/tlpostcode/haranoaji-tlpost.pl4
-rw-r--r--Master/tlpkg/tlpostcode/ptex-fontmaps-tlpost.pl4
-rw-r--r--Master/tlpkg/tlpostcode/ptex2pdf-tlpost.pl10
-rw-r--r--Master/tlpkg/tlpostcode/xetex.pl20
5 files changed, 20 insertions, 20 deletions
diff --git a/Master/tlpkg/tlpostcode/dvipdfmx.pl b/Master/tlpkg/tlpostcode/dvipdfmx.pl
index 5fe1cece4e8..60071f1da32 100644
--- a/Master/tlpkg/tlpostcode/dvipdfmx.pl
+++ b/Master/tlpkg/tlpostcode/dvipdfmx.pl
@@ -15,7 +15,7 @@ BEGIN {
# make Perl find our packages first:
unshift (@INC, "$texdir/tlpkg");
}
-use TeXLive::TLUtils qw(win32 mkdirhier conv_to_w32_path log info);
+use TeXLive::TLUtils qw(wndws mkdirhier conv_to_w32_path log info);
if ($mode eq 'install') {
do_install();
diff --git a/Master/tlpkg/tlpostcode/haranoaji-tlpost.pl b/Master/tlpkg/tlpostcode/haranoaji-tlpost.pl
index 1d5ee0e4cf4..5bf86bfdeea 100644
--- a/Master/tlpkg/tlpostcode/haranoaji-tlpost.pl
+++ b/Master/tlpkg/tlpostcode/haranoaji-tlpost.pl
@@ -39,7 +39,7 @@ use Encode;
my $verbose = 0;
-if (win32 ()) {
+if (wndws ()) {
# These packages are not necessarily available on non-Windows, so
# read them at runtime instead of compile time.
require Encode::Locale;
@@ -282,7 +282,7 @@ sub remove_snippet {
}
# Check Windows environment
-sub win32 { return ($^O=~/^MSWin(32|64)$/i); }
+sub wndws { return ($^O=~/^MSWin(32|64)$/i); }
# Log
sub my_log {
diff --git a/Master/tlpkg/tlpostcode/ptex-fontmaps-tlpost.pl b/Master/tlpkg/tlpostcode/ptex-fontmaps-tlpost.pl
index fbc56bbd432..f1470889aad 100644
--- a/Master/tlpkg/tlpostcode/ptex-fontmaps-tlpost.pl
+++ b/Master/tlpkg/tlpostcode/ptex-fontmaps-tlpost.pl
@@ -39,7 +39,7 @@ use Encode;
my $verbose = 0;
-if (win32 ()) {
+if (wndws ()) {
# These packages are not necessarily available on non-Windows, so
# read them at runtime instead of compile time.
require Encode::Locale;
@@ -159,7 +159,7 @@ sub remove_cmap {
}
# Check Windows environment
-sub win32 { return ($^O=~/^MSWin(32|64)$/i); }
+sub wndws { return ($^O=~/^MSWin(32|64)$/i); }
# Log
sub my_log {
diff --git a/Master/tlpkg/tlpostcode/ptex2pdf-tlpost.pl b/Master/tlpkg/tlpostcode/ptex2pdf-tlpost.pl
index aa2a330bf69..014d3c768cd 100644
--- a/Master/tlpkg/tlpostcode/ptex2pdf-tlpost.pl
+++ b/Master/tlpkg/tlpostcode/ptex2pdf-tlpost.pl
@@ -32,7 +32,7 @@ BEGIN {
unshift (@INC, "$texdir/tlpkg");
}
-use TeXLive::TLUtils qw(win32 mkdirhier conv_to_w32_path
+use TeXLive::TLUtils qw(wndws mkdirhier conv_to_w32_path
debug ddebug log info tlwarn);
@@ -159,7 +159,7 @@ my %original = (
);
$::lang = "C";
-if (TeXLive::TLUtils::win32()) {
+if (TeXLive::TLUtils::wndws()) {
require TeXLive::TLWinGoo;
}
require("TeXLive/trans.pl");
@@ -231,7 +231,7 @@ sub do_install {
my $toolsdir;
my $tugdir;
my $inifile;
- if (win32()) {
+ if (wndws()) {
# we assume TeXworks from TL, thus IniFormat
chomp( my $twini = `kpsewhich -var-value=TW_INIPATH` ) ;
$toolsdir = "$twini/configuration";
@@ -316,7 +316,7 @@ sub do_install {
for my $t (sort keys %original) {
my $id = sprintf("%03d", ++$highest_entry);
$entries{$id} = $original{$t};
- if (win32()) {
+ if (wndws()) {
$entries{$id}{'program'} .= ".exe";
}
}
@@ -326,7 +326,7 @@ sub do_install {
for my $t (sort keys %ptex2pdf) {
my $id = sprintf("%03d", ++$highest_entry);
$entries{$id} = $ptex2pdf{$t};
- if (win32()) {
+ if (wndws()) {
$entries{$id}{'program'} .= ".exe";
}
}
diff --git a/Master/tlpkg/tlpostcode/xetex.pl b/Master/tlpkg/tlpostcode/xetex.pl
index 4a28008bb1a..7b691425175 100644
--- a/Master/tlpkg/tlpostcode/xetex.pl
+++ b/Master/tlpkg/tlpostcode/xetex.pl
@@ -20,7 +20,7 @@ BEGIN {
# make Perl find our packages first:
unshift (@INC, "$texdir/tlpkg");
}
-use TeXLive::TLUtils qw(win32 mkdirhier conv_to_w32_path log info);
+use TeXLive::TLUtils qw(wndws mkdirhier conv_to_w32_path log info);
if ($mode eq 'install') {
do_install();
@@ -38,14 +38,14 @@ sub do_install {
# fontconfig-related stuff.
chomp( my $fcache = `kpsewhich -var-value=FC_CACHEDIR` ) ;
chomp( my $fconf = `kpsewhich -var-value=FONTCONFIG_PATH` ) ;
- if (-r "$texdir/bin/win32/xetex.exe") {
+ if (-r "$texdir/bin/windows/xetex.exe") {
# we have installed w32, so put it into texmfsysvar.
mkdirhier($fcache);
mkdirhier($fconf);
TeXLive::TLUtils::rmtree($fcache);
TeXLive::TLUtils::rmtree($fconf);
my @cpycmd = ();
- if (win32()) {
+ if (wndws()) {
push @cpycmd, "xcopy", "/e", "/i", "/q", "/y";
} else {
push @cpycmd, "cp", "-R";
@@ -54,24 +54,24 @@ sub do_install {
# copy trees from install area.
my $postxetex = "$texdir/tlpkg/tlpostcode/xetex";
system(@cpycmd,
- (win32() ? conv_to_w32_path("$postxetex/conf") : "$postxetex/conf"),
- (win32() ? conv_to_w32_path($fconf) : $fconf));
+ (wndws() ? conv_to_w32_path("$postxetex/conf") : "$postxetex/conf"),
+ (wndws() ? conv_to_w32_path($fconf) : $fconf));
system(@cpycmd,
- (win32() ? conv_to_w32_path("$postxetex/cache") : "$postxetex/cache"),
- (win32() ? conv_to_w32_path($fcache) : $fcache));
+ (wndws() ? conv_to_w32_path("$postxetex/cache") : "$postxetex/cache"),
+ (wndws() ? conv_to_w32_path($fcache) : $fcache));
if (open(FONTSCONF, "<$texdir/tlpkg/tlpostcode/xetex/conf/fonts.conf")) {
my @lines = <FONTSCONF>;
close(FONTSCONF);
if (open(FONTSCONF, ">$fconf/fonts.conf")) {
my $winfontdir;
- if (win32()) {
+ if (wndws()) {
$winfontdir = $ENV{'SystemRoot'}.'/fonts';
$winfontdir =~ s!\\!/!g;
}
foreach (@lines) {
$_ =~ s!c:/Program Files/texlive/YYYY!$texdir!;
- $_ =~ s!c:/windows/fonts!$winfontdir! if win32();
+ $_ =~ s!c:/windows/fonts!$winfontdir! if wndws();
print FONTSCONF;
}
close(FONTSCONF);
@@ -82,7 +82,7 @@ sub do_install {
warn("open($texdir/tlpkg/tlpostcode/xetex/conf/fonts.conf) failed: $!");
}
}
- if (win32() && !$skip_gen) {
+ if (wndws() && !$skip_gen) {
# call fc-cache but only when we install on w32!
info("Running fc-cache -v -r\n");
log( `fc-cache -v -r 2>&1` ); # run it, log output