use .bat wrappers instead of .texlua

- replace many wrappers with a default .bat file
- change the check-wrapper script
- do not make the PATHEXT and association magic in windows


git-svn-id: svn://tug.org/texlive/trunk@7785 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 62 insertions, 46 deletions

diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index f3025c2db1f..94a00fa7ab4 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -34,8 +34,18 @@ sub main
   
   my %w = &unx_wrapper_entries ("i386-linux");
 
-  $cww = "$Master/../Build/source/texk/texlive/tl-w32-wrapper.texlua";
+  # add some additional wrappers which are currently not found 
+  # automatically
+  $w{'getnonfreefonts-sys'} = 1;
+  $w{'updmap-sys'} = 1;
+  $w{'updmap'} = 1;
+  $w{'xindy'} = 1;
+  $w{'texindy'} = 1;
+  $w{'fmtutil-sys'} = 1;
+
+  $cww = "$Master/../Build/source/texk/texlive/tl-w32-starter.bat";
   $err += &check_w32 ("win32", $cww, %w);
+  system("cmp win32/tl-w32-wrapper.texlua $Master/../Build/source/texk/texlive/tl-w32-wrapper.texlua");
   
   return $err;
 }
@@ -78,7 +88,7 @@ sub check_w32
   my ($w32dir, $w32canonical, %uw) = @_;
 
   for my $k (sort keys %uw) {
-    system ("cmp $w32dir/$k.texlua $w32canonical");
+    system ("cmp $w32dir/$k.bat $w32canonical");
     #print "$k -> $uw{$k}\n";
   }
 }
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index 99bf1c30f43..c051e58feec 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -27,11 +27,13 @@ our $mydir;
 my $opt_debug = 0;
 my $opt_location = ".";
 my $opt_relative = 0;
+my $opt_recreate = 0;
 my $help = 0;
 
 GetOptions(
   "location=s"     => \$opt_location, 
   "debug!"         => \$opt_debug,
+  "recreate"       => \$opt_recreate,
   "help|?"         => \$help) or pod2usage(1);
 
 pod2usage(-exitstatus => 0, -verbose => 2) if $help;
@@ -65,54 +67,58 @@ sub main
 
   tllog($::LOG_DEBUG, "format=$type srcsplit=$srcsplit docsplit=$docsplit\n");
 
-  my $nettlpdb = TeXLive::TLPDB->new(root => $opt_location);
-  if (!defined($nettlpdb)) {
-    die "Cannot init tlpdb from $opt_location ...";
-  }
-  my %archiverevs;
-  foreach my $pkg ($nettlpdb->list_packages()) {
-    $archiverevs{$pkg} = $nettlpdb->get_package($pkg)->revision();
-  }
-
-  # collect packages to be updated.
-  my %count;
-  $count{"new"} = $count{"removed"} = $count{"updated"} = $count{"unchanged"}
-  = 0;
- 
-  my $opt_containerdir = "$opt_location/$TeXLive::TLConfig::NetArchive";
   my @todopacks = ();
-  for my $pkg (@packs) {
-    next if ($pkg eq "00texlive.config");
-    next if ($pkg eq "00texlive.installer");
-    my $oldrev = 0;
-    if (-r "$opt_containerdir/$pkg.tar.$type"
-        && defined($archiverevs{$pkg})) {
-      $oldrev = $archiverevs{$pkg};
-    } else {
-      tllog($::LOG_NORMAL, "$pkg is new, found no containers\n");
-      $count{"new"}++;
+  my $opt_containerdir = "$opt_location/$TeXLive::TLConfig::NetArchive";
+  my %count;
+  if ($opt_recreate) {
+    @todopacks = $tlpdb->list_packages();
+  } else {
+    my $nettlpdb = TeXLive::TLPDB->new(root => $opt_location);
+    if (!defined($nettlpdb)) {
+      die "Cannot init tlpdb from $opt_location ...";
     }
-
-    my $tlp = $tlpdb->get_package($pkg);
-    my $newrev = 0;
-    if (defined($tlp)) {
-      $newrev = $tlp->revision;
-    } else {
-      tllog($::LOG_NORMAL, "$pkg has disappeared, removing its containers\n");
-      `rm $opt_containerdir/$pkg.*`;
-      $count{"removed"}++;
+    my %archiverevs;
+    foreach my $pkg ($nettlpdb->list_packages()) {
+      $archiverevs{$pkg} = $nettlpdb->get_package($pkg)->revision();
     }
 
-    if ($oldrev == $newrev) {
-      tllog($::LOG_DEBUG, "$pkg up to date\n");
-      $count{"unchanged"}++;
-    } elsif ($oldrev < $newrev) {
-      push @todopacks, $pkg;
-      $count{"updated"}++ if $oldrev;
-    } else {
-      die "This shouldn't happen!  The revision of $pkg in texlive.tlpdb"
-          . "($newrev) is OLDER than the one in"
-          . "$opt_location/tlpkg/texlive.tlpdb ($oldrev), goodbye";
+    # collect packages to be updated.
+    $count{"new"} = $count{"removed"} = $count{"updated"} = $count{"unchanged"}
+                  = 0;
+ 
+    for my $pkg (@packs) {
+      next if ($pkg eq "00texlive.config");
+      next if ($pkg eq "00texlive.installer");
+      my $oldrev = 0;
+      if (-r "$opt_containerdir/$pkg.tar.$type"
+          && defined($archiverevs{$pkg})) {
+        $oldrev = $archiverevs{$pkg};
+      } else {
+        tllog($::LOG_NORMAL, "$pkg is new, found no containers\n");
+        $count{"new"}++;
+      }
+
+      my $tlp = $tlpdb->get_package($pkg);
+      my $newrev = 0;
+      if (defined($tlp)) {
+        $newrev = $tlp->revision;
+      } else {
+        tllog($::LOG_NORMAL, "$pkg has disappeared, removing its containers\n");
+        `rm $opt_containerdir/$pkg.*`;
+        $count{"removed"}++;
+      }
+
+      if ($oldrev == $newrev) {
+        tllog($::LOG_DEBUG, "$pkg up to date\n");
+        $count{"unchanged"}++;
+      } elsif ($oldrev < $newrev) {
+        push @todopacks, $pkg;
+        $count{"updated"}++ if $oldrev;
+      } else {
+        die "This shouldn't happen!  The revision of $pkg in texlive.tlpdb"
+            . "($newrev) is OLDER than the one in"
+            . "$opt_location/tlpkg/texlive.tlpdb ($oldrev), goodbye";
+      }
     }
   }