tl-update-images: also generate tarballs; check-wrapper*: exclude context check

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

2 files changed, 52 insertions, 10 deletions

diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index 97c566a6721..10082236f31 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -100,10 +100,11 @@ sub check_w32
   for my $k (sort keys %uw) {
     #print "$k -> $uw{$k}\n";
     my $target = $uw{$k};
-    next if $target =~ /tex4ht/; # tex4ht elements have their own .bat's
-    next if $target =~ /ps4pdf/; # has its own .bat
+    next if $k eq /context/;           # has its own .cmd file
     next if $target =~ /dviasm|ebong/; # no .bat for python
+    next if $target =~ /ps4pdf/;       # has its own .bat
     next if $target =~ /simpdftex/;    # shell script
+    next if $target =~ /tex4ht/;       # tex4ht has its own .bat's
     $diff += system ("cmp $w32dir/$k.bat $w32canonical");
   }
 
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 103f4d25e1f..1a230170a10 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -35,22 +35,23 @@ D=`date +%Y%m%d`
 
 debug=${OVERRIDE_DEBUG-false}
 target=/home/ftp/texlive/Images/test
-work=/home/texlive/tmp/TL_$$
 quiet=  # for passing to mkisofs
 makelive=true
+maketar=true
 mkisofs=mkisofs
 
 while test $# -gt 0; do
   case $1 in
   --debug)     debug=true; quiet=;;
-  --help)      echo "No help, use the source, sorry."; exit 0;;
+  --help)      echo "$0: No help, use the source, sorry."; exit 0;;
   --master=*)  master=`echo $1 | sed 's/.*=//'`;;
   --mkisofs=*) mkisofs=`echo $1 | sed 's/.*=//'`;;
   --nolive)    makelive=false;;
+  --notar)     maketar=false;;
   --quiet)     quiet=-quiet;;
   --target=*)  target=`echo $1 | sed 's/.*=//'`;;
-  --work=*)    work=`echo $1 | sed 's/.*=//'`;;
-  *) break;;
+  --version)   echo "$0 for $NAME-$V ($D)"; exit 0;;  # who cares ...
+  *) echo "$0: unknown option $1; try --help if you need it." >&2; exit 1;;
   esac
   shift
 done
@@ -58,7 +59,6 @@ done
 if $debug; then
   echo "master = $master"
   echo "target = $target"
-  echo "work = $work"
 fi
 mkdir -p $target
 
@@ -73,7 +73,7 @@ common_mkisofs_options=" $quiet -pad -J -dir-mode 0755 -r \
 # 
 MAKELIVE ()
 {
-  prefix=$target/$NAME$V
+  prefix=$target/$NAME$V # directory and prefix for our files within
   live_iso=$prefix-$D.iso
   echo "-- `date` Writing live image to $live_iso."
 
@@ -105,8 +105,49 @@ MAKELIVE ()
 }
 
 
+# 
+# Make three tar files: the sources, the texmf trees, the binaries.
+# Each should unpack into its directory name.  We use the GNU tar
+# --transform option to avoid copying the whole hierarchy to temp
+# directory.  This auxiliary function takes that name as its first
+# argument, and the files to archive as the rest.
+# 
+do_tar ()
+{
+  if $debug; then
+    verbose="-v --show-transformed-names"
+  else
+    verbose=
+  fi
+  compress=--lzma
+  tar_common_opt="--exclude-vcs $compress $verbose"
+  #
+  name=$1
+  shift
+  tarfile=$target/$name.tar.lzma
+  tar -cf "$tarfile" --transform="s,^,$name/," $tar_common_opt \
+      "$@"
+  (cd $target && sha256sum `basename $tarfile`) >$tarfile.sha256
+  ls -l "$tarfile"
+}
+
+MAKETAR ()
+{
+  cd $master
+  do_tar $NAME-$D-extra LICENSE* README* *.html install* release* tl-portable*
+  do_tar $NAME-$D-texmf texmf*
+
+  cd $master/../Build
+  do_tar $NAME-$D-source source
+
+  cd $master/bin
+  do_tar $NAME-$D-bin *
+}
+
+
 #  main program.
 
-$makelive && MAKELIVE 
+$maketar && MAKETAR
+$makelive && MAKELIVE
 
-rm -rf $work
+exit 0