From 2fe5e6145a5e4d690f89d01f660e31fabca2587b Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 12 Apr 2017 15:27:25 +0200
Subject: [PATCH] cambio ancora conf build number...

---
 Jenkinsfile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f8ec378..8053b04 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,13 @@ 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: '')
+						if (env.BRANCH_NAME == "master") { 
+							env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
+						}
+						else
+						{
+							env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMMdd"}.${BUILDS_TODAY, XX}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
+						}
 						/*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'
 					}