Permalink
Browse files

R: generate version string instead of taking VERSION file.

This is because if you forgot to run ../../bootstrap.sh, then
the version string of the R package was incorrect.
  • Loading branch information...
1 parent 3094e87 commit 3f90a535ff2853b30177508a0b55c4de81a3623c @gaborcsardi gaborcsardi committed Oct 21, 2013
Showing with 6 additions and 3 deletions.
  1. +1 −1 bootstrap.sh
  2. +1 −1 interfaces/R/Makefile
  3. +1 −1 interfaces/R/tools/convertversion.sh
  4. +3 −0 tools/getversion.sh
View
@@ -2,7 +2,7 @@
## Find out our version number, need git for this
printf "Finding out version number/string... "
-git describe HEAD --tags | rev | sed 's/g-/./' | sed 's/-/+/' | rev > VERSION
+tools/getversion.sh > VERSION
cat VERSION
for i in glibtoolize libtoolize; do
@@ -1,5 +1,5 @@
-VERSION=$(shell ./tools/convertversion.sh ../../VERSION)
+VERSION=$(shell ./tools/convertversion.sh)
DATAVERSION=0.1
top_srcdir=../..
@@ -1,6 +1,6 @@
#! /bin/sh
-vstring=`cat ../../VERSION`
+vstring=`../../tools/getversion.sh`
if echo "$vstring" | grep -q '\+'; then
pvstring=`echo $vstring |
sed 's/\(^[0-9\.]*\)[^+]*[+]*\([0-9][0-9]*\)\.\([0-9a-f]*\)$/\1|\2|\3/'`
View
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+git describe HEAD --tags | rev | sed 's/g-/./' | sed 's/-/+/' | rev

0 comments on commit 3f90a53

Please sign in to comment.