From 7acc1c639e59955d1cf27109666f71b4398e1068 Mon Sep 17 00:00:00 2001 From: Donovan Buck Date: Mon, 15 Nov 2021 14:03:42 -0600 Subject: [PATCH 1/5] package CD using 32- and 64-bit binaries --- build.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.toml b/build.toml index 27777392..bdb58284 100644 --- a/build.toml +++ b/build.toml @@ -113,6 +113,8 @@ vi = 'Custom Device Source\Build VIs\Delete Scripting API.vi' [[package]] type = 'nipkg' package_output_dir = 'Built' +multi_bitness = 'true' +multi_bitness_versions = ['2021'] [package.payload_map] 'Built\\Scan Engine' = 'documents\National Instruments\NI VeriStand {veristand_version}\Custom Devices\Scan Engine' From 9e2ac527a7830359978ea27834a2d59090dd9a5c Mon Sep 17 00:00:00 2001 From: Donovan Buck Date: Mon, 15 Nov 2021 14:34:06 -0600 Subject: [PATCH 2/5] set deps --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index f2a954a2..a2ae2969 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,5 +9,8 @@ def lvVersions = [ List dependencies = ['niveristand-scan-engine-fxp-libraries', 'niveristand-scan-engine-module-libraries'] +env.'niveristand-scan-engine-fxp-libraries' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_fxp\\ni\\export\\main\\Build 314' +env.'niveristand-scan-engine-module-libraries' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_modules\\ni\\export\\main\\Build 313' + diffPipeline(lvVersions) ni.vsbuild.PipelineExecutor.execute(this, 'vs_cd_build', lvVersions, dependencies) From 472eb38fd37e4d4a399e079cf82b9a9591209c5d Mon Sep 17 00:00:00 2001 From: Donovan Buck Date: Mon, 15 Nov 2021 14:38:52 -0600 Subject: [PATCH 3/5] actually set dep dir --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a2ae2969..4958f430 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,8 +9,8 @@ def lvVersions = [ List dependencies = ['niveristand-scan-engine-fxp-libraries', 'niveristand-scan-engine-module-libraries'] -env.'niveristand-scan-engine-fxp-libraries' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_fxp\\ni\\export\\main\\Build 314' -env.'niveristand-scan-engine-module-libraries' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_modules\\ni\\export\\main\\Build 313' +env.'niveristand-scan-engine-fxp-libraries_DEP_DIR' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_fxp\\ni\\export\\main\\Build 314' +env.'niveristand-scan-engine-module-libraries_DEP_DIR' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_modules\\ni\\export\\main\\Build 313' diffPipeline(lvVersions) ni.vsbuild.PipelineExecutor.execute(this, 'vs_cd_build', lvVersions, dependencies) From 75641d585bd199d81ae49b4047c668c00cc47fe0 Mon Sep 17 00:00:00 2001 From: Donovan Buck Date: Tue, 23 Nov 2021 15:40:18 -0600 Subject: [PATCH 4/5] revert Jenkinsfile --- Jenkinsfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4958f430..f2a954a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,8 +9,5 @@ def lvVersions = [ List dependencies = ['niveristand-scan-engine-fxp-libraries', 'niveristand-scan-engine-module-libraries'] -env.'niveristand-scan-engine-fxp-libraries_DEP_DIR' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_fxp\\ni\\export\\main\\Build 314' -env.'niveristand-scan-engine-module-libraries_DEP_DIR' = '\\\\nirvana\\Measurements\\VeriStandAddons\\scan_engine_modules\\ni\\export\\main\\Build 313' - diffPipeline(lvVersions) ni.vsbuild.PipelineExecutor.execute(this, 'vs_cd_build', lvVersions, dependencies) From 13ad7b379d0a1ee2e277ec1ffa16b67b90e36d14 Mon Sep 17 00:00:00 2001 From: Karl-G1 Date: Wed, 24 Nov 2021 10:19:28 -0600 Subject: [PATCH 5/5] Add bitness flags to other packages --- build.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.toml b/build.toml index bdb58284..c7a33301 100644 --- a/build.toml +++ b/build.toml @@ -124,6 +124,8 @@ multi_bitness_versions = ['2021'] type = 'nipkg' control_file = 'control_scripting' package_output_dir = 'Built' +multi_bitness = 'true' +multi_bitness_versions = ['2021'] [package.payload_map] 'Built\\Scripting\\Scan Engine' = 'ni-paths-LV{veristand_version}DIR{nipaths_64_bitness_suffix}\vi.lib\addons\VeriStand Custom Device Scripting APIs\Scan Engine' @@ -132,6 +134,8 @@ package_output_dir = 'Built' type = 'nipkg' control_file = 'control_examples' package_output_dir = 'Built' +multi_bitness = 'true' +multi_bitness_versions = ['2021'] [package.payload_map] 'Built\\Examples\\Scan Engine' = 'ni-paths-LV{veristand_version}DIR{nipaths_64_bitness_suffix}\examples\NI VeriStand Custom Devices\Scan Engine'