ceriel 36 лет назад
Родитель
Сommit
726e68d1e2
6 измененных файлов с 25 добавлено и 19 удалено
  1. 3 0
      distr/Action
  2. 14 10
      distr/How_To
  3. 3 3
      distr/dwalk
  4. 2 2
      distr/mkf
  5. 2 3
      distr/mktree
  6. 1 1
      distr/todistr

+ 3 - 0
distr/Action

@@ -1,3 +1,6 @@
+name "EM tables"
+dir etc
+end
 name "Installation manual"
 name "Installation manual"
 dir doc
 dir doc
 end
 end

+ 14 - 10
distr/How_To

@@ -4,7 +4,7 @@ The EM home directory contains a file called ".distr". It contains
 the names of all the files and directories you want to have in the distribution.
 the names of all the files and directories you want to have in the distribution.
 The directories should contain .distr files, the other files should
 The directories should contain .distr files, the other files should
 be placed under RCS.
 be placed under RCS.
-The current RCS revision name is "distr3".
+The current RCS revision name is "distr4".
 The are files that derive from other files and yet should be placed
 The are files that derive from other files and yet should be placed
 in the distribution.
 in the distribution.
 These files should not be placed under RCS.
 These files should not be placed under RCS.
@@ -13,24 +13,24 @@ these files.
 
 
 When all this is correct, use the shell script mktree the extract
 When all this is correct, use the shell script mktree the extract
 the distribution from the EM tree.
 the distribution from the EM tree.
-	cd /usr/em ; sh distr/mktree destination_tree >distr/f.attf 2>&1
+	cd ~em/Repositories ; sh ../Work/distr/mktree destination_tree >../Work/distr/f.attf 2>&1
 Make sure that the destination tree exists and is empty!
 Make sure that the destination tree exists and is empty!
 Failing to do that will almost certainly result in a welter of
 Failing to do that will almost certainly result in a welter of
 error messages.
 error messages.
 The file f.attf contains mktree error messages and should be compared
 The file f.attf contains mktree error messages and should be compared
 to Exceptions.
 to Exceptions.
 The actions of mktree are quite complicated. It starts in the current
 The actions of mktree are quite complicated. It starts in the current
-directory reading the ".distr" file, after copying that file to the
-destination tree.
+directory checking out the .distr file, and copying it to the destination
+directory
 For each file mentioned there it performes certain actions:
 For each file mentioned there it performes certain actions:
 1- Directory	Change to that directory and call yourself recursively.
 1- Directory	Change to that directory and call yourself recursively.
 2- File
 2- File
-   a-           Try to do "co -rdistr3 destination_tree/path/destination_file"
+   a-           Try to do "co -rdistr4 destination_tree/path/destination_file"
                 on succes "chmod +w destination_file" 
                 on succes "chmod +w destination_file" 
               else
               else
    b-           Try to do "co destination_tree/destination_file"
    b-           Try to do "co destination_tree/destination_file"
                 on succes "chmod +w destination_file" and
                 on succes "chmod +w destination_file" and
-                give message that says "Missing distr3 entry" (or some such). 
+                give message that says "Missing distr4 entry" (or some such). 
               else
               else
    c-           I   Does a file LIST exist in this directory AND
    c-           I   Does a file LIST exist in this directory AND
                     is the first line of LIST equal to the name of the
                     is the first line of LIST equal to the name of the
@@ -58,13 +58,13 @@ to look like the tree you need.
 There are too many files there though, especially the files created by
 There are too many files there though, especially the files created by
 the derivation process.
 the derivation process.
 That is why we now give the command:
 That is why we now give the command:
-	dtar cdf distr3 .
-The file distr3 is the one you should put on tape!
+	dtar cdf distr4 .
+The file distr4 is the one you should put on tape!
 But,.... before doing that: Try it out!
 But,.... before doing that: Try it out!
 Repeat the process described in the installation manual.
 Repeat the process described in the installation manual.
 Only if that succeeds you are sure that you included the files needed,
 Only if that succeeds you are sure that you included the files needed,
-and gave all other files the correct "distr3" RCS id.
-After you sent the tape away, forbid ANYBODY to touch the distr3 id
+and gave all other files the correct "distr4" RCS id.
+After you sent the tape away, forbid ANYBODY to touch the distr4 id
 in your RCS files.
 in your RCS files.
 					Good Luck,
 					Good Luck,
 						Ed Keizer, 85/4/15.
 						Ed Keizer, 85/4/15.
@@ -72,3 +72,7 @@ in your RCS files.
 Updated for 3rd distribution by Ceriel Jacobs, 87/3/11.
 Updated for 3rd distribution by Ceriel Jacobs, 87/3/11.
 And again,
 And again,
 					Good Luck!
 					Good Luck!
+
+Updated for 4rd distribution by Ceriel Jacobs, 88/4/08.
+And again,
+					Good Luck!

+ 3 - 3
distr/dwalk

@@ -1,11 +1,11 @@
 : ${CDIR=.}
 : ${CDIR=.}
-if test ! -r .distr
+${DF-:} $CDIR .distr
+if test ! -r $DESTDIR/$CDIR/.distr
 then
 then
 	echo ++ no .distr in $CDIR
 	echo ++ no .distr in $CDIR
         exit 0
         exit 0
 fi
 fi
-${DS-:} $CDIR
-for i in `cat .distr`
+for i in `cat $DESTDIR/$CDIR/.distr`
 do
 do
         if test -d $i
         if test -d $i
         then
         then

+ 2 - 2
distr/mkf

@@ -1,10 +1,10 @@
-if co -q -rdistr3 $DESTDIR/$1/$2 >/dev/null 2>&1
+if co -q -rdistr4 $DESTDIR/$1/$2 >/dev/null 2>&1
 then
 then
 	chmod +w $DESTDIR/$1/$2
 	chmod +w $DESTDIR/$1/$2
 elif co -q $DESTDIR/$1/$2 >/dev/null 2>&1
 elif co -q $DESTDIR/$1/$2 >/dev/null 2>&1
 then
 then
 	chmod +w $DESTDIR/$1/$2
 	chmod +w $DESTDIR/$1/$2
-	echo -- $1/$2 no distr3 yet
+	echo -- $1/$2 no distr4 yet
 elif grep LIST .distr >/dev/null 2>&1 &&
 elif grep LIST .distr >/dev/null 2>&1 &&
      (test "$2" = "`head -1 $DESTDIR/$1/LIST`") >/dev/null 2>&1 &&
      (test "$2" = "`head -1 $DESTDIR/$1/LIST`") >/dev/null 2>&1 &&
      ${DA-false} "$1" "$2"
      ${DA-false} "$1" "$2"

+ 2 - 3
distr/mktree

@@ -2,14 +2,13 @@ case $# in
 1)	;;
 1)	;;
 *)	echo $0 directory ; exit 1 ;;
 *)	echo $0 directory ; exit 1 ;;
 esac
 esac
-DDIR=/proj/em/distr
+DDIR=/proj/em/Work/distr
 case $1 in
 case $1 in
 /*)	DESTDIR=$1 ;;
 /*)	DESTDIR=$1 ;;
 *)	DESTDIR=`pwd`/$1 ;;
 *)	DESTDIR=`pwd`/$1 ;;
 esac
 esac
-DS=$DDIR/mks
 DD=$DDIR/mkd
 DD=$DDIR/mkd
 DF=$DDIR/mkf
 DF=$DDIR/mkf
 DA=$DDIR/mka
 DA=$DDIR/mka
-export DESTDIR DS DD DF DA
+export DESTDIR DD DF DA
 $DDIR/dwalk
 $DDIR/dwalk

+ 1 - 1
distr/todistr

@@ -23,4 +23,4 @@ esac
 case x$REV in
 case x$REV in
 x)	exit 2 ;;
 x)	exit 2 ;;
 esac
 esac
-rcs -ndistr3:$REV $FLAGS $FILE
+rcs -ndistr4:$REV $FLAGS $FILE