Standardize build output locations (#10)

* Build libraries to OS-specific dirs * Update build script for new spec output locations * Move source to 2017
ni · Jun 12, 2019 · 24b82cd · 24b82cd
1 parent 9c3f9e6
commit 24b82cd
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,9 @@
 *.aliases
 *.lvlps
 
+# Build directory
+Built/
+
 # =========================
 # Operating System Files
 # =========================

diff --git 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
@@ -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,31 +932,34 @@
 			<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">
 			<Item Name="FXP LLB" Type="Source Distribution">
 				<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
diff --git 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'