diff --git a/compile/compile.groovy b/compile/compile.groovy index cedf888..78ba926 100644 --- a/compile/compile.groovy +++ b/compile/compile.groovy @@ -32,7 +32,7 @@ pipeline { steps { script { SOURCEURL = 'git@hydra:core-presto/pc-utilities/local-network-package-updater.git' - SOURCEREVISION = "${SOURCE_REVISION}" + SOURCEREVISION = SOURCE_REVISION SOURCE_PATH = 'lnpu' configurationhelper.gitCheckoutAndRegister(meta, 'lnpu', SOURCEURL, SOURCEREVISION, SOURCE_PATH, '', 0, false) env.SRC = "${SOURCE_PATH}\\Local Network Package Updater" diff --git a/install/install.groovy b/install/install.groovy index c2090d6..212fea3 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -216,8 +216,17 @@ pipeline { if (VARIANT != "" ) { INST_VARIANT = '-r ' + VARIANT } - installerhelper.checkISMfile("${EXECUTIONPATH}\\${ISMPROJECT}") - installerhelper.selectSigningCertificate(NODE_NAME, "${EXECUTIONPATH}\\${ISMPROJECT}") + + def ISM_PROJECT_FILE_PATH = "${EXECUTIONPATH}\\${ISMPROJECT}" + convertdetails = [ + // File to convert Pattern to replace New string + [ ISM_PROJECT_FILE_PATH, "-INSTALLER PRODUCT NAME-", EXE_NAME_PREFIX ], + ] + versionnumbering = load("${autobuilder.commonscripts()}/versionnumbering/do.groovy") + //versionnumbering.stamp(convertdetails) + + installerhelper.checkISMfile(ISM_PROJECT_FILE_PATH) + installerhelper.selectSigningCertificate(NODE_NAME, ISM_PROJECT_FILE_PATH) // Fill settings file //-i <.ini file path> @@ -251,7 +260,8 @@ pipeline { -l "INST_OUT=${INST_OUT}" ^ -l "INST_EULA=${INST_EULA}" ^ -l "INST_SUPPORT=${INST_SUPPORT}" ^ - -l "INST_VERSIONINFO=${VERSIONINFO}" + -l "INST_VERSIONINFO=${VERSIONINFO}" ^ + -z "ProductName=${EXE_NAME_PREFIX}" """ } //-z