Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support installing packages dependent on LabVIEW 2021 #141

Merged
merged 3 commits into from
Nov 30, 2021
Merged

Support installing packages dependent on LabVIEW 2021 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b17374
Fix LabVIEW package dependencies in control files for scripting
Nov 30, 2021
25d8ca5
Fix LabVIEW bitness install paths for 64-bit
Nov 30, 2021
b2afb53
Update Jenkinsfile to prevent build failures due to diff call
Karl-G1 Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ def lvVersions = [
64 : ['2021']
]

diffPipeline(lvVersions[0])
diffPipeline(lvVersions)
ni.vsbuild.PipelineExecutor.execute(this, 'vs_cd_build', lvVersions)
4 changes: 2 additions & 2 deletions build.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion control_scripting_api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
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})
2 changes: 1 addition & 1 deletion control_scripting_examples
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})
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})