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

Made all the modifications required to have a standalone examples package #171

Merged
merged 3 commits into from
May 5, 2021
Merged

Made all the modifications required to have a standalone examples package #171

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
326ac37
Made all the modifications required to have a standalone examples ins…
zszilagy May 4, 2021
e5ab6f5
Implemented fix for build failure
zszilagy May 4, 2021
9df6c76
Added script which copies the built Scripting API into the LV folder.
zszilagy May 4, 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
181 changes: 122 additions & 59 deletions Source/Examples/Instrument Addon Scripting API Examples.lvproj
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Source/Examples/Utilities/Post-Build Action.vi
View file
Open in desktop
Binary file not shown.
9 changes: 4 additions & 5 deletions Source/Instrument Addon.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
</Item>
<Item Name="Utilities" Type="Folder">
<Item Name="Copy .LLB to NI VeriStand dir.vi" Type="VI" URL="../Utilities/Copy .LLB to NI VeriStand dir.vi"/>
<Item Name="Copy Scripting .LLB to LV Addons dir.vi" Type="VI" URL="../Utilities/Copy Scripting .LLB to LV Addons dir.vi"/>
<Item Name="LLB Pre-Build CHM Build.vi" Type="VI" URL="../Utilities/LLB Pre-Build CHM Build.vi"/>
</Item>
<Item Name="Dependencies" Type="Dependencies">
Expand Down Expand Up @@ -662,9 +663,6 @@
<Item Name="NationalInstruments.VeriStand.XMLReader" Type="Document" URL="NationalInstruments.VeriStand.XMLReader">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="nisyscfg.dll" Type="Document" URL="nisyscfg.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
<Item Name="systemLogging.dll" Type="Document" URL="systemLogging.dll">
<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
</Item>
Expand Down Expand Up @@ -1014,9 +1012,10 @@
<Property Name="Bld_excludedDirectoryCount" Type="Int">6</Property>
<Property Name="Bld_localDestDir" Type="Path">../Built/Scripting/API</Property>
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Utilities/Copy Scripting .LLB to LV Addons dir.vi</Property>
<Property Name="Bld_previewCacheID" Type="Str">{70757631-4EA5-4C22-A187-59BB2EDF6D85}</Property>
<Property Name="Bld_removeVIObj" Type="Int">1</Property>
<Property Name="Bld_version.build" Type="Int">15</Property>
<Property Name="Bld_version.build" Type="Int">17</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">Destination Directory</Property>
<Property Name="Destination[0].path" Type="Path">../Built/Scripting/API</Property>
Expand All @@ -1035,7 +1034,7 @@
<Property Name="Destination[6].path" Type="Path">../Built/Scripting/API/Dependencies.llb</Property>
<Property Name="Destination[6].type" Type="Str">LLB</Property>
<Property Name="DestinationCount" Type="Int">7</Property>
<Property Name="Source[0].itemID" Type="Str">{4FA61585-0D50-4510-AB91-7C6ACAA0A6E4}</Property>
<Property Name="Source[0].itemID" Type="Str">{541C63AE-D0BC-4316-97E9-CCE1A465306F}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/APIs/Instrument Addon Scripting API.lvlib</Property>
Expand Down
Binary file added Source/Utilities/Copy Scripting .LLB to LV Addons dir.vi
View file
Open in desktop
Binary file not shown.
32 changes: 25 additions & 7 deletions build.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ copy_location = 'Source\Addon\Support Libraries'
[projects.cd]
path = 'Source\Instrument Addon.lvproj'

[[build.steps]]
name = 'Scripting API'
type = 'lvBuildSpec'
project = '{cd}'
target = 'My Computer'
build_spec = 'Scripting API'
dependency_target = 'Windows'
[projects.api_examples]
path = 'Source\Examples\Instrument Addon Scripting API Examples.lvproj'

[[build.steps]]
name = 'Host API'
Expand Down Expand Up @@ -88,6 +83,22 @@ project = '{cd}'
build_spec = 'Engine Release'
dependency_target = 'Linux_x64'

[[build.steps]]
name = 'Scripting API'
type = 'lvBuildSpec'
project = '{cd}'
target = 'My Computer'
build_spec = 'Scripting API'
dependency_target = 'Windows'

[[build.steps]]
name = 'Scripting Examples'
type = 'lvBuildSpec'
project = '{api_examples}'
target = 'My Computer'
build_spec = 'Scripting Examples'
dependency_target = 'Windows'

[[package]]
type = 'nipkg'
payload_dir = 'Built\IA'
Expand All @@ -101,3 +112,10 @@ payload_dir = 'Built\Scripting'
install_destination = 'ni-paths-LV{veristand_version}DIR\vi.lib\addons\VeriStand Custom Device Scripting APIs\Instrument 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\Instrument Addon'
control_file = 'control_scripting_examples'
package_output_dir = 'Built'
15 changes: 15 additions & 0 deletions control_scripting_examples
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Package: ni-instrument-addon-veristand-{veristand_version}-labview-support-examples
Version: {nipkg_version}
Architecture: windows_x64
Maintainer: National Instruments <support@ni.com>
XB-Plugin: file
Description: Provides examples for LabVIEW support for the Instrument Addon custom device for NI VeriStand {veristand_version}.
XB-Eula: eula-ni-standard
Priority: standard
Homepage: http://www.ni.com
XB-LanguageSupport: en
XB-UserVisible: yes
Section: Add-Ons
XB-DisplayVersion: {display_version}
XB-DisplayName: NI Instrument 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-instrument-addon-veristand-{veristand_version}-labview-support (>= {display_version})