From 32983c862f255eea67c868214eb8abc0cdd7bccc Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 12 Apr 2017 15:21:20 +0200
Subject: [PATCH] semplificato version number

---
 Jenkinsfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7b18360..f8ec378 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,18 +12,23 @@ pipeline {
 				/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
 				script {
 					withEnv(['NEXT_BUILD_NUMBER=4056']) {
-						env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, versionPrefix: '2.4.')
+						env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, versionPrefix: '')
 						/*env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, versionPrefix: '2.4.', overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')*/
     					env.APP_NAME = 'GPW'
 					}
 				}				
 				script {
 					currentBuild.displayName = "${env.versionNumber}"
-					currentBuild.description = "BUILD ${env.versionNumber}"
+					if (env.BRANCH_NAME == "master") { 
+						currentBuild.description = "BUILD ${env.versionNumber}"
+					}
+					else {
+						currentBuild.description = "TEST ${env.versionNumber}"
+					}
 				}
 				
 				/* CAMBIO numero versione in file sorgente!!! */
-				bat "fart.exe VersGen\\GPW.cs 2.4.999.0 ${env.versionNumber} || EXIT /B 0"
+				bat "fart.exe VersGen\\GPW.cs 999.0 ${env.versionNumber} || EXIT /B 0"
             }
         }
 		stage('Build') {