diff options
| -rwxr-xr-x | Build/tools/Check | 20 | ||||
| -rwxr-xr-x | Build/tools/MakeImages.sh | 22 | ||||
| -rwxr-xr-x | Build/tools/RunTPM | 9 | ||||
| -rw-r--r-- | Build/tools/check1 | 11 | ||||
| -rwxr-xr-x | Build/tools/tlrebuild | 2 | ||||
| -rwxr-xr-x | Build/tools/tpm-check | 8 | ||||
| -rwxr-xr-x | Build/tools/tpm-delete | 4 | ||||
| -rwxr-xr-x | Build/tools/tpmfromcat | 3 | ||||
| -rwxr-xr-x | Build/tools/update-auto | 2 | ||||
| -rwxr-xr-x | Build/tools/update-lists | 12 | ||||
| -rwxr-xr-x | Build/tools/update-lsr | 2 | ||||
| -rwxr-xr-x | Build/tools/update-tpm | 4 |
12 files changed, 29 insertions, 70 deletions
diff --git a/Build/tools/Check b/Build/tools/Check deleted file mode 100755 index a018592f5cb..00000000000 --- a/Build/tools/Check +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -M=`cd \`dirname $0\`/.. && /bin/pwd` -cd `dirname $0` -perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=cov --arch=all --type=Package -perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=cov --arch=all --type=Documentation -perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=cov --arch=all --type=TLCore -# will check coverage -# -# Checking dependencies: -perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=dep --arch=all --type=Package -perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=dep --arch=all --type=Documentation -perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=dep --arch=all --type=TLCore -# will check dependencies -# -# Checking duplicates: -#perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=dup --arch=all --type=Package -#perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=dup --arch=all --type=Documentation -#perl tpm-factory.pl --master=$M --ftp_dir=/tmp --check=dup --arch=all --type=TLCore -# will check duplicate file names - diff --git a/Build/tools/MakeImages.sh b/Build/tools/MakeImages.sh index bcc9f5b8854..d9910514b44 100755 --- a/Build/tools/MakeImages.sh +++ b/Build/tools/MakeImages.sh @@ -32,7 +32,7 @@ umask 0 HERE=`cd \`dirname $0\` && /bin/pwd` cd $HERE || exit 1 # the Tools directory -source=`cd .. && /bin/pwd` +master=`cd ../../Master && /bin/pwd` NAME=texlivetest V=2006 @@ -53,7 +53,7 @@ while test $# -gt 0; do --noinst) makeinst=false;; --nolive) makelive=false;; --quiet) quiet=-quiet;; - --source=*) source=`echo $1 | sed 's/.*=//'`;; + --source=*) master=`echo $1 | sed 's/.*=//'`;; --work=*) work=`echo $1 | sed 's/.*=//'`;; --target=*) target=`echo $1 | sed 's/.*=//'`;; --zippath=*) zippath=`echo $1 | sed 's/.*=//'`;; @@ -63,7 +63,7 @@ while test $# -gt 0; do done if $debug; then - echo "source = $source" + echo "master = $master" echo "target = $target" echo "work = $work" fi @@ -74,7 +74,6 @@ common_mkisofs_options=" $quiet -pad -J -dir-mode 0755 -r \ -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 \ " @@ -83,8 +82,8 @@ MAKELIVE () { live_iso=$target/$NAME$V-live-$D.iso echo "--- `date` Writing complete live image to $live_iso." -# Basically copy the source directory. -(cd $source || exit 1 +# Basically copy the master directory. +(cd $master || exit 1 # Complication: get the right install-tl.sh. rm -f install-tl.sh install-pkg.sh cp -p install-live.sh install-tl.sh @@ -125,7 +124,7 @@ test -d $WORK && rm -rf $WORK mkdir -p $WORK $debug && echo Copy top-level files -cd $source +cd $master || exit 1 tar cf - \ support \ .mkisofsrc config.* autorun.inf \ @@ -136,7 +135,6 @@ tar cf - \ setup-win32/help/* \ setup-win32/msgs/* \ setup-win32/* \ - Tools \ source \ texmf-doc/doc/*/texlive-* \ 00INST.TL *html \ @@ -144,12 +142,12 @@ tar cf - \ # initial texmf-var mkdir $WORK/texmf-var -cd $source/texmf-dist || exit 1 +cd $master/texmf-dist || exit 1 tar cf - \ tex/plain/config/language.def \ tex/context/config/cont-usr.tex \ | (cd $WORK/texmf-var; tar xf - ) -cd $source/texmf || exit 1 +cd $master/texmf || exit 1 # updmap.cfg gets generated at install time, we don't want to copy the # one from the distribution. tar cf - \ @@ -171,7 +169,7 @@ cd $WORK && rm -rf texmf-var $debug && echo Prepare zip files... PATH=$PATH:$zippath export PATH -cd $source || exit 1 +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 @@ -190,7 +188,7 @@ for i in texmf/lists/*; do done # copy tpm directories -cd $source +cd $master || exit 1 tar cf - texmf/lists texmf/tpm texmf-dist/tpm texmf-doc/tpm \ | (cd $WORK; tar xf - ) diff --git a/Build/tools/RunTPM b/Build/tools/RunTPM deleted file mode 100755 index 7a73a7b8968..00000000000 --- a/Build/tools/RunTPM +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -M=`cd \`dirname $0\`/.. && /bin/pwd` -T=`cd \`dirname $0\` && /bin/pwd` -perl $T/tpm-factory.pl --master=$M --tpm_dir=$M/texmf-dist/tpm --ftp_dir=/var/tmp \ ---clean \ ---arch=all \ ---patterns=auto \ -$* - diff --git a/Build/tools/check1 b/Build/tools/check1 deleted file mode 100644 index 3302043187c..00000000000 --- a/Build/tools/check1 +++ /dev/null @@ -1,11 +0,0 @@ -grep Package ../texmf/tpm/collection*tpm | grep name= | sed 's/.*Package name=.//' | sed 's/\".*//' > 2 -grep Documentation ../texmf/tpm/collection*tpm | grep name= | sed 's/.*Documentation name=.//' | sed 's/\".*//' >> 2 -grep TLCore ../texmf/tpm/collection*tpm | grep name= | sed 's/.*TLCore name=.//' | sed 's/\".*//' >> 2 -sort -u 2 > 3 -mv 3 2 -ls ../texmf-dist/tpm/ | sed 's/\.tpm//' > 1 -ls ../texmf/tpm/ | sed 's/\.tpm//' >> 1 -ls ../texmf-doc/tpm/ | sed 's/\.tpm//' >> 1 -sort 1 > 3 -mv 3 1 -diff 1 2 > 3 diff --git a/Build/tools/tlrebuild b/Build/tools/tlrebuild index e44831a78e7..7bb674a61bb 100755 --- a/Build/tools/tlrebuild +++ b/Build/tools/tlrebuild @@ -37,7 +37,7 @@ message() \ } # don't work with old stuff. -master=`cd $tools/.. && pwd` +master=`cd $tools/../../Master && pwd` top=`cd $master/.. && pwd` message "svn update" (cd $top && svn update) || exit 1 diff --git a/Build/tools/tpm-check b/Build/tools/tpm-check index f008cc26cf7..ae99d433c95 100755 --- a/Build/tools/tpm-check +++ b/Build/tools/tpm-check @@ -4,8 +4,8 @@ # Do TPM sanity checks. mydir=`dirname $0` -master=`cd $mydir/.. && pwd` -tools=$master/Tools +tools=`cd $mydir && pwd` +master=`cd $mydir/../../Master && pwd` # if get an XML syntax error, set to --debug to see which .tpm it comes from. verbose=${OVERRIDE_VERBOSE-} @@ -29,8 +29,8 @@ for check in "$@"; do # around 1300 dup's, so don't bother with that one done # Without --clean, buildPatternsPackage (for example) doesn't get called. -# With --clean, all tpm's need to be rw. -# Therefore, the procedure is: change code, +# Therefore, the debugging procedure is: +# change code, # run update-tpm TLCore (or whatever), # run tpm-check cov (or whatever). # Painful. diff --git a/Build/tools/tpm-delete b/Build/tools/tpm-delete index 50ecab33e20..d5f843ca29b 100755 --- a/Build/tools/tpm-delete +++ b/Build/tools/tpm-delete @@ -5,9 +5,9 @@ # Delete a tpm and the files it references from the repository. # Takes just the package name, no .tpm suffix, no type, no subdirs. -mydir=`dirname $0` # Master/Tools +mydir=`dirname $0` -Master=`cd $mydir/.. && pwd` +Master=`cd $mydir/../../Master && pwd` cd $Master || exit 1 for arg in "$@"; do diff --git a/Build/tools/tpmfromcat b/Build/tools/tpmfromcat index c0630fda221..2caf0f44a46 100755 --- a/Build/tools/tpmfromcat +++ b/Build/tools/tpmfromcat @@ -1,6 +1,7 @@ #!/bin/sh +# $Id$ # read the CTAN catalogue and update the TPM files where possible -Master=`cd \`dirname $0\`/.. && /bin/pwd` +Master=`cd \`dirname $0\`/../../Master && /bin/pwd` cd $Master || exit 1 test $# -eq 0 && set - `find texmf-dist/tpm -name "*.tpm"` diff --git a/Build/tools/update-auto b/Build/tools/update-auto index 0edba3f363e..cbcd381a74d 100755 --- a/Build/tools/update-auto +++ b/Build/tools/update-auto @@ -11,7 +11,7 @@ PATH=/usr/local/bin:$PATH; export PATH umask 0 # most stuff in Master. -Master=`cd \`dirname $0\`/.. && /bin/pwd` +Master=`cd \`dirname $0\`/../../Master && /bin/pwd` cd $Master || exit 1 temp=/tmp/ua$$ diff --git a/Build/tools/update-lists b/Build/tools/update-lists index f262977f678..505499969c7 100755 --- a/Build/tools/update-lists +++ b/Build/tools/update-lists @@ -4,9 +4,9 @@ # # Update the texmf/lists/* files from all the tpm's. -M=`cd \`dirname $0\` && /bin/pwd` -W=`cd \`dirname $0\`/.. && /bin/pwd` -cd $W || exit 1 # work in Master +mydir=`cd \`dirname $0\` && /bin/pwd` +W=`cd \`dirname $0\`/../Master && /bin/pwd` +cd $W || exit 1 Date=`date +%Y/%m/%d` Who=`whoami` @@ -22,17 +22,17 @@ $chicken || rm -f texmf/lists/* echo "$0: doing packages from $W" for i in texmf-dist/tpm/*.tpm texmf/tpm/hyphen*tpm texmf/tpm/lib-*.tpm texmf/tpm/bin-*.tpm \ texmf-doc/tpm/* ; do - xsltproc --stringparam ROOT $W $M/tpm2list.xsl $i + xsltproc --stringparam ROOT $W $mydir/tpm2list.xsl $i done echo "$0: doing collections..." for i in texmf/tpm/collection*.tpm; do - xsltproc --stringparam ROOT $W $M/collection2list.xsl $i + xsltproc --stringparam ROOT $W $mydir/collection2list.xsl $i done echo "$0: doing schemes..." for i in texmf/tpm/scheme*.tpm; do - xsltproc --stringparam ROOT $W $M/scheme2list.xsl $i + xsltproc --stringparam ROOT $W $mydir/scheme2list.xsl $i done echo "$0: regenerated lists." diff --git a/Build/tools/update-lsr b/Build/tools/update-lsr index de700f81cbd..90a761d570a 100755 --- a/Build/tools/update-lsr +++ b/Build/tools/update-lsr @@ -9,7 +9,7 @@ tools=`cd $mydir && pwd` PATH=$tools:$PATH; export PATH umask 0 -master=`cd $mydir/.. && pwd` +master=`cd $mydir/../../Master && pwd` cd $master || exit 1 # generate new. diff --git a/Build/tools/update-tpm b/Build/tools/update-tpm index 370553921a4..2d6abb1fd3a 100755 --- a/Build/tools/update-tpm +++ b/Build/tools/update-tpm @@ -5,8 +5,8 @@ # Regenerate the given set of tpm's using tpm-factory. mydir=`dirname $0` -master=`cd $mydir/.. && pwd` -tools=$master/Tools +tools=`cd $mydir && pwd` +master=`cd $mydir/../../Master && pwd` verbose=${OVERRIDE_VERBOSE-} |