@@ -20,12 +20,12 @@ namespace CrissCross
{
const char *ShortVersion()
{
- return CC_LIB_VERSION;
+ return CC_LIB_VERSION_TAG;
}
const char *LongVersion()
{
- return CC_LIB_VERSION_STRING;
+ return CC_LIB_VERSION_LONG;
}
int Major()
source/version.cpp
@@ -49,49 +49,67 @@ if (!$verstring) {
chomp($verstring);
-my $pattern = "([0-9]+).([0-9]+).([0-9]+)(?:(?:-([a-zA-Z]+[0-9]+))?(?:-([0-9]+)-g[a-fA-F0-9]+)?)?";
+# This gets us:
+# $1.$2.$3.$4-$5-$6
+my $component_pattern = "([0-9]+)[.]([0-9]+)[.]([0-9]+)(?:[.]([0-9]+))?(?:(?:-([a-zA-Z]+[0-9]+))?(?:-([0-9]+)-g[a-fA-F0-9]+)?)?";
-if ($verstring =~ $pattern) {
+if ($verstring =~ $component_pattern) {
} else {
die "Version string '$verstring' is malformed...\n";
}
-my $major = $1;
-my $minor = $2;
-my $revis = $3;
-my $build = $5;
-my $pre = $4;
+my $major = $1;
+my $minor = $2;
+my $revis = $3;
+my $build = $4;
+my $commit = $6;
-if ( !$build ) {
- $build = "0";
+# Git didn't give us a --long format?
+if ( !$commit ) {
+ $commit = 0;
}
-if ( $pre ) {
- # We have a prerelease version.
- $pre = "-$pre";
+# This gets us just the tag:
+my $tag_pattern = "([0-9]+[.][0-9]+[.][0-9]+(?:[.][0-9]+)?(?:(?:-[a-zA-Z]+[0-9]+)?))";
+
+if ($verstring =~ $tag_pattern) {
} else {
- $pre = "";
+ die "Version string '$verstring' is malformed...\n";
+}
+
+my $tag = $1;
+
+# We assume here that we must be using a different
+# version number convention.
+if ( !$build ) {
+ $build = $commit;
+}
+
+# If we're at the tag, don't make the long
+# version longer than necessary.
+if ( $commit == 0 ) {
+ $verstring = $tag;
}
unlink("$outfile.tmp");
-my $prefix = "CC_LIB";
-my $tag = "cc";
+my $prefix = "CC_LIB";
+my $smprefix = "cc";
open OUT, ">", "$outfile.tmp" or die $!;
print OUT <<__eof__;
-#ifndef __included_${tag}_build_number_h
-#define __included_${tag}_build_number_h
+#ifndef __included_${smprefix}_build_number_h
+#define __included_${smprefix}_build_number_h
#define ${prefix}_VERSION_MAJOR ${major}
#define ${prefix}_VERSION_MINOR ${minor}
#define ${prefix}_VERSION_REVISION ${revis}
#define ${prefix}_VERSION_BUILD ${build}
-#define ${prefix}_VERSION \"${major}.${minor}.${revis}${pre}\"
-#define ${prefix}_VERSION_STRING "${verstring}"
+#define ${prefix}_VERSION_TAG "${tag}"
+#define ${prefix}_VERSION_LONG "${verstring}"
#define ${prefix}_RESOURCE_VERSION ${major},${minor},${revis},${build}
-#define ${prefix}_RESOURCE_VERSION_STRING \"${major}, ${minor}, ${revis}, ${build}\"
+#define ${prefix}_RESOURCE_VERSION_STRING "${major}, ${minor}, ${revis}, ${build}"
#endif
tools/gen_buildnum_h.pl
ac98a981fb3de1bfe2ba1501f3f2f885d5569e51
Steven Noonan
steven@uplinklabs.net
http://github.com/tycho/crisscross/commit/709868c09c287401f9fe29b72c4a297b94dfcafc
709868c09c287401f9fe29b72c4a297b94dfcafc
2009-07-06T01:55:45-07:00
2009-07-06T01:55:45-07:00
gen_buildnum_h.pl: simplify header generation
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
e6b87258809b81a6aa54110dc5a7e6b653739db3
Steven Noonan
steven@uplinklabs.net