ceriel 33 jaren geleden
bovenliggende
commit
7987f04e22
6 gewijzigde bestanden met toevoegingen van 38 en 47 verwijderingen
  1. 10 25
      distr/Exceptions
  2. 18 15
      distr/How_To
  3. 2 2
      distr/dwalk
  4. 2 2
      distr/mkd
  5. 5 2
      distr/mkf
  6. 1 1
      distr/mktree

+ 10 - 25
distr/Exceptions

@@ -1,25 +1,10 @@
--- ./doc/install.pr no RCS file
--- ./h/em_mnem.h no RCS file
--- ./h/em_pseu.h no RCS file
--- ./h/em_spec.h no RCS file
--- ./lang/cem/cemcom/makefile no RCS file
--- ./lang/pc/pem/pem22.m no RCS file
--- ./lang/pc/pem/pem24.m no RCS file
--- ./lang/pc/pem/pem44.m no RCS file
--- ./lib/LLgen/incl no RCS file
--- ./lib/LLgen/rec no RCS file
--- ./mach/m68k2/cg/tables1.c no RCS file
--- ./mach/m68k2/cg/tables1.h no RCS file
--- ./mach/m68020/ncg/tables1.c no RCS file
--- ./mach/m68020/ncg/tables1.h no RCS file
--- ./mach/vax4/cg/tables1.c no RCS file
--- ./mach/vax4/cg/tables1.h no RCS file
--- ./util/LLgen/src/parser no RCS file
--- ./util/LLgen/src/LLgen.c no RCS file
--- ./util/LLgen/src/Lpars.c no RCS file
--- ./util/LLgen/src/Lpars.h no RCS file
--- ./util/LLgen/src/tokens.c no RCS file
--- ./util/data/em_flag.c no RCS file
--- ./util/data/em_mnem.c no RCS file
--- ./util/data/em_pseu.c no RCS file
--- ./util/ego/share/pop_push.h no RCS file
+++ ./doc/install.pr made
+++ ./doc/int/.distr made
+++ ./h/em_mnem.h not present
+++ ./h/em_pseu.h not present
+++ ./h/em_spec.h not present
+++ ./util/LLgen/src/LLgen.c.dist made
+++ ./util/data/em_flag.c not present
+++ ./util/data/em_mnem.c not present
+++ ./util/data/em_pseu.c not present
+++ ./util/ego/share/pop_push.h made

+ 18 - 15
distr/How_To

@@ -3,17 +3,17 @@ For a distribution you need ".distr" files and RCS files.
 The EM home directory contains a file called ".distr". It contains
 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.
-The current RCS revision name is "distr4".
-The are files that derive from other files and yet should be placed
+be placed under CVS.
+There 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 or CVS.
 The file "Exceptions" in this directory contains the current list of
 The file "Exceptions" in this directory contains the current list of
 these files.
 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 ~em/Repositories ; sh ../Work/distr/mktree destination_tree Distr4 >../Work/distr/f.attf 2>&1
+	cd ~em/Repositories
+	sh ../Work/distr/mktree destination_tree > destination_tree/Version 2>../Work/distr/f.attf
 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.
@@ -33,28 +33,28 @@ For each file mentioned there it performes certain actions:
                     In this manner libraries can be distributed whose members
                     In this manner libraries can be distributed whose members
                     have their own RCS file! 
                     have their own RCS file! 
               else
               else
-   b-
-              give message that says "Missing entry" (or some such). 
+   b-		    Try to run 'make distr'
+	      else
+   c-		    Try to run 'make <filename>'
+	      else
+   d-               give message that says "not present" (or some such). 
 
 
 Now you have the tree but not everything is kosher yet.
 Now you have the tree but not everything is kosher yet.
 Some files derive from other files in the tree, those derivations should
 Some files derive from other files in the tree, those derivations should
 be done with the use of an already installed distribution.
 be done with the use of an already installed distribution.
-The files Action and Action1 in this directory contain the actions
-we now take. (Confession: most of the time we use /usr/em)
+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 distrubtion tree starts
 to look like the tree you need.
 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 distr4 .
-The file distr4 is the one you should put on tape!
+	dtar cdf distr5 .
+The file distr5 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,
-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.
+Only if that succeeds you are sure that you included the files needed.
 					Good Luck,
 					Good Luck,
 						Ed Keizer, 85/4/15.
 						Ed Keizer, 85/4/15.
 
 
@@ -65,3 +65,6 @@ And again,
 Updated for 4rd distribution by Ceriel Jacobs, 88/4/08.
 Updated for 4rd distribution by Ceriel Jacobs, 88/4/08.
 And again,
 And again,
 					Good Luck!
 					Good Luck!
+Updated for 4th distribution by Ceriel Jacobs, 91-16/10.
+And again,
+					Good Luck!

+ 2 - 2
distr/dwalk

@@ -8,7 +8,7 @@ fi
 ${DF-:} $CDIR .distr
 ${DF-:} $CDIR .distr
 if test ! -r $DESTDIR/$CDIR/.distr
 if test ! -r $DESTDIR/$CDIR/.distr
 then
 then
-	echo ++ no .distr in $CDIR
+	echo ++ no .distr in $CDIR 1>&2
         exit 0
         exit 0
 fi
 fi
 for i in `cat $DESTDIR/$CDIR/.distr`
 for i in `cat $DESTDIR/$CDIR/.distr`
@@ -21,7 +21,7 @@ do
 			export CDIR
 			export CDIR
 			exec $DDIR/dwalk $*
 			exec $DDIR/dwalk $*
 		  else
 		  else
-			echo ++ Could not access $CDIR/$i
+			echo ++ Could not access $CDIR/$i 1>&2
 		  fi
 		  fi
 		)
 		)
 	else
 	else

+ 2 - 2
distr/mkd

@@ -11,8 +11,8 @@ then
 else
 else
 	if `CV $p > /dev/null 2>&1`
 	if `CV $p > /dev/null 2>&1`
 	then
 	then
-		:
+		echo "$1 `RC -i`"
 	else
 	else
-		echo "-- $1 CV failed for some reason"
+		echo "-- $1 CV failed for some reason" 1>&2
 	fi
 	fi
 fi
 fi

+ 5 - 2
distr/mkf

@@ -6,9 +6,12 @@ elif grep LIST $DESTDIR/$1/.distr >/dev/null 2>&1 &&
      ${DA-false} "$1" "$2"
      ${DA-false} "$1" "$2"
 then
 then
 :	Fetched library contents one by one and put them together
 :	Fetched library contents one by one and put them together
+elif ( cd $DESTDIR/$1 ; make distr ) > /dev/null 2>&1
+then
+	echo ++ $1/$2 made 1>&2
 elif ( cd $DESTDIR/$1 ; make $2 ) > /dev/null 2>&1
 elif ( cd $DESTDIR/$1 ; make $2 ) > /dev/null 2>&1
 then
 then
-	echo ++ $1/$2 made
+	echo ++ $1/$2 made 1>&2
 else
 else
-	echo ++ $1/$2 not present
+	echo ++ $1/$2 not present 1>&2
 fi
 fi

+ 1 - 1
distr/mktree

@@ -1,6 +1,6 @@
 case $# in
 case $# in
 1|2)	;;
 1|2)	;;
-*)	echo $0 directory [ SVrecord ] ; exit 1 ;;
+*)	echo $0 directory [ SVrecord ] 1>&2 ; exit 1 ;;
 esac
 esac
 DDIR=/usr/proj/em/Work/distr
 DDIR=/usr/proj/em/Work/distr
 case $1 in
 case $1 in