diff --git a/distr/How_To b/distr/How_To index 91250cdf..bf061bcc 100644 --- a/distr/How_To +++ b/distr/How_To @@ -12,8 +12,7 @@ these files. When all this is correct, use the shell script mktree the extract the distribution from the EM tree. - cd ~em/Repositories - sh ../Work/distr/mktree destination_tree > destination_tree/Version 2>../Work/distr/f.attf + sh mktree destination_tree repository_tree > destination_tree/Versions 2>f.attf Make sure that the destination tree exists and is empty! Failing to do that will almost certainly result in a welter of error messages. @@ -29,9 +28,9 @@ For each file mentioned there it performes certain actions: is the first line of LIST equal to the name of the destination file? If so, try to extract all the files named in the rest of the LIST file and call the program - arch to create a library "arch cr `cat LIST`". + arch to create a library "arch cDr `cat LIST`". In this manner libraries can be distributed whose members - have their own RCS file! + have their own RCS file. else b- Try to run 'make distr' else @@ -45,7 +44,7 @@ be done with the use of an already installed distribution. The file Action in this directory contains the actions we now take. -After running these re-derivation programs the distrubtion tree starts +After running these re-derivation programs the distribution tree starts to look like the tree you need. There are too many files there though, especially the files created by the derivation process. @@ -62,9 +61,9 @@ Updated for 3rd distribution by Ceriel Jacobs, 87/3/11. And again, Good Luck! -Updated for 4rd distribution by Ceriel Jacobs, 88/4/08. +Updated for 4th distribution by Ceriel Jacobs, 88/4/08. And again, Good Luck! -Updated for 4th distribution by Ceriel Jacobs, 91-16/10. +Updated for 5th distribution by Ceriel Jacobs, 91/19/12. And again, Good Luck! diff --git a/distr/mka b/distr/mka index 8f405048..21f738cb 100755 --- a/distr/mka +++ b/distr/mka @@ -4,6 +4,6 @@ do ${DF-false} $1 $i done cd $DESTDIR/$1 -arch cr `cat LIST` +arch cDr `cat LIST` : I do not remove the files constituating the library, because : they might be present in .distr diff --git a/distr/mkd b/distr/mkd index a7e6fc1e..2a87e60a 100755 --- a/distr/mkd +++ b/distr/mkd @@ -3,16 +3,25 @@ case $1 in *) mkdir $DESTDIR/$1 ;; esac -p=`pwd` -cd $DESTDIR/$1 +p=$REPDIR/$1 +dir=$1 +if [ $# = 2 ] +then + if [ -f $2 ] + then + set `fgrep "$dir " $2` + fi +fi +cd $DESTDIR/$dir if [ $# = 2 ] then RV $p $2 > /dev/null 2>&1 + echo "$dir $2" else if `CV $p > /dev/null 2>&1` then - echo "$1 `RC -i`" + echo "$dir `RC -i`" else - echo "-- $1 CV failed for some reason" 1>&2 + echo "-- $dir CV failed for some reason" 1>&2 fi fi diff --git a/distr/mktree b/distr/mktree index 8c8be765..c3ea01df 100644 --- a/distr/mktree +++ b/distr/mktree @@ -1,14 +1,24 @@ case $# in -1|2) ;; -*) echo $0 directory [ SVrecord ] 1>&2 ; exit 1 ;; +2|3) ;; +*) echo Usage: $0 directory repdir [ SVrecord ] 1>&2 ; exit 1 ;; +esac +case $0 in +/*) DDIR=`dirname $0` + ;; +*) DDIR=`pwd`/`dirname $0` + ;; esac -DDIR=/usr/proj/em/Work/distr case $1 in /*) DESTDIR=$1 ;; *) DESTDIR=`pwd`/$1 ;; esac +case $2 in +/*) REPDIR=$2 ;; +*) REPDIR=`pwd`/$2 ;; +esac +cd $REPDIR DD=$DDIR/mkd DF=$DDIR/mkf DA=$DDIR/mka -export DDIR DESTDIR DD DF DA -$DDIR/dwalk $2 +export DDIR DESTDIR DD DF DA REPDIR +$DDIR/dwalk $3