attempt to include only i386-linux/macosx/windows

in inst image.


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

1 files changed, 13 insertions, 19 deletions

diff --git a/Build/tools/MakeImages.sh b/Build/tools/MakeImages.sh
index d12ce98096b..3e30e199938 100755
--- a/Build/tools/MakeImages.sh
+++ b/Build/tools/MakeImages.sh
@@ -90,12 +90,12 @@ echo "--- `date` Writing complete live image to $live_iso."
  cp -p install-pkg-live.sh install-pkg.sh
 
  # Another complication: getting the release date into 00LIVE.TL.
- rm -f 00LIVE.TL
- svn update 00LIVE.TL
- (echo; echo "Release date: $D.`date +%H`") >>00LIVE.TL
+ svn revert 00LIVE.TL
+ echo "Release date: $D.`date +%H`" >>00LIVE.TL
 
  # remove old images.
  rm -f $target/$NAME$V-live-*.iso $target/$NAME$V-live-*.iso.md5
+ rm -f $target/$NAME$V-live-*.iso.bz2 $target/$NAME$V-live-*.iso.bz2.md5
  
  # make new image, excluding the compressed stuff and more,
  # and moving everything to a texlive/ subdirectory,
@@ -131,7 +131,7 @@ WORK=$work/TL
 test -d $WORK && rm -rf $WORK
 mkdir -p $WORK
 
-$debug && echo Copy top-level files
+$debug && echo " makeinst: copy top-level files..."
 cd $master || exit 1 
 tar cf - \
  support \
@@ -140,15 +140,13 @@ tar cf - \
  COPYING \
  LICENSE.TL \
  README.* \
- setup-win32/help/* \
- setup-win32/msgs/* \
  setup-win32/* \
  source \
  texmf-doc/doc/*/texlive-* \
  00INST.TL *html  \
  | (cd $WORK && tar xf - )
 
-# initial texmf-var
+$debug && echo " makeinst: set up texmf-var..."
 mkdir $WORK/texmf-var
 cd $master/texmf-dist || exit 1
 tar cf -  \
@@ -174,21 +172,17 @@ cd $WORK/texmf-var || exit 1
 zip -qr $WORK/archive/texmf-var.zip .
 cd $WORK && rm -rf texmf-var
 
-$debug && echo Prepare zip files...
-PATH=$PATH:$zippath
-export PATH
+$debug && echo " makeinst: prepare zip files..."
+PATH=$PATH:$zippath; export PATH
 cd $master || exit 1
 # people want to get the windows binaries, so don't exclude everything.
 # bzip2, perl, windvi, lib-* -- basically required.
-# Fabrice suggests dumping the below, but since we seem to have room for
-# now, let's include them.  xemacs is the biggie.
-# w32progs="diff|grep|gsview|imagemagick|patch|sed|wget|xemacs"
-w32progs="xemacs"
 for i in texmf/lists/*; do
- # skip windows binaries for unix inst cd.  Since the windows installer
- # requires cab files, we can't put them on one CD any more, no space.
- # All the lib-* packages are xemtex things, strange but true.
- echo "$i" | egrep "bin-($w32progs)|\.win32-static" >/dev/null \
+ # exclude binaries for all architectures except i386-linux, MacOSX, and
+ # Windows.  No room any more.
+ (echo "$i" | grep '^bin-.*\.' \
+  | egrep -v '\.(i386-linux|.*-darwin|win32)') \
+ >/dev/null \
  && continue
 
  I=`basename $i`
@@ -207,7 +201,7 @@ rm -f install-tl.sh install-pkg.sh
 mv install-compr.sh install-tl.sh
 mv install-pkg-compr.sh install-pkg.sh
 chmod a+w 00INST.TL
-(echo; echo "Release date: $D.`date +%H`") >>00INST.TL
+echo "Release date: $D.`date +%H`" >>00INST.TL
 
 rm -f $target/$NAME$V-inst-*.iso $target/$NAME$V-inst-*.iso.md5
 mkisofs $common_mkisofs_options -x 00LIVE.TL \