From 24b82cd0cf236f9c56f5b8247ba213e0750cc3c3 Mon Sep 17 00:00:00 2001
From: Donovan Buck <donovan.buck@ni.com>
Date: Wed, 12 Jun 2019 13:54:30 -0500
Subject: [PATCH] Standardize build output locations (#10)

* Build libraries to OS-specific dirs

* Update build script for new spec output locations

* Move source to 2017
---
 .gitignore                                 |   3 ++
 README.md                                  |   2 +-
 Source/FXP LLB.lvproj                      |  47 +++++++++++----------
 Source/Post-Build Action - Remove C Dir.vi | Bin 12312 -> 0 bytes
 build.toml                                 |  36 ++--------------
 5 files changed, 31 insertions(+), 57 deletions(-)
 delete mode 100644 Source/Post-Build Action - Remove C Dir.vi

diff --git a/.gitignore b/.gitignore
index f90b47e..7c236fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@
 *.aliases
 *.lvlps
 
+# Build directory
+Built/
+
 # =========================
 # Operating System Files
 # =========================
diff --git a/README.md b/README.md
index 5865fc5..741b7cf 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ These are the source VIs used to script and build (into an LLB) the FXP UDV read
 
 ## LabVIEW Version
 
-LabVIEW 2015
+LabVIEW 2017
 
 ## Dependencies
 
diff --git a/Source/FXP LLB.lvproj b/Source/FXP LLB.lvproj
index 15989ab..1f7d556 100644
--- a/Source/FXP LLB.lvproj	
+++ b/Source/FXP LLB.lvproj	
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<Project Type="Project" LVVersion="15008000">
+<Project Type="Project" LVVersion="17008000">
 	<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
 	<Property Name="NI.Project.Description" Type="Str"></Property>
 	<Property Name="SMProvider.SMVersion" Type="Int">201310</Property>
@@ -166,7 +166,6 @@
 			<Item Name="Script FXP Read.vi" Type="VI" URL="../Script FXP Read.vi"/>
 			<Item Name="Script FXP Write.vi" Type="VI" URL="../Script FXP Write.vi"/>
 		</Item>
-		<Item Name="Post-Build Action - Remove C Dir.vi" Type="VI" URL="../Post-Build Action - Remove C Dir.vi"/>
 		<Item Name="Dependencies" Type="Dependencies">
 			<Item Name="vi.lib" Type="Folder">
 				<Item Name="Check if File or Folder Exists.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Check if File or Folder Exists.vi"/>
@@ -190,17 +189,17 @@
 				<Property Name="Bld_excludedDirectory[4]" Type="Path">user.lib</Property>
 				<Property Name="Bld_excludedDirectory[4].pathType" Type="Str">relativeToAppDir</Property>
 				<Property Name="Bld_excludedDirectoryCount" Type="Int">5</Property>
-				<Property Name="Bld_localDestDir" Type="Path">../Custom Device Source/FXP.llb</Property>
+				<Property Name="Bld_localDestDir" Type="Path">../Built/Pharlap/FXP.llb</Property>
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{38CB5EFE-F888-4ECA-A36A-3D3ADB63F593}</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">../Custom Device Source/FXP.llb</Property>
+				<Property Name="Destination[0].path" Type="Path">../Built/Pharlap/FXP.llb</Property>
 				<Property Name="Destination[0].type" Type="Str">LLB</Property>
 				<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
-				<Property Name="Destination[1].path" Type="Path">../Custom Device Source/data</Property>
+				<Property Name="Destination[1].path" Type="Path">../Built/data</Property>
 				<Property Name="DestinationCount" Type="Int">2</Property>
-				<Property Name="Source[0].itemID" Type="Str">{F83735F7-E826-420C-B934-0EDFB9A06C53}</Property>
+				<Property Name="Source[0].itemID" Type="Str">{D4D624E7-91E5-4D76-9390-CE215A337B03}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].Container.applyProperties" Type="Bool">true</Property>
 				<Property Name="Source[1].Container.applySaveSettings" Type="Bool">true</Property>
@@ -435,21 +434,20 @@
 				<Property Name="Bld_buildSpecName" Type="Str">FXP LLB</Property>
 				<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
 				<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
-				<Property Name="Bld_localDestDir" Type="Path">../Custom Device Source</Property>
+				<Property Name="Bld_localDestDir" Type="Path">../Built</Property>
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
-				<Property Name="Bld_postActionVIID" Type="Ref">/My Computer/Post-Build Action - Remove C Dir.vi</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{975E4FB4-2378-40BE-A901-593277C6CF7D}</Property>
-				<Property Name="Bld_targetDestDir" Type="Path">/c/FXP.llb</Property>
+				<Property Name="Bld_targetDestDir" Type="Path">/VxWorks/FXP.llb</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">/c/FXP.llb</Property>
+				<Property Name="Destination[0].path" Type="Path">/VxWorks/FXP.llb</Property>
 				<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
 				<Property Name="Destination[0].type" Type="Str">LLB</Property>
 				<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
-				<Property Name="Destination[1].path" Type="Path">/c/data</Property>
+				<Property Name="Destination[1].path" Type="Path">/VxWorks/data</Property>
 				<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
 				<Property Name="DestinationCount" Type="Int">2</Property>
-				<Property Name="Source[0].itemID" Type="Str">{47051E52-470D-45AE-9FBA-5BC4152350D9}</Property>
+				<Property Name="Source[0].itemID" Type="Str">{9A7823DB-2B89-49C9-AB6A-3281278E5171}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].Container.applyProperties" Type="Bool">true</Property>
 				<Property Name="Source[1].Container.applySaveSettings" Type="Bool">true</Property>
@@ -684,21 +682,21 @@
 				<Property Name="Bld_buildSpecName" Type="Str">FXP LLB</Property>
 				<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
 				<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
-				<Property Name="Bld_localDestDir" Type="Path">../Custom Device Source</Property>
+				<Property Name="Bld_localDestDir" Type="Path">../Built</Property>
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{BA79FDEE-6314-4A29-9FF7-68D9519F2CCF}</Property>
-				<Property Name="Bld_targetDestDir" Type="Path">/FXP.llb</Property>
-				<Property Name="Bld_version.build" Type="Int">4</Property>
+				<Property Name="Bld_targetDestDir" Type="Path">/Linux_x64/FXP.llb</Property>
+				<Property Name="Bld_version.build" Type="Int">7</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">/FXP.llb</Property>
+				<Property Name="Destination[0].path" Type="Path">/Linux_x64/FXP.llb</Property>
 				<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
 				<Property Name="Destination[0].type" Type="Str">LLB</Property>
 				<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
 				<Property Name="Destination[1].path" Type="Path">/data</Property>
 				<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
 				<Property Name="DestinationCount" Type="Int">2</Property>
-				<Property Name="Source[0].itemID" Type="Str">{AC979A9E-7A07-4BAC-9A1C-0544F98F88A4}</Property>
+				<Property Name="Source[0].itemID" Type="Str">{C9E429D0-2FB8-4A56-8785-CFE84D8AA2E4}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].Container.applyInclusion" Type="Bool">true</Property>
 				<Property Name="Source[1].Container.depDestIndex" Type="Int">0</Property>
@@ -934,6 +932,10 @@
 			<Property Name="crio.ProgrammingMode" Type="Str">express</Property>
 			<Property Name="crio.ResourceID" Type="Str">RIO0</Property>
 			<Property Name="crio.Type" Type="Str">cRIO-9068</Property>
+			<Property Name="NI.SortType" Type="Int">3</Property>
+			<Item Name="Real-Time Scan Resources" Type="Module Container">
+				<Property Name="crio.ModuleContainerType" Type="Str">crio.RSIModuleContainer</Property>
+			</Item>
 		</Item>
 		<Item Name="Dependencies" Type="Dependencies"/>
 		<Item Name="Build Specifications" Type="Build">
@@ -941,24 +943,23 @@
 				<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
 				<Property Name="Bld_buildCacheID" Type="Str">{A6E7B9B4-FD79-44A0-B81F-479A69533C9A}</Property>
 				<Property Name="Bld_buildSpecName" Type="Str">FXP LLB</Property>
-				<Property Name="Bld_compilerOptLevel" Type="Int">0</Property>
 				<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
 				<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
-				<Property Name="Bld_localDestDir" Type="Path">../Custom Device Source</Property>
+				<Property Name="Bld_localDestDir" Type="Path">../Built</Property>
 				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
 				<Property Name="Bld_previewCacheID" Type="Str">{652BCEC1-168C-4AFA-80B8-399D24F1E9EA}</Property>
-				<Property Name="Bld_targetDestDir" Type="Path">/FXP.llb</Property>
-				<Property Name="Bld_version.build" Type="Int">2</Property>
+				<Property Name="Bld_targetDestDir" Type="Path">/Linux_32_ARM/FXP.llb</Property>
+				<Property Name="Bld_version.build" Type="Int">4</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">/FXP.llb</Property>
+				<Property Name="Destination[0].path" Type="Path">/Linux_32_ARM/FXP.llb</Property>
 				<Property Name="Destination[0].path.type" Type="Str">&lt;none&gt;</Property>
 				<Property Name="Destination[0].type" Type="Str">LLB</Property>
 				<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
 				<Property Name="Destination[1].path" Type="Path">/data</Property>
 				<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
 				<Property Name="DestinationCount" Type="Int">2</Property>
-				<Property Name="Source[0].itemID" Type="Str">{98F67EA9-D1C4-4F8C-B64F-70309314BD5A}</Property>
+				<Property Name="Source[0].itemID" Type="Str">{B0CE235B-FC5A-4E33-9B41-84392CB8F64A}</Property>
 				<Property Name="Source[0].type" Type="Str">Container</Property>
 				<Property Name="Source[1].Container.applyInclusion" Type="Bool">true</Property>
 				<Property Name="Source[1].Container.depDestIndex" Type="Int">0</Property>
diff --git a/Source/Post-Build Action - Remove C Dir.vi b/Source/Post-Build Action - Remove C Dir.vi
deleted file mode 100644
index d5accf6582bd4d496e2dce54d2d08a3780bd13d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12312
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

diff --git a/build.toml b/build.toml
index 71cd316..4fa29c9 100644
--- a/build.toml
+++ b/build.toml
@@ -1,5 +1,5 @@
 [archive]
-build_output_dir = 'Custom Device Source'
+build_output_dir = 'Built'
 archive_location = '\\nirvana\Measurements\VeriStandAddons\scan_engine_fxp'
 
 [projects.fxp]
@@ -16,37 +16,7 @@ type = 'lvRunVi'
 vi = 'Source\Script FXP Write.vi'
 
 [[build.steps]]
-name = 'Pharlap Scan Engine FXP Library'
-type = 'lvBuildSpec'
+name = 'FXP Libraries'
+type = 'lvBuildSpecAllTargets'
 project = '{fxp}'
-target = 'My Computer'
 build_spec = 'FXP LLB'
-output_libraries = ['FXP.llb']
-output_dir = 'pharlap'
-
-[[build.steps]]
-name = 'VxWorks Scan Engine FXP Library'
-type = 'lvBuildSpec'
-project = '{fxp}'
-target = 'RT CompactRIO Target'
-build_spec = 'FXP LLB'
-output_libraries = ['FXP.llb']
-output_dir = 'vxworks'
-
-[[build.steps]]
-name = 'Linux x64 Scan Engine FXP Library'
-type = 'lvBuildSpec'
-project = '{fxp}'
-target = 'RT Linux 64'
-build_spec = 'FXP LLB'
-output_libraries = ['FXP.llb']
-output_dir = 'linux64'
-
-[[build.steps]]
-name = 'Linux x86 Scan Engine FXP Library'
-type = 'lvBuildSpec'
-project = '{fxp}'
-target = 'RT Linux 32'
-build_spec = 'FXP LLB'
-output_libraries = ['FXP.llb']
-output_dir = 'linux32'