[xiph-commits] r18102 - trunk/ffmpeg2theora

[j at svn.xiph.org]

Author: j
Date: 2011-10-07 07:16:13 -0700 (Fri, 07 Oct 2011)
New Revision: 18102

Modified:
   trunk/ffmpeg2theora/SConstruct
   trunk/ffmpeg2theora/version.sh
Log:
fix version.sh if svnversion is not installed

Modified: trunk/ffmpeg2theora/SConstruct
===================================================================
--- trunk/ffmpeg2theora/SConstruct	2011-10-07 13:07:53 UTC (rev 18101)
+++ trunk/ffmpeg2theora/SConstruct	2011-10-07 14:16:13 UTC (rev 18102)
@@ -5,14 +5,13 @@
 
 import SCons
 
-def svnversion():
+def version():
     f = os.popen("./version.sh")
     version = f.read().strip()
     f.close()
     return version
 
-pkg_version="0.28"
-pkg_version +="+svn" + svnversion()
+pkg_version=version()
 
 pkg_name="ffmpeg2theora"
 

Modified: trunk/ffmpeg2theora/version.sh
===================================================================
--- trunk/ffmpeg2theora/version.sh	2011-10-07 13:07:53 UTC (rev 18101)
+++ trunk/ffmpeg2theora/version.sh	2011-10-07 14:16:13 UTC (rev 18102)
@@ -1,2 +1,10 @@
 cd `dirname $0`
-svnversion
+version='0.28'
+test -e .svn && svnversion=`which svnversion`
+echo -n $version
+if [ "x$svnversion" != "x" ]; then
+    echo -n "+svn"
+    svnversion
+else
+    echo
+fi