From 114cc57876eac3400f9b1be43d007d1b9d1ee3fc Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 23 Oct 2020 17:30:53 +0100 Subject: [PATCH] Customise script for custom modules --- install/install.groovy | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/install/install.groovy b/install/install.groovy index 0ba4502..4dfd178 100644 --- a/install/install.groovy +++ b/install/install.groovy @@ -86,10 +86,10 @@ pipeline { stage('Checkout source') { steps { script { - SOURCEURL = 'git@hydra:gis/atlas_ui.git' + SOURCEURL = 'git@hydra:atlas-ui-modules/custom-modules.git' SOURCEREVISION = SOURCE_REVISION - SOURCEDIR = "${WORKSPACE}\\atlas_ui" - configurationhelper.gitCheckoutAndRegister(meta, 'atlas_ui', SOURCEURL, SOURCEREVISION, SOURCEDIR, '', 0, false) + SOURCEDIR = "${WORKSPACE}\\custom_modules" + configurationhelper.gitCheckoutAndRegister(meta, 'custom_modules', SOURCEURL, SOURCEREVISION, SOURCEDIR, '', 0, false) env.SOURCE_PATH = SOURCEDIR env.INST_RELEASE_NOTES = "${SOURCE_PATH}\\releasenotes" env.INST_SRC = "${SOURCE_PATH}\\src" @@ -130,7 +130,7 @@ pipeline { steps { script { version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER) + version.generate(meta, SOURCE_REVISION, SOURCE_PATH) } } } @@ -188,15 +188,12 @@ pipeline { script { env.BUILD_STAMP=meta.buildstampinfo.buildstamp artifactDetails = [ - // Key, Artifacts Source project Artifacts source selector, Destination folder Increment Version Number Artifacts to copy Artifacts to not copy Binaries Folders - AtlasSet: [ATLAS_COMPILE_JOB, ATLAS_COMPILE_JOB_SELECTOR, "${IMPORTSPATH}\\build\\atlasset", false, 'meta/**, bin/**, binKiosk/**', '**/*.lib', [ 'bin' ], ], - InkUISet: [INK_UI_COMPILE_JOB, INK_UI_COMPILE_JOB_SELECTOR, "${IMPORTSPATH}\\build\\inkuiset", false, 'meta/**, binInk/**', '**/*.lib', [ 'binInk' ], ], + // Key, Artifacts Source project Artifacts source selector, Destination folder Increment Version Number Artifacts to copy Artifacts to not copy Binaries Folders + ModuleSet: [ATLAS_CUSTOM_MODULES_COMPILE_JOB, ATLAS_CUSTOM_MODULES_COMPILE_JOB_SELECTOR, "${IMPORTSPATH}\\build\\moduleset", false, 'meta/**, bin/**', '**/*.lib', [ 'bin' ], ], ] installerDetails = [ // Key, Installer command artifactSet Target folder Execution path ISM project file Variant Intermediate output path Component base folder Final filename - INK_CONFIG_UI: [INSTALLSHIELD2019_CMD, ['InkUISet','AtlasSet'], 'install_ink_ui', "${ATLAS_SOURCE_PATH}\\installer\\build\\ink_system_ui", 'InkSystemConfigurationUI.ism', '', "${INTERMEDIATEEXPORTSPATH}/install_ink_ui/x64/GIS Atlas Ink System Configuration UI/DiskImages/DISK1/GIS Atlas Ink System Configuration UI.exe", "${EXPORTSPATH}/GIS Atlas Ink System Configuration UI", "GIS Atlas Ink System Configuration UI ${BUILD_STAMP}.exe" ], - INK_OPERATOR_UI: [INSTALLSHIELD2019_CMD, ['InkUISet','AtlasSet'], 'install_ink_ui', "${ATLAS_SOURCE_PATH}\\installer\\build\\ink_system_ui", 'InkSystemOperatorUI.ism', '', "${INTERMEDIATEEXPORTSPATH}/install_ink_ui/x64/GIS Atlas Ink System Operator UI/DiskImages/DISK1/GIS Atlas Ink System Operator UI.exe", "${EXPORTSPATH}/GIS Atlas Ink System Operator UI", "GIS Atlas Ink System Operator UI ${BUILD_STAMP}.exe" ], - INK_UI_MODULES: [INSTALLSHIELD2019_CMD, ['InkUISet','AtlasSet'], 'install_ink_ui', "${ATLAS_SOURCE_PATH}\\installer\\build\\ink_system_ui", 'InkSystemToolModules.ism', '', "${INTERMEDIATEEXPORTSPATH}/install_ink_ui/x64/GIS Atlas Ink System Tool Modules/DiskImages/DISK1/GIS Atlas Ink System Tool Modules.exe", "${EXPORTSPATH}/GIS Atlas Ink System Tool Modules", "GIS Atlas Ink System Tool Modules ${BUILD_STAMP}.exe" ], + ENC_AND_PD: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\enc_and_pd", 'CM_enc_and_pd.ism', '', "${INTERMEDIATEEXPORTSPATH}/enc_and_pd/x64/GIS Custom Module - Enc and PD/DiskImages/DISK1/GIS Atlas Ink System Configuration UI.exe", "${EXPORTSPATH}/GIS Custom Module - Enc and PD", "GIS Custom Module - Enc and PD ${BUILD_STAMP}.exe" ], ] installerhelper = load("${autobuilder.commonscripts()}/install/installhelper.groovy") artifactFetched = installerhelper.artifactsImporter(meta, importer, artifactDetails, installerDetails)