[brlcad-commits] SF.net SVN: brlcad: [30444] brlcad/trunk/Makefile.am

[<br...@us...>]

Revision: 30444
          http://brlcad.svn.sourceforge.net/brlcad/?rev=30444&view=rev
Author:   brlcad
Date:     2008-03-02 00:57:51 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
add a distcheck and install check to make sure that the tclIndex and pkgIndex.tcl files aren't empty.  there are some configurations generating empty files when the auto_paths are not set up correctly.  the installs will seem to be just fine .. but are actually rather busted and will result in a variety of screwy run-time tcl failures when trying to use any of those routines.  also make elapsed.sh use top_srcdir for the DATE file since it's a BUILT_SOURCES file.

Modified Paths:
--------------
    brlcad/trunk/Makefile.am

Modified: brlcad/trunk/Makefile.am
===================================================================
--- brlcad/trunk/Makefile.am	2008-03-02 08:45:41 UTC (rev 30443)
+++ brlcad/trunk/Makefile.am	2008-03-02 08:57:51 UTC (rev 30444)
@@ -311,6 +311,12 @@
 	if test "x$$missing" = "x1" ; then \
 		exit 1 ; \
 	fi
+	files="`find $(distdir)/src/tclscripts \( -name pkgIndex.tcl -o -name tclIndex \)`" ; \
+	empty=`for file in $$files ; do found="\`grep -v '^#' $$file | perl -0777 -pi -e 's/^\n//g'\`" ; if test "x$$found" = "x" ; then echo $$file ; fi ; done | wc | awk '{print $$1}'` ; \
+	if test $$empty -gt 9 ; then \
+		echo "TOO MANY EMPTY PKGINDEX.TCL/TCLINDEX FILES" ; \
+		exit 1 ; \
+	fi
 	find $(distdir) -type f \( -name '.cvsignore' -or -name 'brlcad_config.h' \) -exec rm -f {} \;
 	find $(distdir) -type d \( -name 'CVS' -or -name '.svn' \) -prune -exec rm -rf {} \;
 
@@ -336,6 +342,20 @@
 	    d??-??????*) warn_umask=yes ;; \
 	  esac ; \
 	fi ; \
+	files="`find $(top_builddir)/src/tclscripts \( -name pkgIndex.tcl -o -name tclIndex \)`" ; \
+	empty=`for file in $$files ; do found="\`grep -v '^#' $$file | perl -0777 -pi -e 's/^\n//g'\`" ; if test "x$$found" = "x" ; then echo $$file ; fi ; done | wc | awk '{print $$1}'` ; \
+	if test $$empty -gt 9 ; then \
+	    $(ECHO) ; \
+	    $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
+	    $(ECHO) "  WARNING: Too many of the pkgIndex.tcl and" ; \
+	    $(ECHO) "           tclIndex files are empty." ; \
+	    $(ECHO) ; \
+	    $(ECHO) "  It is likely that the indices are not being" ; \
+	    $(ECHO) "  generated properly which will affect run-time" ; \
+	    $(ECHO) "  functionality. VERIFY THE FILES." ; \
+	    $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
+	    $(ECHO) ; \
+	fi ; \
 	if test "x$$warn_umask" = "xyes" ; then \
 	    $(ECHO) ; \
 	    $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
@@ -395,6 +415,7 @@
 		USER="unknown" ; \
 	    fi ; \
 	    $(ECHO) "Installed BRL-CAD Release @BRLCAD_VERSION@ Build @CONFIG_DATE@ by ${USER} to $(DESTDIR)$(prefix) on `date`" >> install.$(host_triplet).log ; \
+	    chmod ugo+rw install.$(host_triplet).log ; \
 	fi
 
 
@@ -413,7 +434,7 @@
 	@$(ECHO)
 	@if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "xfast" -o "x$(.TARGETS)" = "xfast" ; then \
 	  $(ECHO) $(ECHO_N) "Elapsed compilation time: " ;\
-	  sh $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/DATE` ;\
+	  sh $(top_srcdir)/sh/elapsed.sh `cat $(top_srcdir)/include/conf/DATE` ;\
 	  $(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
 	  sh $(top_srcdir)/sh/elapsed.sh @CONFIG_TIME@ ;\
 	  $(ECHO) "---" ;\
@@ -421,7 +442,7 @@
 	  $(ECHO) "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
 	elif test "x$(MAKECMDGOALS)" = "xinstall-am" -o "x$(.TARGETS)" = "xinstall-am" ; then \
 	  $(ECHO) $(ECHO_N) "Elapsed installation time: " ;\
-	  sh $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/DATE` ;\
+	  sh $(top_srcdir)/sh/elapsed.sh `cat $(top_srcdir)/include/conf/DATE` ;\
 	  $(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
 	  sh $(top_srcdir)/sh/elapsed.sh @CONFIG_TIME@ ;\
 	  $(ECHO) "---" ;\
@@ -430,14 +451,14 @@
 	  $(ECHO) ;\
 	  line1="  BRL-CAD @BRLCAD_VERSION@ is now installed into $(prefix)" ;\
 	  line2="  Be sure to add $(prefix)/bin to your PATH" ;\
-	  separator="`$(ECHO) $$line1 | tr '[a-zA-Z0-9.\-/ ]' '*'`" ;\
+	  separator="`$(ECHO) $$line1 | tr '[[:print:]]' '*'`" ;\
 	  $(ECHO) "$${separator}****" ;\
 	  $(ECHO) "$$line1" ;\
 	  $(ECHO) "$$line2" ;\
 	  $(ECHO) "$${separator}****" ;\
 	elif test "x$(MAKECMDGOALS)" = "x" -a "x$(.TARGETS)" = "x" ; then \
 	  $(ECHO) $(ECHO_N) "Elapsed time: " ;\
-	  sh $(top_srcdir)/sh/elapsed.sh `cat $(top_builddir)/include/conf/DATE` ;\
+	  sh $(top_srcdir)/sh/elapsed.sh `cat $(top_srcdir)/include/conf/DATE` ;\
 	  $(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
 	  sh $(top_srcdir)/sh/elapsed.sh @CONFIG_TIME@ ;\
 	  $(ECHO) "---" ;\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.