From 34e423d6a3230f378213dc9481294be448319d49 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 2 Feb 2006 23:47:47 +0000 Subject: comment out/change p4 to svn, enough to rebuild images git-svn-id: svn://tug.org/texlive/trunk@1490 c570f23f-e606-0410-a88d-b1316a301751 --- Master/Tools/MakeImages.sh | 125 ++++++++------------------------------------- Master/Tools/tlrebuild | 69 +++++++++++++------------ Master/Tools/update-lists | 14 ++--- Master/Tools/update-lsr | 14 ++--- 4 files changed, 72 insertions(+), 150 deletions(-) (limited to 'Master/Tools') diff --git a/Master/Tools/MakeImages.sh b/Master/Tools/MakeImages.sh index 6155651a998..27da9c5ffb4 100755 --- a/Master/Tools/MakeImages.sh +++ b/Master/Tools/MakeImages.sh @@ -62,25 +62,37 @@ while test $# -gt 0; do shift done -$debug && echo "source: [$source] target: [$target] work: [$work]" +if $debug; then + echo "source = $source" + echo "target = $target" + echo "work = $work" +fi mkdir -p $target +common_mkisofs_options=" $quiet -pad -J -dir-mode 0755 -r \ + -copyright LICENSE.TL \ + -x install-live.sh -x install-compr.sh \ + -x install-pkg-compr.sh -x install-pkg-live.sh \ + -x ./support/tests \ + -x Tools \ + -x .svn \ +" + # MAKELIVE () { live_iso=$target/$NAME$V-live-$D.iso -echo "--- (`date`) Writing complete live image to $live_iso." +echo "--- `date` Writing complete live image to $live_iso." # Basically copy the source directory. (cd $source || exit 1 # Complication: get the right install-tl.sh. - rm -f install-tl.sh + rm -f install-tl.sh install-pkg.sh cp -p install-live.sh install-tl.sh cp -p install-pkg-live.sh install-pkg.sh # Another complication: getting the release date into 00LIVE.TL. rm -f 00LIVE.TL - p4 sync -f 00LIVE.TL - chmod a+w 00LIVE.TL + svn update 00LIVE.TL (echo; echo "Release date: $D.`date +%H`") >>00LIVE.TL # remove old images. @@ -89,14 +101,7 @@ echo "--- (`date`) Writing complete live image to $live_iso." # make new image, excluding the compressed stuff and more, # and moving everything to a texlive/ subdirectory, # since that's how we release it on the DVD. - mkisofs $quiet -pad -J -dir-mode 0755 -r \ - -root texlive \ - -copyright LICENSE.TL \ - -x 00INST.TL \ - -x install-live.sh -x install-compr.sh \ - -x install-pkg-compr.sh -x install-pkg-live.sh \ - -x ./support/tests \ - -x Tools \ + mkisofs $common_mkisofs_options -root texlive -x 00INST.TL \ -o $live_iso . md5sum $live_iso >$live_iso.md5 rm -f install-tl.sh install-pkg.sh @@ -113,7 +118,7 @@ ls -l $live_iso # MAKEINST () { inst_iso=$target/$NAME$V-inst-$D.iso -echo "--- (`date`) Writing compressed/installable Unix image to $inst_iso." +echo "--- `date` Writing compressed/installable Unix image to $inst_iso." WORK=$work/TL test -d $WORK && rm -rf $WORK @@ -199,12 +204,7 @@ chmod a+w 00INST.TL (echo; echo "Release date: $D.`date +%H`") >>00INST.TL rm -f $target/$NAME$V-inst-*.iso $target/$NAME$V-inst-*.iso.md5 -mkisofs $quiet -pad -J -dir-mode 0755 -r \ - -copyright LICENSE.TL \ - -x 00LIVE.TL \ - -x install-live.sh \ - -x support/tests \ - -x Tools \ +mkisofs $common_mkisofs_options -x 00LIVE.TL \ -o $inst_iso . md5sum $inst_iso >$inst_iso.md5 @@ -214,90 +214,7 @@ ln -s `basename $inst_iso` $target/$NAME-inst.iso ln -s `basename $inst_iso`.md5 $target/$NAME-inst.iso.md5 } - -# -MAKEDEMO () { -demo_iso=$target/$NAME$V-demo-$D.iso -echo "--- (`date`) Writing demo image (texlive-live scheme) to $demo_iso" - -WORK=$work/TeXLive - -cd $source -test -d $WORK && rm -rf $WORK -sh install-live.sh <$demo_iso.md5 - -rm -f $target/$NAME-demo.iso -ln -s `basename $demo_iso` $target/$NAME-demo.iso -ls -l $demo_iso - -cd $HERE -} - - $makelive && MAKELIVE $makeinst && MAKEINST -$makedemo && MAKEDEMO + rm -rf $work $WORK diff --git a/Master/Tools/tlrebuild b/Master/Tools/tlrebuild index 98e9a57b4fd..9692d43df14 100755 --- a/Master/Tools/tlrebuild +++ b/Master/Tools/tlrebuild @@ -12,18 +12,21 @@ umask 0 if test x$1 = x--no-tpm; then no_tpm=true + shift else no_tpm=false fi # if test x$1 = x--no-images; then no_images=true + shift else no_images=false fi # if test x$1 = x--no-test; then no_test=true + shift else no_test=false fi @@ -34,8 +37,10 @@ message() \ } # don't work with old stuff. -message "p4 sync" -p4 sync || exit 1 +master=`cd $tools/.. && pwd` +top=`cd $master/.. && pwd` +message "svn update" +(cd $top && svn update) || exit 1 if $no_tpm; then :; else # have to run multiple times to make the sizes converge, since the .tpm @@ -54,34 +59,34 @@ message "#4" message "tpm-check" tpm-check || exit 1 -master=`cd $mydir/.. && pwd` -for dir in texmf/tpm texmf-dist/tpm texmf-doc/tpm; do - cd $master/$dir || exit 1 - message "$dir: finding changed tpms" - changelist=`p4 diff -se ...` - if test -n "$changelist"; then - echo "$changelist" | p4 -x - edit 2>&1 | grep -v 'opened for edit' - for f in $changelist; do -#echo "checking $f for unimportant change..." - # revert tpms that differ only in the date. - diff="`p4 diff $f \ - | egrep -v '^===|^---|^[0-9]+c[0-9]|TPM:Date' 2>/dev/null`" - if test -z "$diff"; then - p4 revert $f 2>&1 | grep -v 'was edit' - else - echo $f diff: $diff - fi - done - fi - - # new tpms not in depot - message "$dir: finding new tpms" - find . -type f | p4 -x - add 2>&1 \ - | egrep -v 'already opened|add.*existing file' - - message "$dir: finding obsolete tpms" - p4 diff -sd ... | p4 -x - delete # old tpms no longer needed -done +#master=`cd $mydir/.. && pwd` +#for dir in texmf/tpm texmf-dist/tpm texmf-doc/tpm; do +# cd $master/$dir || exit 1 +# message "$dir: finding changed tpms" +# changelist=`p4 diff -se ...` +# if test -n "$changelist"; then +# echo "$changelist" | p4 -x - edit 2>&1 | grep -v 'opened for edit' +# for f in $changelist; do +##echo "checking $f for unimportant change..." +# # revert tpms that differ only in the date. +# diff="`p4 diff $f \ +# | egrep -v '^===|^---|^[0-9]+c[0-9]|TPM:Date' 2>/dev/null`" +# if test -z "$diff"; then +# p4 revert $f 2>&1 | grep -v 'was edit' +# else +# echo $f diff: $diff +# fi +# done +# fi +# +# # new tpms not in depot +# message "$dir: finding new tpms" +# find . -type f | p4 -x - add 2>&1 \ +# | egrep -v 'already opened|add.*existing file' +# +# message "$dir: finding obsolete tpms" +# p4 diff -sd ... | p4 -x - delete # old tpms no longer needed +#done # lists files used by the Unix installer. message "update-lists for Unix installer" @@ -90,7 +95,7 @@ update-lists || exit 1 # # if we have any files, submit to perforce (frightening but necessary). -if p4 change -o | grep '^Files:' >/dev/null; then +if false p4 change -o | grep '^Files:' >/dev/null; then message "submitting to p4" p4 change -o \ | sed "s!!regenerated by $0!" \ @@ -100,7 +105,7 @@ else fi # keep writable for next time, trying to have rahtz/staw share /home/tlprod. -chmod a+rw $master/*/tpm/* >&/dev/null +#chmod a+rw $master/*/tpm/* >&/dev/null message "ls-R updates" update-lsr diff --git a/Master/Tools/update-lists b/Master/Tools/update-lists index 5665557bd7c..8a1f9907b35 100755 --- a/Master/Tools/update-lists +++ b/Master/Tools/update-lists @@ -35,12 +35,12 @@ for i in texmf/tpm/scheme*.tpm; do xsltproc --stringparam ROOT $W $M/scheme2list.xsl $i done -echo "$0: done regenerating lists." +echo "$0: regenerated lists." $chicken && exit 0 -cd texmf/lists || exit 1 -chmod 444 * >&/dev/null # we created them according to umask - -find . -type f | p4 -x - add 2>&1 | grep -v add.existing -p4 diff -sd ... | p4 -x - delete -p4 diff -se ... | p4 -x - edit +#cd texmf/lists || exit 1 +#chmod 444 * >&/dev/null # we created them according to umask +# +#find . -type f | p4 -x - add 2>&1 | grep -v add.existing +#p4 diff -sd ... | p4 -x - delete +#p4 diff -se ... | p4 -x - edit diff --git a/Master/Tools/update-lsr b/Master/Tools/update-lsr index 6e85c9bc101..4b596de2b6c 100755 --- a/Master/Tools/update-lsr +++ b/Master/Tools/update-lsr @@ -19,14 +19,14 @@ for f in texmf*/ls-R; do done # # generate new. -p4 edit texmf*/ls-R +#p4 edit texmf*/ls-R ./bin/i386-linux/mktexlsr # for f in texmf*/ls-R; do test $f = texmf-var/ls-R && continue # not checked in if cmp -s $f.save $f; then # no change, back to current. - p4 revert $f + : p4 revert $f else : # update needed, will happen next. fi @@ -35,8 +35,8 @@ for f in texmf*/ls-R; do done # if we have any files, submit to perforce (frightening but necessary). -if p4 change -o | grep '^Files:' >/dev/null; then - p4 change -o \ - | sed "s!!regenerated by $0!" \ - | p4 submit -i -fi +#if p4 change -o | grep '^Files:' >/dev/null; then +# p4 change -o \ +# | sed "s!!regenerated by $0!" \ +# | p4 submit -i +#fi -- cgit v1.2.3