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

[Steffen Möller]

Author: moeller
Date: 2016-05-11 09:50:51 +0000 (Wed, 11 May 2016)
New Revision: 21935

Modified:
   trunk/packages/mgltools/BUILD
Log:
Further refinements to BUILD instructions

Modified: trunk/packages/mgltools/BUILD
===================================================================
--- trunk/packages/mgltools/BUILD	2016-05-11 08:41:21 UTC (rev 21934)
+++ trunk/packages/mgltools/BUILD	2016-05-11 09:50:51 UTC (rev 21935)
@@ -51,16 +51,21 @@
   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
-metapackage ... if you have not performed this checkout before in this folder:
+metapackage.
 
-  # perform only if previous checkouts are no longer available.
-  cvs -z3 -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs co MGLPACKSDIST
+If you have not performed this checkout before in this folder, there are two
+options:
 
-To checkout from 1.5.7 release branch, for instance, run the following command instead:
+  a) Download a particular release by its CVS tag (a name given to a developmental
+    state).  To checkout, e.g., release 1.5.7, run the following command:
 	
   # this checkouts rc-1-5-7 branch instead of the default head revision
   cvs -z3 -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs co -r rc-1-5-7 MGLPACKSDIST
 
+  b) Download whatever the developers at Scripps are currently working on:
+
+  cvs -z3 -d:pserver:anonymous at mgl1.scripps.edu:/opt/cvs co MGLPACKSDIST
+
 Otherwise, if you have an older version checked out already,
 just change to all of the directories and run the "cvs -z3 update -d".
 
@@ -90,7 +95,9 @@
   # directories.
   if [ -d mgltools-cvs ]; then cd mgltools-cvs; fi
   PREVDIST=DIST
-  VERSIONNAME=1.5.7~rc1+cvs.`date +"%Y%m%d" | tr -d '\n'`
+  #use the tilde if the main version is still to be released
+  #VERSIONNAME=1.5.7~rc1+cvs.`date +"%Y%m%d" | tr -d '\n'`
+  VERSIONNAME=1.5.7
   NEWDIST=-$VERSIONNAME
   TARDIR=../tarballs
   if [ -d "$TARDIR" ]; then
@@ -152,13 +159,15 @@
     else
       for i in */trunk/debian; do
         d=`dirname $i`
-	if [ -r $d/changelog ]; then
+	if [ ! -e "$d/changelog" ]; then
+            echo "W: Could not find changelog in '$i', tested from $(pwd), skipping"
+	elif [ -r "$d/changelog" ]; then
             echo "Editing changelog in '$d'"
             (cd $d && \
              DEBEMAIL=moeller at debian.org debchange --preserve \
                  --newversion ${VERSIONNAME}-1 "New upstream version.")
 	else
-            echo "W: Could not find changelog in '$i', skipping"
+            echo "W: Could not read changelog in '$i', tested from $(pwd), skipping"
         fi
       done
     fi
@@ -177,10 +186,13 @@
 Preparing for some packages needed to fulfil runtime dependencies
 
   sudo apt-get update
-  sudo apt-get install python-zsi qhull-bin libqhull-dev python-pmw python-tk \
-                       blt python-all freeglut3-dev python-all-dev \
-		       libglu1-mesa-dev tk-dev swig python-simpy python-all \
-                       libxi-dev libxmu-dev idle python-pil.imagetk
+
+BUILDREQUIREMENTS="python-zsi qhull-bin libqhull-dev python-pmw python-tk blt python-all freeglut3-dev python-all-dev libglu1-mesa-dev tk-dev swig python-simpy python-all libxi-dev libxmu-dev idle python-pil.imagetk"
+  if [ -x /usr/bin/debfoster ]; then
+     sudo debfoster -u $BUILDREQUIREMENTS
+  else
+     sudo apt-get install $BUILDREQUIREMENTS
+  fi
   sudo apt-get install svn-buildpackage
 
 Now, there is a build-order to get all the packages built and installed