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

[Steffen Möller]

Author: moeller
Date: 2009-06-03 11:49:48 +0000 (Wed, 03 Jun 2009)
New Revision: 3456

Modified:
   trunk/packages/mgltools/BUILD
Log:
Further fixes and improvements.


Modified: trunk/packages/mgltools/BUILD
===================================================================
--- trunk/packages/mgltools/BUILD	2009-06-03 11:34:39 UTC (rev 3455)
+++ trunk/packages/mgltools/BUILD	2009-06-03 11:49:48 UTC (rev 3456)
@@ -151,36 +151,44 @@
 without broken dependencies. The installation is not required for the
 building, though. Try the following:
 
+  #scenario 
+  if [ -d build-area ]; then rm -r build-area; fi
+  d=`pwd`
   for p in  \
-    support \
-    scenario \
-    symserv \
-    pybabel \
-    pyglf \
-    bhtree \
-    sff \
-    mglutil \
-    geomutils \
-    volume \
-    utpackages \
-    opengltk \
-    dejavu \
-    molkit \
-    pmv \
-    gle \
-    viewerframework \
-    pyautodock \
-    networkeditor \
-    vision \
+    support symserv pybabel pyglf volume utpackages \
+    bhtree sff mglutil geomutils \
+    opengltk dejavu \
+    molkit pmv  gle viewerframework \
+    pyautodock networkeditor vision \
+    autodocktools \
   ; do
-    (cd $p/trunk && \
-     test -r "$p/trunk/.svn/deb-layout" || echo "origDir=../../tarballs" > $p/trunk/.svn/deb-layout; \
-     svn-buildpackage -us -uc -rfakeroot --svn-ignore && \
-     sudo dpkg -i ../../build-area/mgltools-${p}_${VERSIONNAME}*.deb)
-  done \
-  && (cd autodocktools/trunk && \
-     svn-buildpackage -us -uc -rfakeroot --svn-ignore && \
-     sudo dpkg -i ../../build-area/autodocktools_${VERSIONNAME}*.deb)
+     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
+     if find $d/build-area -name ${prefix}${p}_${VERSIONNAME}*.deb|grep -q $p; then
+       echo "Package for '$p' already exists - skipping."; continue
+     else
+       echo "Files like ${prefix}${p}_${VERSIONNAME}*.deb not found in $d/build-area"
+     fi
+     cd "$d/$p/trunk"
+     if [ ! -r ".svn/deb-layout" ]; then
+         echo "origDir=../../tarballs" > .svn/deb-layout
+         echo "buildArea=../../build-area" >> .svn/deb-layout
+     fi
+     if !  svn-buildpackage -us -uc -rfakeroot --svn-ignore ; then
+         echo    "** ERROR ** building of package '$p' failed."
+	 echo -n "            pwd: " ; pwd
+	 if [ -d "$d" ]; then cd "$d"; fi
+	 break
+     fi
+     if ! sudo dpkg -i ../../build-area/${prefix}${p}_${VERSIONNAME}*.deb; then
+         echo    "** ERROR ** installation of package '$p' failed."
+	 echo -n "            pwd: " ; pwd
+	 if [ -d "$d" ]; then cd "$d"; fi
+	 break
+     fi
+  done
 
   # Rejected by FTP-Master
   #  cmolkit \  -- which should come as GPL