From 3d25f1f36ac5e97432155ac2fbc38acec984536d Mon Sep 17 00:00:00 2001
From: Karl-G1 <31290917+Karl-G1@users.noreply.github.com>
Date: Tue, 30 Nov 2021 13:54:12 -0600
Subject: [PATCH] Support installing packages dependent on LabVIEW 2021 (#141)

* Fix LabVIEW package dependencies in control files for scripting
* Fix LabVIEW bitness install paths for 64-bit
* Update Jenkinsfile to prevent build failures due to diff call
---
 Jenkinsfile                | 2 +-
 build.toml                 | 4 ++--
 control_scripting_api      | 2 +-
 control_scripting_examples | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0a8bbe30..e8661b89 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,5 +7,5 @@ def lvVersions = [
   64 : ['2021']
 ]
 
-diffPipeline(lvVersions[0])
+diffPipeline(lvVersions)
 ni.vsbuild.PipelineExecutor.execute(this, 'vs_cd_build', lvVersions)
diff --git a/build.toml b/build.toml
index 711500f9..a0cae7d5 100644
--- a/build.toml
+++ b/build.toml
@@ -47,13 +47,13 @@ package_output_dir = 'Built'
 [[package]]
 type = 'nipkg'
 payload_dir = 'Built\Packed Scripting API'
-install_destination = 'ni-paths-LV{veristand_version}DIR\vi.lib\addons\VeriStand Custom Device Scripting APIs\FPGA Addon'
+install_destination = 'ni-paths-LV{veristand_version}DIR{nipaths_64_bitness_suffix}\vi.lib\addons\VeriStand Custom Device Scripting APIs\FPGA Addon'
 control_file = 'control_scripting_api'
 package_output_dir = 'Built'
 
 [[package]]
 type = 'nipkg'
 payload_dir = 'Built\Scripting Examples'
-install_destination = 'ni-paths-LV{veristand_version}DIR\examples\NI VeriStand Custom Devices\FPGA Addon'
+install_destination = 'ni-paths-LV{veristand_version}DIR{nipaths_64_bitness_suffix}\examples\NI VeriStand Custom Devices\FPGA Addon'
 control_file = 'control_scripting_examples'
 package_output_dir = 'Built'
diff --git a/control_scripting_api b/control_scripting_api
index 04326c46..5dadc452 100644
--- a/control_scripting_api
+++ b/control_scripting_api
@@ -12,4 +12,4 @@ XB-UserVisible: yes
 Section: Add-Ons
 XB-DisplayVersion: {display_version}
 XB-DisplayName: NI FPGA Addon LabVIEW Support for NI VeriStand {veristand_version}
-Depends: {AUTOVERSION_ni-labview-{labview_version}-x86}, {ni-veristand-{labview_version}} (>= {labview_short_version}.0.0), ni-fpga-addon-veristand-{veristand_version}-support (>= {display_version})
\ No newline at end of file
+Depends: ni-labview-{labview_version}{pkg_x86_bitness_suffix}, ni-veristand-{labview_version} (>= {labview_short_version}.0.0), ni-fpga-addon-veristand-{veristand_version}-support (>= {display_version})
diff --git a/control_scripting_examples b/control_scripting_examples
index c22c338f..ece82c7f 100644
--- a/control_scripting_examples
+++ b/control_scripting_examples
@@ -12,4 +12,4 @@ XB-UserVisible: yes
 Section: Add-Ons
 XB-DisplayVersion: {display_version}
 XB-DisplayName: NI FPGA Addon LabVIEW Support Examples for NI VeriStand {veristand_version}
-Depends: {AUTOVERSION_ni-labview-{labview_version}-x86}, {ni-veristand-{labview_version}} (>= {labview_short_version}.0.0), ni-fpga-addon-veristand-{veristand_version}-labview-support (>= {display_version})
\ No newline at end of file
+Depends: ni-labview-{labview_version}{pkg_x86_bitness_suffix}, ni-veristand-{labview_version} (>= {labview_short_version}.0.0), ni-fpga-addon-veristand-{veristand_version}-labview-support (>= {display_version})