vers 303: fix versione VB6 x osai 10 vers2

This commit is contained in:
Samuele E. Locatelli
2018-11-23 16:23:40 +01:00
parent 30543218fc
commit 097b086ffc
5 changed files with 13 additions and 5 deletions
+4 -4
View File
@@ -14,13 +14,13 @@ Public Class ComCNOSAIVB6
Inherits ComCNOsai
Public Sub New(ByRef szRemoteName As String, ByRef b_debug As Boolean)
Public Sub New(ByVal szRemoteName As String, ByVal b_debug As Boolean)
MyBase.New(szRemoteName, b_debug)
MyBase.New(szRemoteName, b_debug)
End Sub
End Sub
Public Overrides Function OpenSession() As Boolean
Public Overrides Function OpenSession() As Boolean
Dim nReturn As Short
Binary file not shown.
+4
View File
@@ -709,6 +709,10 @@ namespace IOB_UT
/// </summary>
OSAI_OPEN,
/// <summary>
/// Adapter OSAI VB6
/// </summary>
OSAI_VB6,
/// <summary>
/// Adapter SIEMENS
/// </summary>
SIEMENS,
+4
View File
@@ -252,6 +252,10 @@ namespace IOB_WIN
{
OSAI_ref = new Open_Series(IOBConf.cncIpAddr, false);
}
else if (IOBConf.tipoIob == tipoAdapter.OSAI_VB6)
{
OSAI_ref = new ComCNOSAIVB6(IOBConf.cncIpAddr, false);
}
else
{
OSAI_ref = new ComCNOsai(IOBConf.cncIpAddr, false);
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=302']) {
withEnv(['NEXT_BUILD_NUMBER=303']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'