1.0.0.33: update build environment

.cvsignore: add more files
clean.sh: don't recurse into SCM directories
tools-for-build/canonicalize-whitespace: use more generic option to
check expand utility to make non-GNU expand happy
tools-for-build/whitespacely-canonical-filenames: add more SCM directories

diff --git a/.cvsignore b/.cvsignore
index f389213..0ebf91c 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ local-target-features.lisp-expr
 TAGS
 .svn
 .gdbinit
+.hg

diff --git a/clean.sh b/clean.sh
index 5f61242..cf16472 100755 (executable)
--- a/clean.sh
+++ b/clean.sh
@@ -73,6 +73,12 @@ done
 #   test-passed
 #     generated by automatic directory-test-thyself procedure
 find . \( \
+        -name _darcs -o \
+        -name '{arch}' -o \
+        -name CVS -o \
+        -name .hg -o \
+        -name .svn \) -type d -prune -o \
+       \( \
         -type l -o \
         -name '*~' -o \
         -name '#*#' -o \

diff --git a/src/runtime/pthread-futex.c b/src/runtime/pthread-futex.c
index 902b4d8..8a3da46 100644 (file)
--- a/src/runtime/pthread-futex.c
+++ b/src/runtime/pthread-futex.c
@@ -174,7 +174,7 @@ futex_cleanup(void *p)
 {
     struct futex *futex = (struct futex *)p;
     int ret, count;
- 
+
     ret = pthread_mutex_lock(&futex_lock);
     futex_assert(ret == 0);
 

diff --git a/tests/.cvsignore b/tests/.cvsignore
index 38c2dfb..cf22063 100644 (file)
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -3,3 +3,4 @@ external-format-test.txt
 stack-alignment-offset
 test-status.lisp-expr
 run-program-ed-test.tmp
+threads-foreign.c

diff --git a/tools-for-build/canonicalize-whitespace b/tools-for-build/canonicalize-whitespace
index 11b374d..0d39131 100755 (executable)
--- a/tools-for-build/canonicalize-whitespace
+++ b/tools-for-build/canonicalize-whitespace
@@ -5,7 +5,7 @@
 # Convert tabs to spaces and delete trailing whitespace in files
 # which we can safely assume to be source files in appropriate languages.
 
-if ! expand --version < $DEVNULL
+if ! expand -t 8 < $DEVNULL
 then
     # If we're building with MSYS on Windows GNU expand is not available,
     # and what we get is Microsoft Expand, which is something quite different,

diff --git a/tools-for-build/whitespacely-canonical-filenames b/tools-for-build/whitespacely-canonical-filenames
index a0f275d..54e65de 100755 (executable)
--- a/tools-for-build/whitespacely-canonical-filenames
+++ b/tools-for-build/whitespacely-canonical-filenames
@@ -15,7 +15,11 @@ source_extensions='.lisp .lisp-expr .c .h'
 #   ?
 
 for source_extension in $source_extensions; do 
-    find . -name _darcs -prune -o \
-           -name '{arch}' -prune -o \
+    find . \( \
+            -name _darcs -o \
+            -name '{arch}' -o \
+            -name CVS -o \
+            -name .hg -o \
+            -name .svn \) -type d -prune -o \
            -name '*'$source_extension -print
 done

diff --git a/version.lisp-expr b/version.lisp-expr
index 6d4fb4e..a7a44d9 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.0.32"
+"1.0.0.33"