[med-svn] r14728 - trunk/packages/mgltools

[Steffen Möller]

Author: moeller
Date: 2013-09-17 14:18:50 +0000 (Tue, 17 Sep 2013)
New Revision: 14728

Modified:
   trunk/packages/mgltools/BUILD
Log:
Tiny 'line width' helping patches

Modified: trunk/packages/mgltools/BUILD
===================================================================
--- trunk/packages/mgltools/BUILD	2013-09-17 13:58:16 UTC (rev 14727)
+++ trunk/packages/mgltools/BUILD	2013-09-17 14:18:50 UTC (rev 14728)
@@ -40,6 +40,10 @@
 http://mgltools.scripps.edu/downloads/nightly/documentation/how-to/access-to-cvs
 or do what has worked for me the last time around:
 
+  # cvs is no longer fashionable, you possibly may not have it installed
+  if [ ! -x /usr/bin/cvs ]; then
+     sudo apt-get install cvs
+  fi
   cvs -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs login
 
 just give an empty password and continue with the download of some sort of a
@@ -82,7 +86,7 @@
   # directories.
   if [ -d mgltools-cvs ]; then cd mgltools-cvs; fi
   PREVDIST=DIST
-  VERSIONNAME=1.5.6~rc2+cvs.`date +"%Y%m%d" | tr -d '\n'`
+  VERSIONNAME=1.5.6~rc3+cvs.`date +"%Y%m%d" | tr -d '\n'`
   NEWDIST=-$VERSIONNAME
   TARDIR=../tarballs
   if [ -d "$TARDIR" ]; then
@@ -110,7 +114,7 @@
 
 The removal of the CVS directories is slightly unfortunate since for
 upstream these are thought to ensure a closer communication with their
-user base. Well, where is the autodock github project?
+user base. Well, where are the autodock and MGLTools github projects?
 
 The tarballs should be made accessible for svn-buildpackage to be
 found. The file .svn/deb-layout may be used to specify that location
@@ -164,9 +168,10 @@
 
 Preparing for some packages needed to fulfil runtime dependencies
 
+  sudo apt-get update
   sudo apt-get install python-zsi qhull-bin libqhull5 python-pmw python-tk \
                        blt python-all freeglut3-dev python-all-dev \
-		       libglu1-mesa-dev tk-dev swig python-simpy
+		       libglu1-mesa-dev tk-dev swig python-simpy python-all
 
 Now, there is a build-order to get all the packages built and installed
 without broken dependencies. The installation is not required for the
@@ -176,14 +181,16 @@
 
   d=$(pwd)
   if [ -d "$d/build-area" ]; then 
-	echo "Sleeping 5 seconds, then deleting previous builds. You were warned."
+	echo -n "Sleeping 5 seconds to grant you some time, "
+	echo    "then deleting previous builds. You have been warned."
 	sleep 5
 	rm -rf "$d/build-area"
   fi
   mkdir -p "$d/build-area" || echo "Could not create $d/build-area."
   
   for p in  \
-    support symserv pybabel pyglf volume utpackages bhtree sff mglutil geomutils \
+    support symserv pybabel pyglf volume utpackages bhtree sff mglutil \
+    geomutils \
     gle opengltk dejavu molkit viewerframework pyautodock networkeditor \
     vision scenario2 pmv autodocktools visionlibraries webservices cadd \
   ; do
@@ -191,7 +198,9 @@
      echo "                   $p"
      echo " ----------------------------------------------------------"
 
-     if [ -d "$d" ]; then cd "$d"; else echo "Cannot access root dir '$d'"; break; fi
+     if [ -d "$d" ]; then cd "$d"; else echo "Cannot access root dir '$d'";
+        break;
+     fi
      prefix="mgltools-"
      if [ "autodocktools" = "$p" ]; then prefix=""; fi
      if [ ! -d "$d/$p/trunk/debian" ]; then echo "No debian folder for '$p'"; break; fi
@@ -201,6 +210,7 @@
        echo "Files like ${prefix}${p}_${VERSIONNAME}*.deb not found in $d/build-area --> building it"
      fi
      cd "$d/$p/trunk"
+     if [ ! -d .svn ]; then mkdir .svn; fi
      if [ ! -r ".svn/deb-layout" ]; then
          echo "origDir=$d/tarballs" > .svn/deb-layout
          echo "buildArea=$d/build-area" >> .svn/deb-layout