From e4b734dc04bc1a1f1b38395898fb255ae411a304 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Tue, 18 Jan 2022 11:35:52 +0000 Subject: [PATCH] CORE-549 - Perform string substitions on ism file - to make the installer unique --- install/install.groovy | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/install/install.groovy b/install/install.groovy index 212fea3..fd5e5af 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -157,7 +157,7 @@ pipeline { controlpackageimportoptions.setincrementversionnumber(false) controlpackagemeta = importer.artifactimport(meta, controlpackageimportoptions, CONTROLPACKAGEIMPORTPATH) - BUILD_STAMP = apppackagemeta.buildstampinfo.buildstamp + BUILD_STAMP = apppackagemeta.globalreleasetag() PRODUCT_NAME = apppackagemeta.productinfo.productname EXE_NAME_PREFIX = "GIS ${PRODUCT_NAME} ${BUILD_STAMP} LNP Updater" @@ -217,10 +217,20 @@ pipeline { INST_VARIANT = '-r ' + VARIANT } + def nextproductcode = UUID.randomUUID().toString() + def nextupgradecode = UUID.randomUUID().toString() + 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 ], + // File to convert Pattern to replace New string + // [ ISM_PROJECT_FILE_PATH, '-INSTALLER PRODUCT NAME-', EXE_NAME_PREFIX ], // Use -z for this + [ ISM_PROJECT_FILE_PATH, '-INSTALLER PRODUCT NAME-', EXE_NAME_PREFIX ], + [ ISM_PROJECT_FILE_PATH, '-INSTALLER PROGRAM DIRECTORY-', EXE_NAME_PREFIX ], + [ ISM_PROJECT_FILE_PATH, '-INSTALLER SETUP FILENAME-', EXE_NAME_PREFIX ], + [ ISM_PROJECT_FILE_PATH, '{8E581C6A-A296-4C45-90E9-6F36C1465590}', nextproductcode ], + [ ISM_PROJECT_FILE_PATH, '{22047ECF-8BBF-4A1E-9D40-1EEA1B77B0F2}', nextupgradecode ], + [ ISM_PROJECT_FILE_PATH, '-INSTALLER SUBJECT-', "Installer for updating ${PRODUCT_NAME} firmware" ], + [ ISM_PROJECT_FILE_PATH, 'Launch LNPU', "Launch ${EXE_NAME_PREFIX}" ], ] versionnumbering = load("${autobuilder.commonscripts()}/versionnumbering/do.groovy") //versionnumbering.stamp(convertdetails)