diff options
Diffstat (limited to 'Master/tlpkg/bin')
-rwxr-xr-x | Master/tlpkg/bin/tl-compare-tlpdbs | 4 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-4ht | 3 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-bindir | 1 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-install-pkg | 5 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-nsis | 6 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlcritical | 2 |
6 files changed, 14 insertions, 7 deletions
diff --git a/Master/tlpkg/bin/tl-compare-tlpdbs b/Master/tlpkg/bin/tl-compare-tlpdbs index 4632280e9fb..5b1b99ea9f2 100755 --- a/Master/tlpkg/bin/tl-compare-tlpdbs +++ b/Master/tlpkg/bin/tl-compare-tlpdbs @@ -20,7 +20,7 @@ use Pod::Usage; # packages ignored unless --all is given # see @critical_pkg_list in tl-update-containers -my @add_ignored_packs = qw/texlive.infra tlperl.win32/; +my @add_ignored_packs = qw/texlive.infra tlperl.win32 tlperl.win64/; our ($mydir, $vc_id); my $opt_version = 0; @@ -116,7 +116,7 @@ tl-compare-tlpdbs [I<option>]... <TLPDB1> [<TLPDB2>] =item B<--all> -Also compare packages C<texlive.infra> and C<tlperl.win32>, which are +Also compare packages C<texlive.infra> and C<tlperl.win(32|64)>, which are ignored by default. =item B<--help> diff --git a/Master/tlpkg/bin/tl-update-4ht b/Master/tlpkg/bin/tl-update-4ht index ae774316009..8436845aa83 100755 --- a/Master/tlpkg/bin/tl-update-4ht +++ b/Master/tlpkg/bin/tl-update-4ht @@ -27,6 +27,7 @@ for s in ht htcontext htmex httexi; do # diff -u1 $tm/bin/win32 bin/win32/ | fgrep -v "Only in /home" >/tmp/u; v /tmp/u #tex4ht, t4ht +diff -u1 $tm/bin/win64 bin/win64/ | fgrep -v "Only in /home" >/tmp/u; v /tmp/u #tex4ht, t4ht #\cp -pf bin/win32/* /home/texlive/karl/Master/bin/win32/ # diff -u1 .. src | fgrep -v "Only in .." >/tmp/u; v /tmp/u @@ -66,7 +67,7 @@ comm -13 /tmp/now /tmp/new >/tmp/c; wc -l /tmp/c #(cd $tm/texmf-dist/tex4ht/ && svn add `cat /tmp/c`) # check results: -svn status .. $tm/bin/win32 \ +svn status .. $tm/bin/win32 $tm/bin/win64 \ $tm/texmf-dist/tex/generic/tex4ht \ $tm/texmf-dist/tex4ht \ $tm/texmf-dist/scripts/tex4ht diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index a2c75df31fd..dc599200c89 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -178,6 +178,7 @@ for tlplat in $tlplats; do sparc-solaris) default_bin_loc=$download_loc $grab http://dl.contextgarden.net/build/texlive/$tlplat.tar.xz;; + win64) win32) # default_bin_loc=$tmpdir/tl.$tlplat.zip # $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;; diff --git a/Master/tlpkg/bin/tl-update-install-pkg b/Master/tlpkg/bin/tl-update-install-pkg index 24397828909..d8dff53062d 100755 --- a/Master/tlpkg/bin/tl-update-install-pkg +++ b/Master/tlpkg/bin/tl-update-install-pkg @@ -156,7 +156,7 @@ if ($opt_texlivedocs) { my %tlpbin = %{$tlpinst->binfiles}; for my $a (keys %tlpbin) { - next if ($a =~ m/win32/); + next if ($a =~ m/win(32|64)/); push (@unix, @{$tlpbin{$a}}); } @@ -165,6 +165,9 @@ push (@win32, @unix); if (defined $tlpbin{"win32"}) { push (@win32, @{$tlpbin{"win32"}}); } +if (defined $tlpbin{"win64"}) { + push (@win32, @{$tlpbin{"win64"}}); +} # main. diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis index 0b121f48228..3490924190e 100755 --- a/Master/tlpkg/bin/tl-update-nsis +++ b/Master/tlpkg/bin/tl-update-nsis @@ -41,10 +41,11 @@ sub main { my $texliveinfra = $tlpdb->get_package("texlive.infra"); my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.win32"); - # + my $texliveinfraw64 = $tlpdb->get_package("texlive.infra.win64"); my @allfiles = (); push(@allfiles, $texliveinfra->all_files); push(@allfiles, $texliveinfraw32->all_files) if defined $texliveinfraw32; + push(@allfiles, $texliveinfraw64->all_files) if defined $texliveinfraw64; # create the tlpobj files, and directory if necessary. my $tlpobjdir = "$InfraLocation/tlpobj"; @@ -53,7 +54,7 @@ sub main { &TeXLive::TLUtils::mkdirhier($abs_tlpobjdir); } my $rev = 0; # get the highest rev of all our packages - for my $p ($texliveinfra, $texliveinfraw32) { + for my $p ($texliveinfra, $texliveinfraw32, $texliveinfraw64) { if (defined $p) { if ($p->revision > $rev) { $rev = $p->revision; @@ -133,6 +134,7 @@ EOF print " File $mm\\$dd\\$f\n"; } } + # TODO win64 SUPPORT print " ExecWait \'\"\$INSTDIR\\bin\\win32\\tlmgr.bat\" _include_tlpobj"; for my $p ($texliveinfra, $texliveinfraw32) { if (defined $p) { diff --git a/Master/tlpkg/bin/tl-update-tlcritical b/Master/tlpkg/bin/tl-update-tlcritical index a5e2a6f128f..ce0031495e6 100755 --- a/Master/tlpkg/bin/tl-update-tlcritical +++ b/Master/tlpkg/bin/tl-update-tlcritical @@ -82,7 +82,7 @@ if $opt_do_containers; then # update normal containers. echo "$0: running tl-update-containers (for critical packages)..." tl-update-containers -location $tlcrit $recreate -all \ - 00texlive.installation 00texlive.config texlive.infra tlperl.win32 \ + 00texlive.installation 00texlive.config texlive.infra tlperl.win32 tlperl.win64 \ $moredis else # this is an option so that if the repository already contains |