diff --git a/IOB-WIN/DATA/CONF/IOB.ini b/IOB-WIN/DATA/CONF/IOB.ini index f33adfae..186dfd4e 100644 --- a/IOB-WIN/DATA/CONF/IOB.ini +++ b/IOB-WIN/DATA/CONF/IOB.ini @@ -43,4 +43,7 @@ PZCOUNT_MODE=BIT PZ_CAD_MADDR=1602 PZ_REQ_MADDR=1603 PZ_DONE_MADDR=1604 -PZ_GTOT_MADDR=1605 \ No newline at end of file +PZ_GTOT_MADDR=1605 + +[BRANCH] +NAME=develop \ No newline at end of file diff --git a/IOB-WIN/MainForm.cs b/IOB-WIN/MainForm.cs index 2dea1962..d5d5fe19 100644 --- a/IOB-WIN/MainForm.cs +++ b/IOB-WIN/MainForm.cs @@ -72,13 +72,18 @@ namespace IOB_WIN /// public tipoAdapter tipoScelto = tipoAdapter.DEMO; /// + /// Ramo applicazione (x update) + /// + protected string branchName = ""; + /// /// URL stringa di UPDATE... /// protected string updateUrl { get { - return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/IOB-WIN/{0}/manifest.xml", utils.CRS("appVers")); + string branchName = utils.CRS("appVers"); + return string.Format("http://seriate.steamware.net:8083/SWS/MAPO/IOB-WIN/{0}/manifest.xml", branchName); } } @@ -144,12 +149,6 @@ namespace IOB_WIN /// public MainForm() { - // se NON sono in DEBUG faccio check update... -#if !(DEBUG) - // avvio autoupdater... - AutoUpdater.Start(updateUrl); -#endif - // continuo avvio... InitializeComponent(); lblStatus.Text = "Loading"; @@ -568,6 +567,14 @@ namespace IOB_WIN displayTaskAndLog(string.Format("Loading iniConfFile: {0}", iniConfFile)); IniFile fIni = new IniFile(iniConfFile); + // salvo branchName... + branchName = fIni.ReadString("BRANCH", "NAME", "develop"); + // se NON sono in DEBUG faccio check update... +#if !(DEBUG) + // avvio autoupdater... + AutoUpdater.Start(updateUrl); +#endif + // verifico tipo adapter tipoScelto = (tipoAdapter)Enum.Parse(typeof(tipoAdapter), fIni.ReadString("IOB", "CNCTYPE", "DEMO")); // carivo vettore parametri opzionai diff --git a/Jenkinsfile b/Jenkinsfile index 4e5a9c12..4b9e6206 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=189']) { + withEnv(['NEXT_BUILD_NUMBER=190']) { // env.versionNumber = VersionNumber(versionNumberString : '1.16.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.16.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN'