From 6bcf0ea65a4fe27306b0f0a727dbc42dc954d9a0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 14 Jan 2022 18:49:29 +0000 Subject: [PATCH] CORE-594 - Use an ini file to pass parameters to install shield --- install/install.groovy | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/install/install.groovy b/install/install.groovy index ac5caac..c2090d6 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -219,12 +219,42 @@ pipeline { installerhelper.checkISMfile("${EXECUTIONPATH}\\${ISMPROJECT}") installerhelper.selectSigningCertificate(NODE_NAME, "${EXECUTIONPATH}\\${ISMPROJECT}") + // Fill settings file + //-i <.ini file path> + def IS_INI_CONTENT = [ + "[Project]", + "Name=\"${ISMPROJECT}\"", + "BuildLabel=x64", + "Product=\"${EXE_NAME_PREFIX}\"", + "", + "[Release]", + "Name=${VARIANT}", + "", + "[Mode]", + "Verbose=${(VERBOSE == "true")?'yes':'no'}", + "DotNetPath=\"${DOTNET_FRAMEWORK64_PATH}\"", + "PrerequisitePath=\"${INST_PREQ}\"", + ].join('\n') + dir(EXECUTIONPATH) { - // INSTALLSHIELD201X_CMD and DOTNET_FRAMEWORK64_PATH must be externally defined + def IS_INI_FILE = 'is.ini' + echo "Writing:\n${IS_INI_CONTENT}\nto: ${IS_INI_FILE}" + writeFile(file: IS_INI_FILE, text: IS_INI_CONTENT) bat """ - "${installcmd}" -t "${DOTNET_FRAMEWORK64_PATH}" -p "${ISMPROJECT}" -y "${INST_ISVERSION}" -l "WORKSPACE=${WORKSPACE}" -l "APP_PACKAGE_BIN=${APP_PACKAGE_BIN}" -l "CONTROL_PACKAGE_BIN=${CONTROL_PACKAGE_BIN}" -l "LNPU_BIN=${LNPU_BIN}" -l "INST_OUT=${INST_OUT}" -l "INST_EULA=${INST_EULA}" -l "INST_SUPPORT=${INST_SUPPORT}" -l "INST_VERSIONINFO=${VERSIONINFO}" -prqpath "${INST_PREQ}" ${INST_VERBOSE} ${INST_VARIANT} -a x64 + "${installcmd}" ^ + -i "${IS_INI_FILE}" ^ + -y "${INST_ISVERSION}" ^ + -l "WORKSPACE=${WORKSPACE}" ^ + -l "APP_PACKAGE_BIN=${APP_PACKAGE_BIN}" ^ + -l "CONTROL_PACKAGE_BIN=${CONTROL_PACKAGE_BIN}" ^ + -l "LNPU_BIN=${LNPU_BIN}" ^ + -l "INST_OUT=${INST_OUT}" ^ + -l "INST_EULA=${INST_EULA}" ^ + -l "INST_SUPPORT=${INST_SUPPORT}" ^ + -l "INST_VERSIONINFO=${VERSIONINFO}" """ } + //-z installerhelper.copyToFinalPosition(pathToIntermediate, FINALBASEFOLDER, FINALFILENAME)