Skip to content

Commit

Permalink
Use git describe --long for version numbers.
Browse files Browse the repository at this point in the history
  • Loading branch information
pjf committed Oct 4, 2014
1 parent 47d9b6c commit f1be010
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion CKAN/CKAN/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion bin/build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f1be010

Please sign in to comment.