[X2Go-Commits] [buildscripts] 01/01: Add git short hash to the version string (So that earlier nightly builds from the same day are not overwritten)

git-admin at x2go.org git-admin at x2go.org
Sat Sep 13 17:20:21 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit a1c3e517f3e709b3f5e14eeba8caa93504d4715a
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Sep 13 11:20:10 2014 -0400

    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(-)

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("", at 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("", at 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;

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list