From f1be0105d66235418be974f1edadd73e9fea170d Mon Sep 17 00:00:00 2001 From: Paul Fenwick Date: Sat, 4 Oct 2014 19:36:54 +1000 Subject: [PATCH] Use `git describe --long` for version numbers. --- CKAN/CKAN/Properties/AssemblyInfo.cs | 6 +++++- bin/build | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CKAN/CKAN/Properties/AssemblyInfo.cs b/CKAN/CKAN/Properties/AssemblyInfo.cs index f48ea97b48..ac46a6d702 100644 --- a/CKAN/CKAN/Properties/AssemblyInfo.cs +++ b/CKAN/CKAN/Properties/AssemblyInfo.cs @@ -14,7 +14,11 @@ // The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. -[assembly: AssemblyVersion ("0.0.1.*")] + +// We don't use AssemblyVersions, since the build system adds them for us, +// based upon git tags and commit numbers. +//[assembly: AssemblyVersion ("0.0.1.*")] + // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. //[assembly: AssemblyDelaySign(false)] diff --git a/bin/build b/bin/build index 7731a5ab55..2e8bd5be98 100755 --- a/bin/build +++ b/bin/build @@ -16,7 +16,7 @@ my $OUTNAME = "ckan.exe"; # Or just `ckan` if we want to be unixy my $BUILD = "$Bin/../build"; my $SOURCE = "$Bin/../CKAN"; my @CP = qw(cp -r --reflink=auto --sparse=always); -my $VERSION = capturex(qw(git rev-parse --short HEAD)); +my $VERSION = capturex(qw(git describe --long)); my $ASSEMBLY_INFO = File::Spec->catdir($BUILD,"CKAN/Properties/AssemblyInfo.cs"); # Remove newline