Skip to content

Commit d673b5f

Browse files
authored
Changed VI's to Source only and upgraded to LV 2020 (#1, #2) (#3)
- Changed VI's to Source only and upgraded to LV 2020 (#1, #2) - Added CI checks for .lvversion and source only settings - Refactored unit tests to not use other openG packages. - Remove dependency on OpenG Variant and OpenG String
1 parent 82580e3 commit d673b5f

470 files changed

Lines changed: 185 additions & 974 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: ci-checks
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request:
9+
workflow_dispatch:
10+
11+
jobs:
12+
13+
Checks:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
19+
- uses: actions/setup-python@v5
20+
with:
21+
python-version: '3.11'
22+
# cache: 'pip'
23+
24+
25+
- name: Checkout Repo
26+
uses: actions/checkout@v4
27+
28+
- name: Install pylavi
29+
run: |
30+
curl -LsSf https://astral.sh/uv/install.sh | sh
31+
uv venv
32+
uv pip install pylavi
33+
34+
- name: Run pylavi Tests
35+
shell: bash
36+
run: |
37+
38+
# read the LabVIEW version from the first line of .lvversion file
39+
LV_VERSION="$(head -n 1 .lvversion)"
40+
# convert to integer
41+
LV_VERSION=` echo $LV_VERSION | sed 's/\..*//' `
42+
source .venv/bin/activate
43+
44+
# print helpful info
45+
echo "Verifying:"
46+
echo " - Save Version is $LV_VERSION"
47+
echo " - Separate Compiled Code"
48+
echo " - No Breakpoints"
49+
50+
# call pylavi
51+
vi_validate \
52+
--path source \
53+
--path tests \
54+
--gt $LV_VERSION --lt $((LV_VERSION+1)) \
55+
--skip *.vit \
56+
--no-code \
57+
--breakpoints

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
# LabVIEW Local Project Settings
3+
*.aliases
4+
*.lvlps
5+
6+
# Built Packages
7+
*.vip

.lvversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
20.0

array.aliases

Lines changed: 0 additions & 3 deletions
This file was deleted.

array.dragon

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[project]
2+
labview-version = 2020
3+
vipc = 'source\.vipc'
4+
5+
[nipm]
6+
7+
[vipm]
8+
9+
[vipm.dependencies]

array.lvlps

Lines changed: 0 additions & 3 deletions
This file was deleted.

array.lvproj

Lines changed: 60 additions & 914 deletions
Large diffs are not rendered by default.
-9.34 KB
Binary file not shown.
-14.1 KB
Binary file not shown.

source/.vipb

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,22 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2010-12-19 20:21:08" Modified_Date="2021-02-04 09:54:33" Creator="Jonathon Green" Comments="" ID="7c91c3f309e6cab220997ffe6acb2d63">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2010-12-19 20:21:08" Modified_Date="2024-03-05 00:16:35" Creator="Jonathon Green" Comments="" ID="a038e711b11e19e9b809c94ce9d690f0">
22
<Library_General_Settings>
33
<Package_File_Name>oglib_array</Package_File_Name>
4-
<Library_Version>5.0.0.15</Library_Version>
4+
<Library_Version>6.0.0.15</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>OpenG</Company_Name>
99
<Library_Summary/>
1010
<Library_License>BSD</Library_License>
11-
<Package_LabVIEW_Version>13.0</Package_LabVIEW_Version>
11+
<Package_LabVIEW_Version>20.0</Package_LabVIEW_Version>
1212
<Community_Edition>false</Community_Edition>
1313
<Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA00008888888888880000777777777777000055555555555500004444444444440000222222222222000011111111111100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ACACACACACACACACACACACACACACACACACACACACACACACACACACACAC00000000AC25252525252525ACAC2525252525252525AC2525252525252525AC00000000AC2525FFFF252525ACAC25252525FF252525AC252525FFFF252525AC00000000AC2525FF25FF2525ACAC252525FFFF252525AC2525FF2525FF2525AC00000000AC2525FFFF252525ACAC25252525FF252525AC2525252525FF2525AC00000000AC2525FF25FF2525ACAC25252525FF252525AC25252525FF252525AC00000000AC2525FF25FF2525ACAC25252525FF252525AC252525FF25252525AC00000000AC25252525252525ACAC25252525FF252525AC2525FF2525252525AC00000000ACACACACACACACACACAC252525FFFFFF2525AC2525FFFFFFFF2525AC00000000AC25252525252525ACAC2525252525252525AC2525252525252525AC00000000AC252525FF252525ACACACACACACACACACACACACACACACACACACACAC00000000AC2525FF25FF2525ACAC2525252525252525AC2525252525252525AC00000000AC2525FF25252525ACAC252525FFFF252525AC25252525FF252525AC00000000AC2525FF25FF2525ACAC2525FF2525FF2525AC2525FF25FF252525AC00000000AC252525FF252525ACAC2525252525FF2525AC2525FF25FF252525AC00000000AC25252525252525ACAC25252525FF252525AC2525FFFFFFFF2525AC00000000ACACACACACACACACACAC2525252525FF2525AC25252525FF252525AC00000000000000000000000000AC2525FF2525FF2525AC25252525FF252525AC00000000000000000000000000AC252525FFFF252525AC25252525FF252525AC00000000000000000000000000AC2525252525252525AC2525252525252525AC00000000000000000000000000ACACACACACACACACACACACACACACACACACACAC0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC3FFFFFFC001FFFFC001FFFFC001FFFFC001FFFFC0000000000000000000000000000000000000000002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
1414
<Product_Name>OpenG Array Library</Product_Name>
1515
<Was_Built>true</Was_Built>
1616
<Target>LabVIEW</Target>
1717
</Library_General_Settings>
1818
<Advanced_Settings>
19-
<Package_Dependencies>
20-
<External_Dependencies>oglib_array &gt;= 3.0.0</External_Dependencies>
21-
<External_Dependencies>oglib_error &gt;= 2.0</External_Dependencies>
22-
<External_Dependencies>oglib_lvdata &gt;= 2.0</External_Dependencies>
23-
<External_Dependencies>oglib_string &gt;= 2.6</External_Dependencies>
24-
<Direct_Dependencies>oglib_array-3.0.0-1</Direct_Dependencies>
25-
<Direct_Dependencies>oglib_error-2.0-1</Direct_Dependencies>
26-
<Direct_Dependencies>oglib_lvdata-2.0-1</Direct_Dependencies>
27-
<Direct_Dependencies>oglib_string-2.6-1</Direct_Dependencies>
28-
</Package_Dependencies>
19+
<Package_Dependencies/>
2920
<Custom_Action_VIs>
3021
<Pre-Build_VI/>
3122
<Post-Build_VI/>
@@ -41,10 +32,10 @@
4132
<Copyright>Copyright (c) 2002-2021 Jim Kring, Jonathon Green, Cal-Bay Systems, Inc., MKS Instruments, JKI</Copyright>
4233
<Packager>OpenG</Packager>
4334
<URL>https://www.vipm.io/package/oglib_array/</URL>
44-
<Release_Notes>## [5.0.0] - 2021-02-04
35+
<Release_Notes>## [6.0.0] - 2024-03-04
4536
### Changed
46-
- Requires LV2013 or greater (sources upgraded to LV2013) [Issue #1]
47-
- Separated compiled code (Marked all as Source Only VIs) [Issue #1]
37+
- Requires LV2020 or greater (sources upgraded to LV2020) [Issue #1]
38+
- Separated compiled code (Marked all as Source Only VIs) [Issue #2]
4839

4940
Kudos to contributors Jim Kring (@jimkring) for their work on this release.</Release_Notes>
5041
</Description>
@@ -264,6 +255,7 @@ Kudos to contributors Jim Kring (@jimkring) for their work on this release.</Rel
264255
<close_labview_before_install>false</close_labview_before_install>
265256
<restart_labview_after_install>false</restart_labview_after_install>
266257
<skip_mass_compile_after_install>false</skip_mass_compile_after_install>
258+
<install_into_global_environment>false</install_into_global_environment>
267259
</LabVIEW>
268260
<VI_Docs>
269261
<Edit_VI_Description>false</Edit_VI_Description>
@@ -447,7 +439,7 @@ Kudos to contributors Jim Kring (@jimkring) for their work on this release.</Rel
447439
<Path>library\Sort Array.vi</Path>
448440
<VI_Title>Sort Array</VI_Title>
449441
</Items_Data>
450-
<GUID>32C6697E7E69D62F0075928038F5184B</GUID>
442+
<GUID>7BC2E66BA81F6208B1B8E0A8302E428B</GUID>
451443
</Functions_Palette_Data>
452444
</Library_Palette_Definition>
453445
</VI_Package_Builder_Settings>

0 commit comments

Comments
 (0)