Skip to content

Commit

Permalink
Better handling of Components directories (#38)
Browse files Browse the repository at this point in the history 
- Create Components/ directories on install, by installing a README.md file.
- Ignore errors related to the Components/ directory being missing, in case they are deleted. This is equivalent to no components being installed.
- Remove an unused project file.
  • Loading branch information
@rtzoeller
rtzoeller authored Nov 3, 2020
1 parent fd8acef commit d8c4788
Show file tree
Hide file tree
Showing 7 changed files with 117 additions and 652 deletions.
22 changes: 19 additions & 3 deletions ...ata Sharing Custom Device/Source/Data Sharing Framework Custom Device Linux RT ARM.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@
<Property Name="target.WebServer.ViAccess" Type="Str">+*</Property>
<Property Name="target.webservices.SecurityAPIKey" Type="Str">PqVr/ifkAQh+lVrdPIykXlFvg12GhhQFR8H9cUhphgg=:pTe9HRlQuMfJxAG6QCGq7UvoUpJzAzWGKy5SbZ+roSU=</Property>
<Property Name="target.webservices.ValidTimestampWindow" Type="Int">15</Property>
<Item Name="InstallTo" Type="Folder">
<Item Name="Components" Type="Folder">
<Item Name="README.md" Type="Document" URL="../InstallTo/Components/README.md"/>
</Item>
</Item>
<Item Name="Chassis" Type="cRIO Chassis">
<Property Name="crio.ProgrammingMode" Type="Str">express</Property>
<Property Name="crio.ResourceID" Type="Str">RIO0</Property>
Expand Down Expand Up @@ -395,15 +400,26 @@
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">../Built/Custom Device/Linux_32_ARM</Property>
<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Destination[2].destName" Type="Str">Components Directory</Property>
<Property Name="Destination[2].path" Type="Path">../Built/Custom Device/Linux_32_ARM/Components</Property>
<Property Name="Destination[2].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="Destination[2].preserveHierarchy" Type="Bool">true</Property>
<Property Name="DestinationCount" Type="Int">3</Property>
<Property Name="Source[0].Container.applyDestination" Type="Bool">true</Property>
<Property Name="Source[0].itemID" Type="Str">{6C562DA7-FBC4-4E19-9792-41CEC0F99921}</Property>
<Property Name="Source[0].itemID" Type="Str">{988911D9-AD72-428C-B243-0396BF6407CA}</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">/Linux RT ARM/DSF Engine.lvlib/RT Driver VI.vi</Property>
<Property Name="Source[1].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[1].type" Type="Str">VI</Property>
<Property Name="SourceCount" Type="Int">2</Property>
<Property Name="Source[2].Container.applyDestination" Type="Bool">true</Property>
<Property Name="Source[2].Container.applyInclusion" Type="Bool">true</Property>
<Property Name="Source[2].Container.depDestIndex" Type="Int">0</Property>
<Property Name="Source[2].destinationIndex" Type="Int">2</Property>
<Property Name="Source[2].itemID" Type="Ref">/Linux RT ARM/InstallTo/Components</Property>
<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[2].type" Type="Str">Container</Property>
<Property Name="SourceCount" Type="Int">3</Property>
</Item>
</Item>
</Item>
Expand Down
24 changes: 20 additions & 4 deletions ...ata Sharing Custom Device/Source/Data Sharing Framework Custom Device Linux RT x64.lvproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="17008000">
<Item Name="My Computer" Type="My Computer">
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
Expand Down Expand Up @@ -76,6 +76,11 @@
<Property Name="target.WebServer.ViAccess" Type="Str">+*</Property>
<Property Name="target.webservices.SecurityAPIKey" Type="Str">PqVr/ifkAQh+lVrdPIykXlFvg12GhhQFR8H9cUhphgg=:pTe9HRlQuMfJxAG6QCGq7UvoUpJzAzWGKy5SbZ+roSU=</Property>
<Property Name="target.webservices.ValidTimestampWindow" Type="Int">15</Property>
<Item Name="InstallTo" Type="Folder">
<Item Name="Components" Type="Folder">
<Item Name="README.md" Type="Document" URL="../InstallTo/Components/README.md"/>
</Item>
</Item>
<Item Name="Chassis" Type="cRIO Chassis">
<Property Name="crio.ProgrammingMode" Type="Str">express</Property>
<Property Name="crio.ResourceID" Type="Str">RIO0</Property>
Expand Down Expand Up @@ -721,15 +726,26 @@
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">../Built/Custom Device/Linux_x64</Property>
<Property Name="Destination[1].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="Destination[2].destName" Type="Str">Components Directory</Property>
<Property Name="Destination[2].path" Type="Path">../Built/Custom Device/Linux_x64/Components</Property>
<Property Name="Destination[2].path.type" Type="Str">&lt;none&gt;</Property>
<Property Name="Destination[2].preserveHierarchy" Type="Bool">true</Property>
<Property Name="DestinationCount" Type="Int">3</Property>
<Property Name="Source[0].Container.applyDestination" Type="Bool">true</Property>
<Property Name="Source[0].itemID" Type="Str">{FDE30692-3751-482A-B8DE-D52C03630AC3}</Property>
<Property Name="Source[0].itemID" Type="Str">{1D63EFF0-11E5-45E2-B7E4-BBDFD523B9BA}</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">/Linux RT x64/DSF Engine.lvlib/RT Driver VI.vi</Property>
<Property Name="Source[1].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[1].type" Type="Str">VI</Property>
<Property Name="SourceCount" Type="Int">2</Property>
<Property Name="Source[2].Container.applyDestination" Type="Bool">true</Property>
<Property Name="Source[2].Container.applyInclusion" Type="Bool">true</Property>
<Property Name="Source[2].Container.depDestIndex" Type="Int">0</Property>
<Property Name="Source[2].destinationIndex" Type="Int">2</Property>
<Property Name="Source[2].itemID" Type="Ref">/Linux RT x64/InstallTo/Components</Property>
<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[2].type" Type="Str">Container</Property>
<Property Name="SourceCount" Type="Int">3</Property>
</Item>
</Item>
</Item>
Expand Down
Loading

0 comments on commit d8c4788

Please sign in to comment.