new upload design using python paramiko. also fix glew bugs.

2 files changed, 28 insertions, 12 deletions

diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index 8a7dda1..b5937ed 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -306,7 +306,14 @@ build_cgal()
 
 build_glew()
 {
-  if [ -e $DEPLOYDIR/include/GL/glew.h ]; then
+  GLEW_INSTALLED=
+  if [ -e $DEPLOYDIR/lib64/libGLEW.so ]; then
+    GLEW_INSTALLED=1
+  fi
+  if [ -e $DEPLOYDIR/lib/libGLEW.so ]; then
+    GLEW_INSTALLED=1
+  fi
+  if [ $GLEW_INSTALLED ]; then
     echo "glew already installed. not building"
     return
   fi
@@ -499,29 +506,29 @@ if [ "`cmake --version | grep 'version 2.[1-6][^0-9]'`" ]; then
   build_cmake 2.8.8
 fi
 
-build_git 1.7.10.3
-exit 1
-# Singly build CGAL or OpenCSG
-# (Most systems have all libraries available as packages except CGAL/OpenCSG)
-# (They can be built singly here by passing a command line arg to the script)
+# Singly build certain tools or libraries
 if [ $1 ]; then
+  if [ $1 == "git" ]; then
+    build_git 1.7.10.3
+    exit $?
+  fi
   if [ $1 = "cgal" ]; then
     build_cgal 4.0.2 use-sys-libs
-    exit
+    exit $?
   fi
   if [ $1 = "opencsg" ]; then
     build_opencsg 1.3.2
-    exit
+    exit $?
   fi
   if [ $1 == "qt4" ]; then
     # such a huge build, put here by itself
     build_qt4 4.8.4
-    exit
+    exit $?
   fi
   if [ $1 == "glu" ]; then
     # Mesa and GLU split in late 2012, so it's not on some systems
     build_glu 9.0.0
-    exit
+    exit $?
   fi
 fi
 
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh
index cf9f136..882cb17 100755
--- a/scripts/uni-get-dependencies.sh
+++ b/scripts/uni-get-dependencies.sh
@@ -6,8 +6,13 @@
 
 get_fedora_deps()
 {
- sudo yum install qt-devel bison flex eigen2-devel \
-  boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc pkgconfig git
+ sudo yum install qt-devel bison flex eigen2-devel python-paramiko \
+  boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc pkgconfig git libXmu-devel
+}
+
+get_qomo_deps()
+{
+ get_fedora_deps
 }
 
 get_altlinux_deps()
@@ -75,10 +80,14 @@ if [ -e /etc/issue ]; then
   get_fedora_deps
  elif [ "`grep -i mageia /etc/issue`" ]; then
   get_mageia_deps
+ elif [ "`grep -i qomo /etc/issue`" ]; then
+  get_qomo_deps
  elif [ "`command -v rpm`" ]; then
   if [ "`rpm -qa | grep altlinux`" ]; then
    get_altlinux_deps
   fi
+ else
+  unknown
  fi
 elif [ "`uname | grep -i freebsd `" ]; then
  get_freebsd_deps