Set version number to that of Atlas UI Binaries

This commit is contained in:
Dan Hawkins 2020-12-11 12:17:01 +00:00
commit e82037145f

View file

@ -134,7 +134,7 @@ pipeline {
}
}
}
stage('Import binaries 1') {
stage('Get Atlas UI buildstamp') {
when {
expression {
toBuild
@ -149,10 +149,10 @@ pipeline {
importoptions.setincrementversionnumber(false)
def compilemeta = importer.artifactimport(meta, importoptions, "${IMPORTSPATH}\\build\\moduleset")
def maxdepth = 2
def relatedcomponents = compilemeta.releasewalkerversionunique(maxdepth.toInteger())
relatedcomponents.each {
relatedcomponent -> echo "relatedcomponent string: ${relatedcomponent.key}"
}
def relatedcomponents = compilemeta.releasewalkerunique(maxdepth.toInteger())
atlasuibinariesmeta = relatedcomponents['ATLAS_UI_CORE_BINARIES']
env.ATLAS_UI_BUILD_STAMP = atlasuibinariesmeta.buildstampinfo.buildstamp
}
}
}
@ -164,23 +164,22 @@ pipeline {
}
steps {
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
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
OUTPUT_SIMULATOR: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_output_simulate.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Output Simulator/DiskImages/DISK1/GIS Atlas UI Custom Module - Output Simulator.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Output Simulator", "GIS Atlas UI Custom Module - Output Simulator ${BUILD_STAMP}.exe" ],
SCANNING_XY_CAMERA_ALIGN: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_scanning_xy_camera_align.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Scanning XY Camera Align/DiskImages/DISK1/GIS Atlas UI Custom Module - Scanning XY Camera Align.exe","${EXPORTSPATH}/GIS Atlas UI Custom Module - Scanning XY Camera Align", "GIS Atlas UI Custom Module - Scanning XY Camera Align ${BUILD_STAMP}.exe" ],
IMAGE_CONVERTER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_image_convert.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Image Conversion/DiskImages/DISK1/GIS Atlas UI Custom Module - Image Conversion.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Image Conversion", "GIS Atlas UI Custom Module - Image Conversion ${BUILD_STAMP}.exe" ],
LINEARISATION_IMPORTER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_linear_import.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Linearisation Importer/DiskImages/DISK1/GIS Atlas UI Custom Module - Linearisation Importer.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Linearisation Importer", "GIS Atlas UI Custom Module - Linearisation Importer ${BUILD_STAMP}.exe" ],
DIRECT_TO_SHAPE: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_direct_to_shape.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Direct To Shape/DiskImages/DISK1/GIS Atlas UI Custom Module - Direct To Shape.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Direct To Shape", "GIS Atlas UI Custom Module - Direct To Shape ${BUILD_STAMP}.exe" ],
PRINTHEAD_PROFILER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_printhead_profiler.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Printhead Profiler/DiskImages/DISK1/GIS Atlas UI Custom Module - Printhead Profiler.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Printhead Profiler", "GIS Atlas UI Custom Module - Printhead Profiler ${BUILD_STAMP}.exe" ],
COMMON_LIBRARIES: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_common.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Common Lib/DiskImages/DISK1/GIS Atlas UI Custom Module - Common Lib.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Common Lib", "GIS Atlas UI Custom Module - Common Lib ${BUILD_STAMP}.exe" ],
ENC_AND_PD: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_enc_and_pd.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Enc and PD/DiskImages/DISK1/GIS Atlas UI Custom Module - Enc and PD.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Enc and PD", "GIS Atlas UI Custom Module - Enc and PD ${BUILD_STAMP}.exe" ],
LOG_VIEWER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_log_viewer.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Log Viewer/DiskImages/DISK1/GIS Atlas UI Custom Module - Log Viewer.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Log Viewer", "GIS Atlas UI Custom Module - Log Viewer ${BUILD_STAMP}.exe" ],
COMPONENT_MONITOR: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_component_monitor.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Component Monitor/DiskImages/DISK1/GIS Atlas UI Custom Module - Component Monitor.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Component Monitor", "GIS Atlas UI Custom Module - Component Monitor ${BUILD_STAMP}.exe" ],
OUTPUT_SIMULATOR: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_output_simulate.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Output Simulator/DiskImages/DISK1/GIS Atlas UI Custom Module - Output Simulator.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Output Simulator", "GIS Atlas UI Custom Module - Output Simulator ${ATLAS_UI_BUILD_STAMP}.exe" ],
SCANNING_XY_CAMERA_ALIGN: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_scanning_xy_camera_align.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Scanning XY Camera Align/DiskImages/DISK1/GIS Atlas UI Custom Module - Scanning XY Camera Align.exe","${EXPORTSPATH}/GIS Atlas UI Custom Module - Scanning XY Camera Align", "GIS Atlas UI Custom Module - Scanning XY Camera Align ${ATLAS_UI_BUILD_STAMP}.exe" ],
IMAGE_CONVERTER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_image_convert.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Image Conversion/DiskImages/DISK1/GIS Atlas UI Custom Module - Image Conversion.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Image Conversion", "GIS Atlas UI Custom Module - Image Conversion ${ATLAS_UI_BUILD_STAMP}.exe" ],
LINEARISATION_IMPORTER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_linear_import.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Linearisation Importer/DiskImages/DISK1/GIS Atlas UI Custom Module - Linearisation Importer.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Linearisation Importer", "GIS Atlas UI Custom Module - Linearisation Importer ${ATLAS_UI_BUILD_STAMP}.exe" ],
DIRECT_TO_SHAPE: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_direct_to_shape.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Direct To Shape/DiskImages/DISK1/GIS Atlas UI Custom Module - Direct To Shape.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Direct To Shape", "GIS Atlas UI Custom Module - Direct To Shape ${ATLAS_UI_BUILD_STAMP}.exe" ],
PRINTHEAD_PROFILER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_printhead_profiler.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Printhead Profiler/DiskImages/DISK1/GIS Atlas UI Custom Module - Printhead Profiler.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Printhead Profiler", "GIS Atlas UI Custom Module - Printhead Profiler ${ATLAS_UI_BUILD_STAMP}.exe" ],
COMMON_LIBRARIES: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_common.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Common Lib/DiskImages/DISK1/GIS Atlas UI Custom Module - Common Lib.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Common Lib", "GIS Atlas UI Custom Module - Common Lib ${ATLAS_UI_BUILD_STAMP}.exe" ],
ENC_AND_PD: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_enc_and_pd.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Enc and PD/DiskImages/DISK1/GIS Atlas UI Custom Module - Enc and PD.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Enc and PD", "GIS Atlas UI Custom Module - Enc and PD ${ATLAS_UI_BUILD_STAMP}.exe" ],
LOG_VIEWER: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_log_viewer.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Log Viewer/DiskImages/DISK1/GIS Atlas UI Custom Module - Log Viewer.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Log Viewer", "GIS Atlas UI Custom Module - Log Viewer ${ATLAS_UI_BUILD_STAMP}.exe" ],
COMPONENT_MONITOR: [INSTALLSHIELD2019_CMD, ['ModuleSet'], 'module', "${SOURCE_PATH}\\installer\\build\\moduleset", 'CM_component_monitor.ism', '', "${INTERMEDIATEEXPORTSPATH}/module/x64/GIS Atlas UI Custom Module - Component Monitor/DiskImages/DISK1/GIS Atlas UI Custom Module - Component Monitor.exe", "${EXPORTSPATH}/GIS Atlas UI Custom Module - Component Monitor", "GIS Atlas UI Custom Module - Component Monitor ${ATLAS_UI_BUILD_STAMP}.exe" ],
]
installerhelper = load("${autobuilder.commonscripts()}/install/installhelper.groovy")
artifactFetched = installerhelper.artifactsImporter(meta, importer, artifactDetails, installerDetails)
@ -191,7 +190,7 @@ pipeline {
steps {
script {
def metamap = [
["${VERSIONINFO}", meta], // Incomplete until this job ends
[VERSIONINFO, meta], // Incomplete until this job ends
]
for (metaitem in metamap) {
(destfolder, componentmeta) = metaitem
@ -220,8 +219,8 @@ pipeline {
def importmeta = artifactFetched.get(artifactKey)
echo "For: ${installer} build stamp is: ${importmeta.buildstampinfo.buildstamp}"
def INST_ISVERSION = importmeta.buildstampinfo.buildstamp
echo "For: ${installer} build stamp is: ${ATLAS_UI_BUILD_STAMP}"
def INST_ISVERSION = ATLAS_UI_BUILD_STAMP
(sourceProject, sourceselector, destFolder, incrementversionnumber, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey)
def COMPILE_IMPORTS = destFolder