Skip to content

Commit bad424f

Browse files
[Feature: 3] Wrapper methods Caraya and RunCaraya now installed in G-CLI folder
[Fix: 4] Quitting LabVIEW is now optional when done, with -q as a required tag to Exit LabVIEW when done [Feature: 5] Paths will now resolve relative to the Working Directory when passed as relative. UPGRADED CODE TO LABVIEW 2020
1 parent f7a0434 commit bad424f

File tree

9 files changed

+108
-310
lines changed

9 files changed

+108
-310
lines changed

src/Caraya CLI Extension.lvproj

Lines changed: 76 additions & 299 deletions
Large diffs are not rendered by default.

src/Caraya CLI Extension.vipb

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2015-09-12 17:10:15" Modified_Date="2021-03-09 18:05:15" Creator="Tomi Maila" Comments="" ID="75160fb12aaa0366e3b0da7a10ddcb57">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2015-09-12 17:10:15" Modified_Date="2023-10-14 12:58:17" Creator="Tomi Maila" Comments="" ID="7525813c13ff0817e15154c79ab674a7">
22
<Library_General_Settings>
33
<Package_File_Name>lvos_lib_caraya_cli_extension</Package_File_Name>
4-
<Library_Version>1.1.0.4</Library_Version>
4+
<Library_Version>2.0.0.8</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>.</Library_Source_Folder>
77
<Library_Output_Folder>..</Library_Output_Folder>
88
<Company_Name>LabVIEW Open Source Project</Company_Name>
99
<Library_Summary/>
1010
<Library_License>0-BSD</Library_License>
11-
<Package_LabVIEW_Version>13.0</Package_LabVIEW_Version>
12-
<Community_Edition>false</Community_Edition>
11+
<Package_LabVIEW_Version>20.0</Package_LabVIEW_Version>
12+
<Community_Edition>true</Community_Edition>
1313
<Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA0000888888888888000077777777777700005555555555550000444444444444000022222222222200001111111111110000000000000000383E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E383E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E38312BF60731383E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E310000000000000031383E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E37F6000000000000000000F6313E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E380700000000000000000000000000F6383E3E3E3E3E3E3E3E3E3E3E3E3E3E310000000000000000000000000000000000313E3E3E3E3E3E3E3E3E3E3E3E2B000000000000000000000000000000000000073E3E3E3E3E3E3E3E3E3E3E310000000000000000F6313738383838383838383E3E3E3E3E3E3E3E3E3E3E3EF6000000000000F6373E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3800F68181818181888E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E313E3E3E3E3E3E31008100000000F60D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D0D8E3E3E3E3E3E3E31008100F6F6F6F62B3131313131313131313131313131315C8E3E3E3E3E3E3E31008100F62B2B2B2B5C5C5C5C5C5C5C5C5C5C5C5C5C5C315C8E3E3E3E3E3E3E31008100F62B8181FC8E8E8E8E8E8E8E8E8E8E8E8E8E0D315C8E3E3E3E3E3E3E31008100F62B818E8E8E8E8E8E8E8E8E8E8E8E8E8E8E0D315C8E3E3E3E3E3E3E31008100F62BFC318E8E8E8E8E318E8E8E8E8E8E8E8E0D315C8E3E3E3E3E3E3E31008100F62B878E318E8E8E8E8E318E8E8E8E8E8E8E0D315C8E3E3E3E3E3E3E31008100F62B878E8E318E8E8E8E8E318E8E8E8E8E8E0D315C8E3E3E3E3E3E3E37008100F62B81888E318E8E8E8E8E318E8E8E8E8E8E0D315C8E3E3E3E3E3E3E3E008100F62B81812B8E8E8E8E8E318E8E8E8E8E8E8E0D315C8E3E3E3E3E3E3E3E318100F62B81F6818187888831888888888888888E0D315C8E3E3E3E3E3E3E3E3E8100F62B8181818181818181818181F6F6F6F6FC0D315C8E3E3E3E3E3E3E3E3E8EF6F62B818181818181818181818181818181FC0D315C8E3E3E3E3E3E3E3E3E8E0D31F88181818181818181818181818181878E0D315C8E3E3E3E3E3E3E3E3E8E0D310DF6F600000000000000000000F60D0D0D0D315C8E3E3E3E3E3E3E3E3E8E0D313131312BF6F6F6F6F6F6F62B313131313131315C8E3E3E3E3E3E3E3E3E8E5C5C5C5C5C5C56F8F8F8F8F8565C5C5C5C5C5C5C5C5C8E3E3E3E3E3E3E3E3E318E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E8E313E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E383E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E3E38FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
1414
<Product_Name>Caraya CLI Extension</Product_Name>
1515
<Was_Built>true</Was_Built>
1616
<Target>LabVIEW</Target>
1717
</Library_General_Settings>
1818
<Advanced_Settings>
1919
<Package_Dependencies>
20-
<External_Dependencies>jki_lib_caraya &gt;= 1.1.0.119</External_Dependencies>
21-
<External_Dependencies>wiresmith_technology_lib_g_cli &gt;= 2.3.0.7</External_Dependencies>
20+
<External_Dependencies>jki_lib_caraya &gt;= 1.4.2.145</External_Dependencies>
21+
<External_Dependencies>labview_open_source_project_lib_openuri &gt;= 1.3.0.12</External_Dependencies>
22+
<External_Dependencies>wiresmith_technology_lib_g_cli &gt;= 3.0.1.98</External_Dependencies>
2223
<Additional_External_Dependencies>jki_lib_state_machine &gt;=2018.0.7.45</Additional_External_Dependencies>
2324
<Additional_External_Dependencies>jki_rsc_toolkits_palette &gt;=1.1</Additional_External_Dependencies>
24-
<Direct_Dependencies>jki_lib_caraya-1.1.0.119</Direct_Dependencies>
25-
<Direct_Dependencies>wiresmith_technology_lib_g_cli-2.3.0.7</Direct_Dependencies>
25+
<Direct_Dependencies>jki_lib_caraya-1.4.2.145</Direct_Dependencies>
26+
<Direct_Dependencies>labview_open_source_project_lib_openuri-1.3.0.12</Direct_Dependencies>
27+
<Direct_Dependencies>wiresmith_technology_lib_g_cli-3.0.1.98</Direct_Dependencies>
2628
</Package_Dependencies>
2729
<Custom_Action_VIs>
2830
<Pre-Build_VI/>
@@ -39,9 +41,9 @@
3941
<Copyright/>
4042
<Packager>LabVIEW Open Source Project</Packager>
4143
<URL>https://github.com/LabVIEW-Open-Source/Caraya-CLI-extension</URL>
42-
<Release_Notes>Fixed the behavior change between Caraya 1.0 and 1.1
43-
Now uses the Run Tests method which is appropriate for the task
44-
</Release_Notes>
44+
<Release_Notes>[Feature: 3] Wrapper methods Caraya and RunCaraya now installed in G-CLI folder
45+
[Fix: 4] Quitting LabVIEW is now optional when done, with -q as a required tag to Exit LabVIEW when done
46+
[Feature: 5] Paths will now resolve relative to the Working Directory when passed as relative.</Release_Notes>
4547
</Description>
4648
<Destinations>
4749
<Toolkit_VIs>
@@ -108,6 +110,12 @@ Now uses the Run Tests method which is appropriate for the task
108110
<Preserve_Hierarchy>true</Preserve_Hierarchy>
109111
<Path>&lt;vi.lib&gt;\addons\_JKI Toolkits\Caraya</Path>
110112
</Additional_Destination>
113+
<Additional_Destination>
114+
<Name>G CLI Tools</Name>
115+
<LLB>false</LLB>
116+
<Preserve_Hierarchy>true</Preserve_Hierarchy>
117+
<Path>&lt;vi.lib&gt;\G CLI Tools</Path>
118+
</Additional_Destination>
111119
</Destinations>
112120
<Source_Files>
113121
<Destination_Overrides>
@@ -128,6 +136,18 @@ Now uses the Run Tests method which is appropriate for the task
128136
<Additional_Destination>true</Additional_Destination>
129137
<Additional_Destination_Index>0</Additional_Destination_Index>
130138
</Destination_Overrides>
139+
<Destination_Overrides>
140+
<Path>RunCaraya.vi</Path>
141+
<Destination>0</Destination>
142+
<Additional_Destination>true</Additional_Destination>
143+
<Additional_Destination_Index>1</Additional_Destination_Index>
144+
</Destination_Overrides>
145+
<Destination_Overrides>
146+
<Path>Caraya.vi</Path>
147+
<Destination>0</Destination>
148+
<Additional_Destination>true</Additional_Destination>
149+
<Additional_Destination_Index>1</Additional_Destination_Index>
150+
</Destination_Overrides>
131151
<Password_Overrides>
132152
<Path>.</Path>
133153
<Password/>
@@ -197,6 +217,7 @@ Now uses the Run Tests method which is appropriate for the task
197217
<close_labview_before_install>false</close_labview_before_install>
198218
<restart_labview_after_install>false</restart_labview_after_install>
199219
<skip_mass_compile_after_install>false</skip_mass_compile_after_install>
220+
<install_into_global_environment>false</install_into_global_environment>
200221
</LabVIEW>
201222
<VI_Docs>
202223
<Edit_VI_Description>false</Edit_VI_Description>

src/Caraya CLI Extension.vipc

-12 MB
Binary file not shown.

src/Caraya.vi

10.3 KB
Binary file not shown.

src/CarayaCLIExecutionEngine.vi

-432 Bytes
Binary file not shown.

src/Resolve Arg Path.vi

10.6 KB
Binary file not shown.

src/RunCaraya.vi

16 Bytes
Binary file not shown.
-384 Bytes
Binary file not shown.
-376 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)