[X2Go-Commits] [buildscripts] 02/03: generate-nsis-version.pl: Generate release strings
git-admin at x2go.org
git-admin at x2go.org
Fri May 8 23:21:08 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit 474e09c8e9dd7ae5a4571157172f10a4a4d6d54c
Author: Mike DePaulo <mikedep333 at gmail.com>
Date: Fri May 8 16:10:53 2015 -0400
generate-nsis-version.pl: Generate release strings
if env var $RELEASE is defined.
This enables us to do official builds of x2goclient from Jenkins.
---
bin/generate-nsis-version.pl | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/bin/generate-nsis-version.pl b/bin/generate-nsis-version.pl
index 8a85032..7c136d3 100755
--- a/bin/generate-nsis-version.pl
+++ b/bin/generate-nsis-version.pl
@@ -4,7 +4,13 @@ use strict;
use POSIX qw(strftime);
-my $date = strftime "%Y.%m.%d", localtime;
+my $date;
+
+if (defined $ENV{'RELEASE'}) {
+ $date = strftime "%Y%m%d", localtime;
+} else {
+ $date = strftime "%Y.%m.%d", localtime;
+}
open(F,"<$ARGV[0]/src/version.h") or die;
my @lines=<F>;
@@ -21,7 +27,11 @@ close(F);
$text=join("", at lines);
-$text=~s/X2GOCLIENT_VERSION/$version-$date-$hash/;
+if (defined $ENV{'RELEASE'}) {
+ $text=~s/X2GOCLIENT_VERSION/$version-$date/;
+} else {
+ $text=~s/X2GOCLIENT_VERSION/$version-$date-$hash/;
+}
#print $text;
open(F,">$ARGV[0]/nsis/x2goclient.nsi") or die;
--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
More information about the x2go-commits
mailing list