[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35125] trunk/blender/build_files/ package_spec: patch [#26178] build_debian.sh: Use BLENDER_VERSION_CHAR

[Campbell Barton]

Revision: 35125
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35125
Author:   campbellbarton
Date:     2011-02-24 14:03:29 +0000 (Thu, 24 Feb 2011)
Log Message:
-----------
patch [#26178] build_debian.sh: Use BLENDER_VERSION_CHAR
from Shinsuke Irie (irie)
    also apply to pacman.

Modified Paths:
--------------
    trunk/blender/build_files/package_spec/build_debian.sh
    trunk/blender/build_files/package_spec/pacman/PKGBUILD

Modified: trunk/blender/build_files/package_spec/build_debian.sh
===================================================================
--- trunk/blender/build_files/package_spec/build_debian.sh	2011-02-24 13:37:53 UTC (rev 35124)
+++ trunk/blender/build_files/package_spec/build_debian.sh	2011-02-24 14:03:29 UTC (rev 35125)
@@ -14,9 +14,16 @@
 # value may be formatted: 35042:35051M
 BLENDER_REVISION=$(svnversion | cut -d: -f2 | tr -dc 0-9)
 
-blender_srcdir=$PWD
-blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_version=$(grep BLENDER_VERSION source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' source/blender/blenkernel/BKE_blender.h)
 BLENDER_VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)
+
+# map the version a -> 1, to conform to debian naming convention
+# not to be confused with blender's internal subversions
+if [ "$blender_version_char" ]; then
+    BLENDER_VERSION=${BLENDER_VERSION}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
+fi
+
 DEB_VERSION=${BLENDER_VERSION}+svn${BLENDER_REVISION}-bf
 
 # update debian/changelog

Modified: trunk/blender/build_files/package_spec/pacman/PKGBUILD
===================================================================
--- trunk/blender/build_files/package_spec/pacman/PKGBUILD	2011-02-24 13:37:53 UTC (rev 35124)
+++ trunk/blender/build_files/package_spec/pacman/PKGBUILD	2011-02-24 14:03:29 UTC (rev 35125)
@@ -5,9 +5,18 @@
 # value may be formatted: 35042:35051M
 blender_revision=$(svnversion $blender_srcdir | cut -d: -f2 | tr -dc 0-9)
 blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
+blender_version=$(expr $blender_version / 100).$(expr $blender_version % 100)  # 256 -> 2.56
+blender_version_char=$(sed -ne 's/.*BLENDER_VERSION_CHAR.*\([a-z]\)$/\1/p' $blender_srcdir/source/blender/blenkernel/BKE_blender.h)
 # blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
-blender_ver_string=$(expr $blender_version / 100).$(expr $blender_version % 100)+svn$blender_revision
 
+# map the version a -> 1
+# not to be confused with blender's internal subversions
+if [ "$blender_version_char" ]; then
+    blender_version=${blender_version}.$(expr index abcdefghijklmnopqrstuvwxyz $blender_version_char)
+fi
+
+blender_ver_string=$blender_version+svn$blender_revision
+
 pkgname=blender-snapshot
 pkgver=$blender_ver_string
 pkgrel=1