CMUCL commit: src/tools (make-extra-dist.sh make-main-dist.sh)

[Raymond Toy]

    Date: Monday, July 5, 2010 @ 16:32:33
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/tools

Modified: make-extra-dist.sh make-main-dist.sh

Fix issue where we get warnings about source being newer than object
for asdf and defsystem.

make-extra-dist.sh:
o Fix up the grep patterns to skip over what we wanted.  (Use egrep
  instead of grep, and change \| to |.)  This makes sure that the
  extras tarball doesn't have asdf or defsystem.

make-main-dist.sh:
o Don't need to touch the asdf/defsystem files anymore.


--------------------+
 make-extra-dist.sh |   10 +++++-----
 make-main-dist.sh  |   11 -----------
 2 files changed, 5 insertions(+), 16 deletions(-)


Index: src/tools/make-extra-dist.sh
diff -u src/tools/make-extra-dist.sh:1.11 src/tools/make-extra-dist.sh:1.12
--- src/tools/make-extra-dist.sh:1.11	Mon May 10 15:30:40 2010
+++ src/tools/make-extra-dist.sh	Mon Jul  5 16:32:33 2010
@@ -94,12 +94,12 @@
 
 # Install the contrib stuff.  Create the directories and then copy the files.
 
-for d in `(cd src; find contrib -type d -print | grep -v "CVS\|asdf\|defsystem")`
+for d in `(cd src; find contrib -type d -print | egrep -v "CVS|asdf|defsystem")`
 do
     install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/$d
 done
 
-for f in `(cd src/contrib; find . -type f -print | grep -v "CVS\|asdf\|defsystem")`
+for f in `(cd src/contrib; find . -type f -print | egrep -v "CVS|asdf|defsystem")`
 do
     FILE=`basename $f`
     DIR=`dirname $f`
@@ -108,13 +108,13 @@
 
 # Install all the locale data.
 
-for d in `(cd src/i18n/; find locale -type d -print | grep -v CVS)`
+for d in `(cd src/i18n/; find locale -type d -print | egrep -v CVS)`
 do
     install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/$d
 done
 
 # Install mo files.
-for f in `(cd $TARGET/i18n; find locale -type f -print | grep -v 'CVS\|~.*~\|.*~')`
+for f in `(cd $TARGET/i18n; find locale -type f -print | egrep -v 'CVS|~.*~|.*~')`
 do
     FILE=`basename $f`
     DIR=`dirname $f`
@@ -122,7 +122,7 @@
 done
 
 # Install po files
-for f in `(cd src/i18n; find locale -type f -print | grep -v 'CVS\|~.*~\|.*~')`
+for f in `(cd src/i18n; find locale -type f -print | egrep -v 'CVS|~.*~|.*~')`
 do
     FILE=`basename $f`
     DIR=`dirname $f`
Index: src/tools/make-main-dist.sh
diff -u src/tools/make-main-dist.sh:1.20 src/tools/make-main-dist.sh:1.21
--- src/tools/make-main-dist.sh:1.20	Sun May 30 23:49:53 2010
+++ src/tools/make-main-dist.sh	Mon Jul  5 16:32:33 2010
@@ -139,17 +139,6 @@
     install ${GROUP} ${OWNER} -m 0644 src/$f $DESTDIR/lib/cmucl/lib/$f
 done
 
-# Touch the fasl files for asdf and defsystem, so we don't get notes
-# about the source being newer than object.
-sleep 1;
-touch $DESTDIR/lib/cmucl/lib/contrib/asdf/asdf.$FASL
-touch $DESTDIR/lib/cmucl/lib/contrib/defsystem/defsystem.$FASL
-if [ "$FASL" = "x86f" ]; then
-    # For x87, we want both x86f and sse2f
-    touch $DESTDIR/lib/cmucl/lib/contrib/asdf/asdf.x86f
-    touch $DESTDIR/lib/cmucl/lib/contrib/defsystem/defsystem.x86f
-fi
-
 install ${GROUP} ${OWNER} -m 0644 src/general-info/cmucl.1 \
 	$DESTDIR/${MANDIR}/
 install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \