Skip to content

Adding test for hierarchy of PPLs and projects #25

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

Open
niphilj wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Adding test for hierarchy of PPLs and projects #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e02e84c
Adding test for hierarchy of PPLs and projects
niphilj Mar 15, 2021
d2b7e11
refreshing dependencies after focusing on the active target
niphilj Mar 15, 2021
f2d9d89
pass at adding new tests projects
niphilj Mar 16, 2021
0efdac1
updating tests
niphilj Mar 16, 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
Binary file added src/Locked/subGetProjectItemRefForFile.vi
View file
Open in desktop
Binary file not shown.
13 changes: 11 additions & 2 deletions src/SolutionBuilder/BuildManager/BuildManager.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/SolutionBuilder/BuildManager/Private/subFindItemInProject.vi
View file
Open in desktop
Binary file not shown.
Binary file modified src/SolutionBuilder/BuildManager/Private/subOpenNewProject.vi
View file
Open in desktop
Binary file not shown.
Binary file modified src/SolutionBuilder/BuildManager/Private/subReplaceSourceLibaryWithBuiltLib.vi
View file
Open in desktop
Binary file not shown.
Binary file modified src/SolutionBuilder/CalculateSpecificationBuildOrder.vi
View file
Open in desktop
Binary file not shown.
Binary file modified src/SolutionBuilder/Community/subCleanUpDependencies.vi
View file
Open in desktop
Binary file not shown.
Binary file renamed ...Builder/Private/SubGenerateListToOrder.vi → ...Builder/Private/subGenerateListToOrder.vi
View file
Open in desktop
Binary file not shown.
565 changes: 289 additions & 276 deletions src/SolutionBuilder/ProjectItem/ProjectItem.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added src/SolutionBuilder/ProjectItem/ReplaceDependency.vi
View file
Open in desktop
Binary file not shown.
1,068 changes: 536 additions & 532 deletions src/SolutionBuilder/SolutionBuilder.lvclass
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/SolutionBuilder/SolutionBuilder.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<Item Name="Locked" Type="Folder">
<Item Name="subCreateLocalInstance.vi" Type="VI" URL="../../Locked/subCreateLocalInstance.vi"/>
<Item Name="subGetDependencyInfoList.vi" Type="VI" URL="../../Locked/subGetDependencyInfoList.vi"/>
<Item Name="subGetProjectItemRefForFile.vi" Type="VI" URL="../../Locked/subGetProjectItemRefForFile.vi"/>
</Item>
<Item Name="Private" Type="Folder">
<Property Name="NI.LibItem.Scope" Type="Int">2</Property>
Expand Down
8 changes: 8 additions & 0 deletions src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchy.slnbld
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Solution>
<ProjectPath>TargetsDifferentCompilePPLHierarchyLibA.lvproj</ProjectPath>
<ProjectPath>TargetsDifferentCompilePPLHierarchyLibB.lvproj</ProjectPath>
<ProjectPath>TargetsDifferentCompilePPLHierarchyLibC.lvproj</ProjectPath>
<ProjectPath>TargetsDifferentCompilePPLHierarchyLibA_RT.lvproj</ProjectPath>
<ProjectPath>TargetsDifferentCompilePPLHierarchyLibB_RT.lvproj</ProjectPath>
<ProjectPath>TargetsDifferentCompilePPLHierarchyLibC_RT.lvproj</ProjectPath>
</Solution>
15 changes: 15 additions & 0 deletions src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchy/Library A.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="19008000">
<Property Name="EndevoGOOP_ColorFrame" Type="UInt">0</Property>
<Property Name="EndevoGOOP_ColorHeader" Type="UInt">3620676</Property>
<Property Name="EndevoGOOP_ColorPrivate" Type="UInt">7895160</Property>
<Property Name="EndevoGOOP_ColorPublic" Type="UInt">16711422</Property>
<Property Name="EndevoGOOP_ColorTextBody" Type="UInt">1</Property>
<Property Name="EndevoGOOP_ColorTextHeader" Type="UInt">16448250</Property>
<Property Name="EndevoGOOP_FrameThickness" Type="UInt">1</Property>
<Property Name="NI.Lib.Icon" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!)G!!!*Q(C=\&gt;8"43."%)8B"_+Q6UM%M()+,Q7HY"4KT!(7YL:(JV!J/!!O4K&amp;3=!K/!-H]UZ1-BZXV:5%L2)`&lt;^LS?\P\I;1`3+$_E'ZUOF??`FH/\2G85=;+Z^O?XVXR`380N]`WFN`Z`;*`V8SD[,N`F;Z@@&amp;X]%(`Y\O.,U)+)7.;F"N;:J4U6?Z%6?Z%6?Z%G?Z%G?Z%G?Z%%?Z%%?Z%%?Z#9XO=F.&lt;H+4DY.=Z#)8/;2C]G+C9N"CA/*C+#L?#E`B+4S&amp;BV-6HM*4?!J0Y?%3&amp;:\#5XA+4_'BGQJ0Y3E]B;@Q-.31V$D)]21?BF@C34S**`%E(K:5YEE!S74*Q-EA-*1U*F]34_**0(R6YEE]C3@R*"[;F8A34_**0)G(,G.6=GCGARQ0QSDQ"*\!%XA#$U-L]!3?Q".Y!A`4+@!%HA!24"A-$E&amp;"J_##Y#4Q""Y_&amp;(A#4_!*0)'(JH'(9KT-J*E/=DT'9TT'9TT'QR!S(O-R(O-R(I;6]2C0]2C0]4#6D-&gt;YD-&gt;!T+2-,T/9[7AO-I(R]"K\R?-OZ:"Y(&amp;*P8P7G6']W^3:3&lt;Q\V46@@406.5C__?F(6C[6?"05@JU;L-?J*V*WH#X8E`5$&gt;5X@5,86$86.8V#6V-88^RR=?DU=&gt;$A@N^XPN&gt;DNNNVNN.BONVWON6CMNFUMN&amp;IPT9_!HR`G"]/[Z&gt;0^Y/DU]]8HX_HH\[\0_0`](TU:&gt;[`U=L.%,E'P%&amp;Q!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">419463168</Property>
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Item Name="Function.vi" Type="VI" URL="../Library A/Function.vi"/>
</Library>
Binary file added src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchy/Library A/Function.vi
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchy/Library B.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="19008000">
<Property Name="EndevoGOOP_ColorFrame" Type="UInt">0</Property>
<Property Name="EndevoGOOP_ColorHeader" Type="UInt">3620676</Property>
<Property Name="EndevoGOOP_ColorPrivate" Type="UInt">7895160</Property>
<Property Name="EndevoGOOP_ColorPublic" Type="UInt">16711422</Property>
<Property Name="EndevoGOOP_ColorTextBody" Type="UInt">1</Property>
<Property Name="EndevoGOOP_ColorTextHeader" Type="UInt">16448250</Property>
<Property Name="EndevoGOOP_FrameThickness" Type="UInt">1</Property>
<Property Name="NI.Lib.Icon" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!)=!!!*Q(C=\&gt;8"&lt;2J"'-8RF]C(8*&amp;31%1,LQ6;I)8P&lt;CE7VRRJY7O"!HSBB&gt;=#,6#"*@,@U1D\E*C,(577:`E7?,MT]`0MMJ:'_S&lt;&gt;[8+L0&lt;X;LM=VCF'8^\(`Y`'HZ^=&lt;^Z&gt;?\@^8`YWGT`&lt;:0H&lt;\&gt;@.(]/[`AS^;(E25K+;+MJ:J,S%0?=B$(P+1.XG4.XG4.XG4&amp;XG2&amp;XG2&amp;XG2G^TE*D?ZS5U_.H+2CVTEE-,E9;)Q;"AAH!R&amp;92=]Q2-]Q=.8"5`Q"%`Q"!_H+(C#*XC#*XDIJO!*HO!*HO"BK#(*W-DR"!`$K`%UHM&lt;4?"I05[LR.)"GMG&lt;A:B!9;AYW(RJ0YWE]@&amp;4D;4S.J`%U(A[L]43?RN.Y'A^&gt;RKLUU#Q&lt;/2['5?%J0)7H]"1?BF&lt;B+4S&amp;J`!5(K:4Y3E]";+9M"A=AIJ/R1H&amp;F]*4?(B4Y3E]B;@Q&amp;"Y/D3N59W57T&lt;+2YT%?YT%?YT%?BJ$R')`R')`R-+S-RXC-RXC-B[FE0-:D0!:C*G6[G=&amp;-2X/3#9S(V\B&lt;0+Z3$YH(*MW&lt;6`/GV,T:.']CT:N$][*L8ET.C[3Z_*K,KLF9GIOA_=&gt;JID5RGJ.I&gt;FZ/V*H^C4J3"WJ0\;ANN;(7V'LJ_M9HHM^HH5YH(9^((1Y(\@&gt;\\89\&lt;&lt;&gt;&lt;&lt;49&lt;L&gt;&gt;LL6;L[W0A"^PVA@$CO@4T`H*Z?(R_`X\`L`Y``Q@02HX6STF9I^_&amp;%--0!!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">419463168</Property>
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Item Name="Function.vi" Type="VI" URL="../Library B/Function.vi"/>
</Library>
Binary file added src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchy/Library B/Function.vi
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchy/Library C.lvlib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<Library LVVersion="19008000">
<Property Name="EndevoGOOP_ColorFrame" Type="UInt">0</Property>
<Property Name="EndevoGOOP_ColorHeader" Type="UInt">3620676</Property>
<Property Name="EndevoGOOP_ColorPrivate" Type="UInt">7895160</Property>
<Property Name="EndevoGOOP_ColorPublic" Type="UInt">16711422</Property>
<Property Name="EndevoGOOP_ColorTextBody" Type="UInt">1</Property>
<Property Name="EndevoGOOP_ColorTextHeader" Type="UInt">16448250</Property>
<Property Name="EndevoGOOP_FrameThickness" Type="UInt">1</Property>
<Property Name="NI.Lib.Icon" Type="Bin">'1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!)B!!!*Q(C=\&gt;8"43."%)8B"_,!V2)")+@Q5H!+4K%C!)WY=81+F9)$W)N4K"3=AC.!-P]U*=0&amp;7#MN#+XI=&gt;G?.^0&gt;(TXD12LN6LL2]6*\_&lt;3&gt;DGM5IYY&gt;H4P_]PY[X``5_W`[3Z`/@^:`I?GX`&lt;&lt;`OTV@`"&amp;]_?`A3P/$C#IKK;#M?&gt;JDE2&gt;ZE2&gt;ZE2&gt;ZEC&gt;ZEC&gt;ZEC&gt;ZE!&gt;ZE!&gt;ZE!?ZS5VO=J/&lt;X/2D)R?ZS%5/K:C]G+A9N"CA/"G+CL@#5XA+4_&amp;B6Y7H]"3?QF.Y/%7&amp;J`!5HM*4?/CGQF.Y#E`B+4Q-.31V.H)]B9@BF8A34_**0)G(+:6Y%E!S74*Q-AA-*1?4,YEH]31?PCLR**\%EXA3$Y?6?"*0YEE]C9=O9V6S;/;.(!`$+0!%HM!4?!)01SPQ"*\!%XA#$^-J]!3?!"&amp;-'!Q/15'HY)2A*`!%(DY5?!*0Y!E]A9&gt;$YQL&amp;7*F:-W`E?)T(?)T(?)S()71]RG-]RG-]$#PD-2\D-2\D93I:D`%9DY'93:F?:D$4U:RE!O0B.?Y7D[O51_+R38XTKG^+^=WGPIH5.Y@[IKMPJPICK2&gt;@P;DKR6)PAPK05[06'05E[M\TC4LQPK&gt;WV*&lt;;5"/VJF&lt;5EFL-8@`RC9@$1@P^8LP&gt;4NPN6JP.2N-U;&lt;V?;\6;;&lt;F=;L&amp;9H"Y$^WSH"]+(Z^,$U`(Y_)@0[?XT\OG\`D``A'?DLP6R$N&lt;I&amp;9C]RR5!!!!!</Property>
<Property Name="NI.Lib.SourceVersion" Type="Int">419463168</Property>
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Item Name="Function.vi" Type="VI" URL="../Library C/Function.vi"/>
</Library>
Binary file added src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchy/Library C/Function.vi
View file
Open in desktop
Binary file not shown.
62 changes: 62 additions & 0 deletions src/_tests/Tests.AdvancedAssets/TargetsDifferentCompilePPLHierarchyLibA.lvproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version='1.0' encoding='UTF-8'?>
<Project Type="Project" LVVersion="19008000">
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
<Item Name="My Computer" Type="My Computer">
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
<Property Name="server.tcp.enabled" Type="Bool">false</Property>
<Property Name="server.tcp.port" Type="Int">0</Property>
<Property Name="server.tcp.serviceName" Type="Str">My Computer/VI Server</Property>
<Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
<Property Name="specify.custom.address" Type="Bool">false</Property>
<Item Name="Library A.lvlib" Type="Library" URL="../TargetsDifferentCompilePPLHierarchy/Library A.lvlib"/>
<Item Name="Dependencies" Type="Dependencies"/>
<Item Name="Build Specifications" Type="Build">
<Item Name="Library A" Type="Packed Library">
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{7A0CC212-9FF1-49C7-BC0D-C83E82237548}</Property>
<Property Name="Bld_buildSpecName" Type="Str">Library A</Property>
<Property Name="Bld_excludeDependentDLLs" Type="Bool">true</Property>
<Property Name="Bld_excludeDependentPPLs" Type="Bool">true</Property>
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
<Property Name="Bld_localDestDir" Type="Path">../obj/TargetsDifferentCompilePPLHierarchy/Windows (x86)/Libraries</Property>
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
<Property Name="Bld_previewCacheID" Type="Str">{88FEF274-7EDC-444B-AF87-8A57AACEE21B}</Property>
<Property Name="Bld_version.build" Type="Int">6</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Destination[0].destName" Type="Str">Library A.lvlibp</Property>
<Property Name="Destination[0].path" Type="Path">../obj/TargetsDifferentCompilePPLHierarchy/Windows (x86)/Libraries/Library A.lvlibp</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
<Property Name="Destination[0].type" Type="Str">App</Property>
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
<Property Name="Destination[1].path" Type="Path">../obj/TargetsDifferentCompilePPLHierarchy/Windows (x86)/Libraries</Property>
<Property Name="DestinationCount" Type="Int">2</Property>
<Property Name="PackedLib_callersAdapt" Type="Bool">true</Property>
<Property Name="Source[0].itemID" Type="Str">{55A29A19-239D-4B27-B27E-9ED0E951B957}</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/Library A.lvlib</Property>
<Property Name="Source[1].Library.allowMissingMembers" Type="Bool">true</Property>
<Property Name="Source[1].Library.atomicCopy" Type="Bool">true</Property>
<Property Name="Source[1].Library.LVLIBPtopLevel" Type="Bool">true</Property>
<Property Name="Source[1].preventRename" Type="Bool">true</Property>
<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
<Property Name="Source[1].type" Type="Str">Library</Property>
<Property Name="SourceCount" Type="Int">2</Property>
<Property Name="TgtF_companyName" Type="Str">Averna B.V.</Property>
<Property Name="TgtF_enableDebugging" Type="Bool">true</Property>
<Property Name="TgtF_fileDescription" Type="Str">Library A</Property>
<Property Name="TgtF_internalName" Type="Str">Library A</Property>
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2021 Averna B.V.</Property>
<Property Name="TgtF_productName" Type="Str">Library A</Property>
<Property Name="TgtF_targetfileGUID" Type="Str">{4398F983-F4E0-4ABD-9129-E88DC604C990}</Property>
<Property Name="TgtF_targetfileName" Type="Str">Library A.lvlibp</Property>
<Property Name="TgtF_versionIndependent" Type="Bool">true</Property>
</Item>
</Item>
</Item>
</Project>
Loading