diff --git a/install/install.groovy b/install/install.groovy index 3e6e919..1c1a40e 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -143,14 +143,15 @@ pipeline { lnpubuildmeta = importer.artifactimport(meta, lnpubuildimportoptions, LNPUBUILDIMPORT) def BUILD_STAMP=meta.buildstampinfo.buildstamp + def PRODUCT_NAME=meta.productinfo.productname artifactDetails = [ // Key, Artifacts Source project Artifacts source selector, Destination folder Increment Version Number Artifacts to copy Artifacts to not copy Binaries Folders AppPackageSet: [PACKAGE_CREATE_JOB, PACKAGE_CREATE_JOB_SELECTOR, "${IMPORTSPATH}\\build\\apppackage", false, '**', '**/*.pdb,**/*.lib', [ 'bin', 'scripts'], ], ControlPackageSet: [CONTROL_PACKAGE_CREATE_JOB, CONTROL_PACKAGE_CREATE_JOB_SELECTOR, "${IMPORTSPATH}\\build\\controlpackage", false, '**', '**/*.lib', [ 'bin', 'scripts'], ], ] installerDetails = [ - // Key, Installer command artifactSet Target folder Execution path ISM project file Variant Intermediate output path Component base folder Final filename - LNPU: [INSTALLSHIELD2020_CMD, ['AppPackageSet','ControlPackageSet'], 'install_core', "${SOURCE_PATH}\\installer\\build\\core", 'Core.ism', '', "${INTERMEDIATEEXPORTSPATH}/install_core/x64/XR1003/DiskImages/DISK1/GIS Inkjet OS 2.exe", "${EXPORTSPATH}/XR1003", "GIS Inkjet OS XR1003 ${BUILD_STAMP}.exe" ], + // Key, Installer command artifactSet Target folder Execution path ISM project file Variant Intermediate output path Component base folder Final filename + LNPU: [INSTALLSHIELD2020_CMD, ['AppPackageSet','ControlPackageSet'], 'install_core', "${SOURCE_PATH}\\installer\\build\\core", 'Core.ism', '', "${INTERMEDIATEEXPORTSPATH}/install_core/x64/ALL/DiskImages/DISK1/LNPU.exe", "${EXPORTSPATH}/ALL", "Local Network Package Updater ${PRODUCT_NAME} ${BUILD_STAMP}.exe" ], ] installerhelper = load("${autobuilder.commonscripts()}/install/installhelper.groovy") artifactFetched = installerhelper.artifactsImporter(meta, importer, toBuild, artifactDetails, installerDetails, true)