work a bit on install-tl.pl for binfiles splitting

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

1 files changed, 12 insertions, 30 deletions

diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 619f286a556..4572aafe76e 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -175,15 +175,18 @@ sub calc_depends {
         push @collections, $package 
             unless member $package, @collections;
       } else {
-        my $tlpobj = $tlpdb->{'tlps'}{$package};
+        my $tlpobj = $tlpdb->get_package{$package};
         if ($tlpobj->category eq "Package") {
           $install{"$package"}=1;
           $size+=$tlpobj->docsize if $vars{'option_doc'};
           $size+=$tlpobj->srcsize if $vars{'option_src'};
           $size+=$tlpobj->runsize;
         } elsif ($tlpobj->category eq "TLCore") {
+          #
+          # NORBERT: NEEDS TO BE REWORKED FOR binfiles SPLITTING!!!!!
+          #
           if ($package=~/^bin-/) {
-            my %binsizes = %{$tlpobj->binsize};
+            my %binsizes = $tlpobj->binsize;
             foreach my $arch (keys %binsizes) {
               if ((defined $vars{"diskbin_$arch"} and 
                   $vars{"diskbin_$arch"}==1) ||
@@ -964,29 +967,15 @@ sub prepare_installation {
 }
 
 sub add_tlpcontainer {
-  my ($package, $ziplocation, $archrefs, $dest) = @_;
+  my ($package, $ziplocation, $dest) = @_;
+  my $unpackprog;
   my $cwd = getcwd;
   if ($ziplocation !~ m,^/,) {
     $ziplocation = "$cwd/$ziplocation";
   }
-  my $tlpobj = _add_tlpcontainer($package, $ziplocation, "all", $dest);
-  if ($tlpobj->is_arch_dependent) {
-    foreach (@$archrefs) {
-      _add_tlpcontainer($package, $ziplocation, $_, $dest);
-    }
-  }
-}
-
-sub _add_tlpcontainer {
-  my ($package, $ziplocation, $arch, $dest)=@_;
-  my $unpackprog;
-  my $args;
   # WARNING: If you change the location of the texlive.tlpdb this
   # has to be changed, too!!
   die ("No destination given, bad!\n") unless (defined($dest));
-  if ($arch ne "all") {
-    $package.=".$arch";
-  }
   my $container = "$ziplocation/$package";
   if (-r "$container.zip") {
     $container.=".zip";
@@ -1004,12 +993,9 @@ sub _add_tlpcontainer {
   warn "Huuu, this needs testing and error checking!\n";
   warn "Should we use -a -- adapt line endings etc?\n";
   `$unpackprog`;
-  # we only create/add tlpobj for arch eq "all"
-  if ($arch eq "all") {
-    my $tlpobj=$::tlpdb->get_package($package);
-    $::localtlpdb->add_tlpobj($tlpobj);
-    return $tlpobj;
-  }
+  my $tlpobj=$::tlpdb->get_package($package);
+  $::localtlpdb->add_tlpobj($tlpobj);
+  return $tlpobj;
 }
 
 # container_location
@@ -1017,11 +1003,7 @@ sub _add_tlpcontainer {
 # containers. It also COULD download necessary packages and return a
 # temporary location
 #
-# NOTE: It returns the DIRECTORY where the packages are to be installed
-# NOTE: For arch dependent packages you have to get all the 
-#   $package.$arch.extension
-# in this directory, too!
-# This is how add_tlpcontainer works.
+# NOTE: It returns the DIRECTORY where the packages are present
 #
 sub container_location {
   return "archive";
@@ -1039,7 +1021,7 @@ sub install_files {
   my $destination="$vars{TEXDIR}/$texlive_release";
   foreach my $p (keys %install) {
     my $containerdir=container_location($p);
-    add_tlpcontainer($p, $containerdir, \@archs, $destination);
+    add_tlpcontainer($p, $containerdir, $destination);
   }
 }