diff --git a/IOB-WIN/Resources/ChangeLog.html b/IOB-WIN/Resources/ChangeLog.html index b5d933a3..642d8699 100644 --- a/IOB-WIN/Resources/ChangeLog.html +++ b/IOB-WIN/Resources/ChangeLog.html @@ -1,27 +1,36 @@ -

MAPO-IOB-WIN

-

TEST UPDATE

-Note di rilascio: -

- v.0.10 + +

MAPO-IOB-WIN

+ Acquisitore MAPO-IOB per sistemi Windows +

Versione: {{CURRENT-REL}}

+
+ Note di rilascio: -

-

- v.0.9 -

-

-

- v.0.8 -

-

-

- v.0.7 -

-

+
+
+ +
+
+ © Steamware 2006-2017 +
+
+ + \ No newline at end of file diff --git a/IOB-WIN/Resources/logo_sw_149.png b/IOB-WIN/Resources/logo_sw_149.png new file mode 100644 index 00000000..0958b50a Binary files /dev/null and b/IOB-WIN/Resources/logo_sw_149.png differ diff --git a/Jenkinsfile b/Jenkinsfile index f5426ffa..eb0d03f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,8 +12,8 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { withEnv(['NEXT_BUILD_NUMBER=67']) { - // env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + // env.versionNumber = VersionNumber(versionNumberString : '1.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '1.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN' } } @@ -72,8 +72,9 @@ pipeline { // elimino files conf personalizzata per ogni install... bat "RD /S /Q IOB-WIN\\bin\\DATA" // manifest.xml: aggiorno versNumber ed URL del branch di update... - bat "fart.exe IOB-WIN\\Resources\\manifest.xml 1.0.0.0 ${env.versionNumber} || EXIT /B 0" - bat "fart.exe IOB-WIN\\Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0" + bat "fart.exe IOB-WIN\\Resources\\manifest.xml 1.0.0.0 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe IOB-WIN\\Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0" + bat "fart.exe IOB-WIN\\Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0" // copio ed esporto in IIS02 i vari files .xml, .html, .zip bat "xcopy /y IOB-WIN\\Resources\\manifest.xml c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\${env.BRANCH_NAME}\\ " bat "xcopy /y IOB-WIN\\Resources\\ChangeLog.html c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\${env.BRANCH_NAME}\\ "