From a1c3e517f3e709b3f5e14eeba8caa93504d4715a Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Sat, 13 Sep 2014 11:20:10 -0400
Subject: Add git short hash to the version string (So that earlier nightly
 builds from the same day are not overwritten)

---
 bin/generate-nsis-version.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/generate-nsis-version.pl b/bin/generate-nsis-version.pl
index 83a9a5c..ea2cf4b 100755
--- a/bin/generate-nsis-version.pl
+++ b/bin/generate-nsis-version.pl
@@ -13,6 +13,7 @@ close(F);
 my $text=join("",@lines);
 my $version=(split("VERSION \"",$text))[1];
 my $version=(split("\"",$version))[0];
+my $hash=`cd $ARGV[0] && git log --pretty=format:'%h' -n 1`;
 
 open(F,"<$ARGV[0]/nsis/x2goclient.nsi") or die;
 @lines=<F>;
@@ -20,7 +21,7 @@ close(F);
 
 $text=join("",@lines);
 
-$text=~s/X2GOCLIENT_VERSION/$version-$date/;
+$text=~s/X2GOCLIENT_VERSION/$version-$date-$hash/;
 #print $text;
 
 open(F,">$ARGV[0]/nsis/x2goclient.nsi") or die;
-- 
cgit v1.2.3