Skip to content

Commit

Permalink
Added Tools menu action to build PPL from build spec.
Browse files Browse the repository at this point in the history
Includes updating PPL version in build spec programmatically
  • Loading branch information
francois-normandin committed Feb 28, 2021
1 parent d76bf25 commit e39ac6d
Show file tree
Hide file tree
Showing 10 changed files with 530 additions and 46 deletions.
Binary file modified build support/Pre-Build Custom Action.vi
Binary file not shown.
Binary file added build support/Update PPL Build Specs.vi
Binary file not shown.
Binary file modified src/Advanced VI Tree - Caraya.vi
Binary file not shown.
5 changes: 5 additions & 0 deletions src/Caraya.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,12 @@
<Item Name="_caraya_renameOperands.vi" Type="VI" URL="../project/Caraya/_utilities/_caraya_renameOperands.vi"/>
<Item Name="_caraya_updateVInames.vi" Type="VI" URL="../project/Caraya/_utilities/_caraya_updateVInames.vi"/>
<Item Name="_caraya_updateLibraryIcon.vi" Type="VI" URL="../project/Caraya/_utilities/_caraya_updateLibraryIcon.vi"/>
<Item Name="_caraya_updatePPLbuildspec.vi" Type="VI" URL="../project/Caraya/_utilities/_caraya_updatePPLbuildspec.vi"/>
</Item>
<Item Name="Advanced" Type="Folder">
<Item Name="Create New Test Suite.vi" Type="VI" URL="../project/Caraya/Advanced/Create New Test Suite.vi"/>
<Item Name="Create Test Report from Template.vi" Type="VI" URL="../project/Caraya/Advanced/Create Test Report from Template.vi"/>
<Item Name="Build Caraya to PPL.vi" Type="VI" URL="../project/Caraya/Advanced/Build Caraya to PPL.vi"/>
</Item>
<Item Name="Run Tests in Active Project.vi" Type="VI" URL="../project/Caraya/Run Tests in Active Project.vi"/>
<Item Name="Select and Run Tests on Disk.vi" Type="VI" URL="../project/Caraya/Select and Run Tests on Disk.vi"/>
Expand Down Expand Up @@ -299,6 +301,9 @@
<Item Name="Pathes.ctl" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Icon API/lv_icon/Controls/Pathes.ctl"/>
<Item Name="Get LV Class Path.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/LVClass/Get LV Class Path.vi"/>
<Item Name="Get LV Class Default Value.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/LVClass/Get LV Class Default Value.vi"/>
<Item Name="GetTargetBuildSpecs (project reference).vi" Type="VI" URL="/&lt;vilib&gt;/AppBuilder/GetTargetBuildSpecs (project reference).vi"/>
<Item Name="NI_App_Builder_API.lvlib" Type="Library" URL="/&lt;vilib&gt;/AppBuilder/AB_API_Simple/NI_App_Builder_API.lvlib"/>
<Item Name="GetTargetBuildSpecs.vi" Type="VI" URL="/&lt;vilib&gt;/AppBuilder/GetTargetBuildSpecs.vi"/>
</Item>
<Item Name="user.lib" Type="Folder">
<Item Name="Conditional Auto-Indexing Tunnel__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/array/array.llb/Conditional Auto-Indexing Tunnel__ogtk.vi"/>
Expand Down
102 changes: 56 additions & 46 deletions src/Caraya.vipb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="2018" Created_Date="2015-09-12 17:10:15" Modified_Date="2020-12-01 21:09:48" Creator="Tomi Maila" Comments="" ID="d7f03527dace441cf7f6d15982e17257">
<VI_Package_Builder_Settings Version="2018" Created_Date="2015-09-12 17:10:15" Modified_Date="2021-02-28 15:04:02" Creator="Tomi Maila" Comments="" ID="623d548a909a19f996da01e1cf81fc6b">
<Library_General_Settings>
<Package_File_Name>jki_lib_caraya</Package_File_Name>
<Library_Version>1.1.0.120</Library_Version>
<Library_Version>1.2.0.121</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>..</Library_Output_Folder>
Expand Down Expand Up @@ -46,36 +46,21 @@ http://jki.net/tools#caraya</Description>
<Copyright/>
<Packager>JKI</Packager>
<URL>https://github.com/JKISoftware/Caraya</URL>
<Release_Notes>Fixes:
<Release_Notes>********** THIS IS A PRE-ALPHA (!!!) RELEASE FOR TESTING PURPOSES ONLY *********

[Fix: 98] Fixed the error on re-running tests from the Test Manager when called from "Run Tests in Active Project"
[Fix: 100] Test Event storage now uses Test and Assert IDs to update verbose explanations in reports
[Fix: 101] Broken VIs are now handled properly in the Batch Running all Tests in Active Project
[Fix: 102] Conditionally disable the "UI: Update Count" frame content on RT targets
[Fix: 103] OpenG dependencies are now included in the package (and namespaced)
[Fix: 104] Asserts in SubVIs not appearing as expected in JUnit reports
[Fix: 109] The Test Name/Assert Name are used instead of VI File Name (reverted to same behavior as 1.0.2)
[Fix: 110] Test Event storage now uses Test and Assert IDs to update verbose explanations in reports
Fixes:

[Fix: nn] Fix description

New Features:

[Feature: 94] Added a Pre-Build PassFail verification step for package building
[Feature: 95] Test Suite now returns a "Test Result" object when it completes.
[Feature: nn] Feature description


Thanks for all the contributions that led to this release, whether by reporting bugs, requesting features that made it to release or by lending a hand in fixing issues or releasing features:

Christopher Field (@volks73)
Joerg Hampel (@joerghampel)
Matthew Jacobson (@jacobson3)
Jim Kring (@jimkring)
James McNally (@JamesMc86)
Francois Normandin (@francois-normandin)
Felipe Pinheiro Silva (@felipefoz)
Chris Stryker (@ChrisStrykesAgain)
Sam Taggart (@stagg54)
Antonio Terrazas (@aterrazasl)
SRM256 (@SRM256)
Name (@alias)

</Release_Notes>
</Description>
<Destinations>
Expand Down Expand Up @@ -233,9 +218,6 @@ SRM256 (@SRM256)
<Exclusions>
<Path>tests/pre-build-tests</Path>
</Exclusions>
<Exclusions>
<Path>tests</Path>
</Exclusions>
<Exclusions>
<Path>Test Runner Pre-build action.vi</Path>
</Exclusions>
Expand Down Expand Up @@ -395,7 +377,7 @@ SRM256 (@SRM256)
<Path>classes\Assert\Assert.vi</Path>
<VI_Title>Assert</VI_Title>
</Items_Data>
<GUID>4CAC9F3682CCDF9C00DA4148C05A3639</GUID>
<GUID>09624C6A1E150DB0EAB7024074B669C1</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -500,15 +482,15 @@ SRM256 (@SRM256)
<Path>Test Results</Path>
<VI_Title/>
</Items_Data>
<GUID>EEF189695B920415FA733B8775C570BE</GUID>
<GUID>7B85464FF119B63FFBCC43B8750D8929</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>8</Parent_Palette_Index>
<Name>Advanced Reporting</Name>
<View_Format>Icons</View_Format>
<Size>
<Height_Row>2</Height_Row>
<Width_Col.>4</Width_Col.>
<Width_Col.>5</Width_Col.>
</Size>
<_256_Color_Icon>00000CA0002800000C9A00000400000000000020002000080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA00008888888888880000777777777777000055555555555500004444444444440000222222222222000011111111111100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055555555555555790000000000000000000000000000000000000000000000005500000000000079800000000000000000000000000000000000000000000000550000000000007955800000000000000000000000000000000000000000000055000000000000797979800000000000000000000000000000000000000000005500000000000000002A8000000000000000000000000000000000000000000055244E4E4E4E4E4E4E2A800000000000000000000000000000000000000000005500000000000024242A8000000000000000000000000000000000000000000079004E4E4E4E4E4E4E2A800000000000000000000000000000000000000000007900000000242424242A8000000000000000000000000000000000000000000079004E4E4E4E4E4E4E2A800000000000000000000000000000000000000000007900002424242424242A800000000000000000000000000000000000000000007A004E4E4E4E4E4E4E2A8000FFFFFF00000000000000FFFF0000000000000000802A2A2A2A2A2A2A2A2A8000FFFA56FF0000000000FF0000FF0000000000000080808080808080808080800000FFF82BFF000000FF002BF600FF000000000000000000000000000000FFFF000000D0F6FF000000FFFA562BF600FF0000000000000000000000000000FFFAFF0000D0F6FF00000000FF81562BF600FF00000000000000000000000000FF2B56FFFFFF00FF0000000088FF81562BF62BFF00000000000000000000000000FF2B567B56007BD00000888FFFFF815656D1000000000000000000000000000000D0D1FFD0FAF681A6886B47B300FFA6D10000000000000000000000000000000000000000D1FA0081B347B3000000FF00000000000000000000000000000000000000000000D07A007BFF000000000000000000000000000000000000000000000000000000FFD1560081A600000000000000000000000000000000000000000000000000A6476BD15600A6D00000000000000000000000000000000000000000000000886B478F00D056008188000000000000000000000000000000000000000000886B47B3000000D1560081D000000000000000000000000000000000000000A66B47B30000000000D156008181000000000000000000000000000000000000A6B3B300000000000000D156F88100000000000000000000000000000000000000B2000000000000000000D0A6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001FE000001FF000001FF800001FFC00001FFC00001FFC00001FFC00001FFC00001FFC00001FFC00001FFC00001FFDC0601FFDE0F01FFCF1F8000C71FC000E70FE000FF0FF0007F9FE0003FFDC00003F8800001F0000001F8000003FC000007BE00000F1F00001E0F80001C078000080300000000000000000</_256_Color_Icon>
<BW_Color_Icon>00000000</BW_Color_Icon>
Expand Down Expand Up @@ -577,7 +559,21 @@ SRM256 (@SRM256)
<Path>classes\Test Result\Get All Test Results.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>F27A9CD9ED083E7084DCF430DE855B6B</GUID>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Get Type.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>2</Row>
<Column>5</Column>
</Position>
<Icon>00000000</Icon>
<Path>classes\Test Result\Get Type.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>2AEE9EAA4E01C1D06BAD0C3DDCAB15AA</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -808,7 +804,7 @@ SRM256 (@SRM256)
<Path>classes\Assert\Assert Not Equal Type_Variant.vi</Path>
<VI_Title>Assert Not Equal Type</VI_Title>
</Items_Data>
<GUID>F611725F39C124A88BDF28CC2DDEC592</GUID>
<GUID>A6C5E9CB15F38FF5B666E8C8B3D9832E</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -871,7 +867,7 @@ SRM256 (@SRM256)
<Path>subVIs\Run Tests Programmatically.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>17BE9B8DFBAD31B22442F28DFAF9C47B</GUID>
<GUID>8891A5303ECC86978E315002B4D20BA9</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -1060,7 +1056,7 @@ SRM256 (@SRM256)
<Path>classes\Test Runner.Class\Setup TestRunner ClassInstance.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>25757321014EB6C743003C7720EF7EFA</GUID>
<GUID>B32A8FF3723DC308B965B647C8C66CF0</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>5</Parent_Palette_Index>
Expand Down Expand Up @@ -1263,7 +1259,7 @@ SRM256 (@SRM256)
<Path>classes\Test Runner\Write ApplicationRef.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>0B5690E773AC33B10CAB7511BB2304E0</GUID>
<GUID>9A37258BC96F9375EC633410BD92F501</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
Expand Down Expand Up @@ -1357,32 +1353,46 @@ SRM256 (@SRM256)
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Advanced VI Tree - Caraya.vi</NameSub_Menu_Name>
<NameSub_Menu_Name>New Test (Caraya).vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<is_Merge_VI>true</is_Merge_VI>
<Position>
<Row>3</Row>
<Column>1</Column>
</Position>
<Icon>00000000</Icon>
<Path>classes\Assert\New Test (Caraya).vi</Path>
<VI_Title>New Test</VI_Title>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Get Caraya Library Information.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>1</Row>
<Column>5</Column>
</Position>
<Icon>00000000</Icon>
<Path>Advanced VI Tree - Caraya.vi</Path>
<Path>subVIs\Get Caraya Library Information.vi</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>New Test (Caraya).vi</NameSub_Menu_Name>
<NameSub_Menu_Name>Advanced VI Tree - Caraya.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>true</is_Merge_VI>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>3</Row>
<Column>1</Column>
<Column>5</Column>
</Position>
<Icon>00000000</Icon>
<Path>classes\Assert\New Test (Caraya).vi</Path>
<VI_Title>New Test</VI_Title>
<Path>Advanced VI Tree - Caraya.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>5CDEB9E792DEEF7B8E4EF35E2762E90F</GUID>
<GUID>A3C34C2C3228A802E2291E6AE4D30982</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>7</Parent_Palette_Index>
Expand Down Expand Up @@ -1459,7 +1469,7 @@ SRM256 (@SRM256)
<Path>Advanced Reporting</Path>
<VI_Title/>
</Items_Data>
<GUID>BE9FE1A9644D975CBEFCA16B389D6465</GUID>
<GUID>A47AE92B463CBA2E5FB47419A2921B70</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>1</Parent_Palette_Index>
Expand Down Expand Up @@ -1536,7 +1546,7 @@ SRM256 (@SRM256)
<Path>classes\Test Result\Get Node.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>AFADA5004A7EB6D1A82AA15B4A833C0B</GUID>
<GUID>23BA5D8B6BF7F30CA7525B4EE5D513BE</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
Loading

0 comments on commit e39ac6d

Please sign in to comment.