Changeset 30197 for gs2-extensions/ocr/trunk

Timestamp:

2015-09-04T17:18:38+12:00 (9 years ago)

Author:

davidb

Message:

Added support for Python and CMake

File:

• gs2-extensions/ocr/trunk/lib/cascade-lib.bash (modified) (3 diffs)

gs2-extensions/ocr/trunk/lib/cascade-lib.bash

@@ -114 +114 @@
 }
 
-
-opt_run_make()
+opt_run_setuppy()
 {
   local type=$1
@@ -128 +127 @@
   if [ $type = "1" ] ; then
     ( cd $package$version ; \
+      python setup.py $opt_target)
+
+    if [ $? != 0 ] ; then
+        echo "      Error encountered running *setup.py $target* stage of $progname"
+        exit 1
+    fi
+  fi
+}
+
+opt_run_make()
+{
+  local type=$1
+  local package=$2
+  local version=$3
+  local opt_target=""
+
+  if [ ! -z "$4" ] ; then
+    opt_target=$4
+  fi
+
+  if [ $type = "1" ] ; then
+    ( cd $package$version ; \
       make $opt_target)
 
@@ -137 +158 @@
 }
 
-
+opt_run_cmake()
+{
+  local type=$1
+  local package=$2
+  local version=$3
+  local subdir=$4
+  local opt_target=""
+
+  if [ ! -z "$5" ] ; then
+    opt_target=$5
+  fi
+
+  if [ $type = "1" ] ; then
+    ( cd $package$version/$subdir ; \
+      make $opt_target)
+
+    if [ $? != 0 ] ; then
+        echo "      Error encountered running *make $target* stage of $progname"
+        exit 1
+    fi
+  fi
+}
 
 force_untar=0