diff --git a/oscr/version.h b/oscr/version.h index 165523e4..92f29504 100644 --- a/oscr/version.h +++ b/oscr/version.h @@ -13,9 +13,9 @@ #include "build_number.h" const int major_version = 1; // incompatible API changes -const int minor_version = 1; // new features that don't break things -const int revision_number = 1; // bugfixes, revisions -const QString ReleaseStatus = "testing"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable +const int minor_version = 0; // new features that don't break things +const int revision_number = 0; // bugfixes, revisions +const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number); const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number); diff --git a/version.sh b/version.sh index f195d85b..67f0aa1a 100755 --- a/version.sh +++ b/version.sh @@ -1,9 +1,9 @@ #!/bin/bash -version=`cat ./sleepyhead/version.h | perl -ne 'my @array = /^const\s*int (major|minor|revision)_(version|number) = (\d+;).*/; print $array[2]' | perl -ne 'my @ar=split(";"); print join(".", @ar);'` -buildno=`cat ./sleepyhead/scripts/build_number` +version=`cat ./oscr/version.h | perl -ne 'my @array = /^const\s*int (major|minor|revision)_(version|number) = (\d+;).*/; print $array[2]' | perl -ne 'my @ar=split(";"); print join(".", @ar);'` +buildno=`cat ./oscr/scripts/build_number` gitversion=`git rev-parse --short HEAD` -echo "SleepyHead Source Information" +echo "OSCR Source Information" echo "Current Version: v${version}-${buildno} (git rev ${gitversion})" echo "Last commit: `git log -1 --format=%cd`" echo "Use 'git pull' to get up to date"