Changeset 22537 for gs2-extensions

Timestamp:

2010-07-31T23:54:16+12:00 (14 years ago)

Author:

max

Message:

Update the cascade script for MediaInfo to use the same conventions that with the other tools.

File:

• gs2-extensions/video/trunk/build-srcpack/packages/CASCADE-MAKE/MEDIAINFO.sh (modified) (2 diffs)

gs2-extensions/video/trunk/build-srcpack/packages/CASCADE-MAKE/MEDIAINFO.sh

@@ -10 +10 @@
 prefix=$GEXTVIDEO_INSTALLED
 
-opt_run_untar $force_untar $auto_untar $package $version .tar.bz2
+opt_run_untar $force_untar $auto_untar $package $version ".tar.bz2"
 
 #opt_run_configure $force_config $auto_config $package $version "$prefix" \
@@ -19 +19 @@
 #opt_run_make $distclean $package $version "distclean"
 
-# Run an automatic script that will compile MediaInfo with the dependencies
-cd $package$version
-echo Launching the MediaInfo automatic script CLI_Compile.sh
-./CLI_Compile.sh
-cd MediaInfo/Project/GNU/CLI
-# Copy the static executable to the installed bin directory
-cp -p mediainfo $GEXTVIDEO_INSTALLED/bin
+
+if [ -d $package$version ] ; then
+  echo "****"
+  echo "* Always (for now) have it run the automatic script for MediaInfo"
+  echo "****"
+
+# Run an automatic script that will configure and compile MediaInfo with the dependencies
+  ( echo "[pushd $package$version]"a ; \
+    cd $package$version ; \
+    ./CLI_Compile.sh )
+
+    if [ $? != 0 ] ; then
+        echo "      Error encountered running the automatic script of $progname"
+        exit 1
+    fi
+    echo "[popd]"
+fi
+
+
+if [ $install = "1" ] ; then
+  ( echo "[pushd $package$version]" ; \
+    cd $package$version/MediaInfo/Project/GNU/CLI ; \
+    cp -p mediainfo $GEXTVIDEO_INSTALLED/bin )
+
+  if [ $? != 0 ] ; then
+      echo "      Error encountered running *install* stage of $progname"
+      exit 1
+  fi
+  echo "[popd]"
+fi
 
 
 opt_run_tarclean $tarclean $package $version
-