Remove Measurement Helpers Library (#368)

* Remove helper library from template * Remove helper references from editor scripting
ni · Oct 24, 2023 · f103358 · f103358
1 parent bd65480
commit f103358
Show file tree

Hide file tree

Showing 24 changed files with 4 additions and 37 deletions.
diff --git a/Source/Generator/Create Measurement Service.vi b/Source/Generator/Create Measurement Service.vi
diff --git a/Source/Generator/Measurement Service Template.lvproj b/Source/Generator/Measurement Service Template.lvproj
@@ -13,7 +13,6 @@
 		<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
 		<Property Name="specify.custom.address" Type="Bool">false</Property>
 		<Item Name="MeasurementLink Measurement Template" Type="Folder">
-			<Item Name="Measurement Service Helpers.lvlib" Type="Library" URL="../MeasurementLink Measurement Template/Measurement Service Helpers/Measurement Service Helpers.lvlib"/>
 			<Item Name="MeasurementLink Measurement Template.lvlib" Type="Library" URL="../MeasurementLink Measurement Template/MeasurementLink Measurement Template.lvlib"/>
 		</Item>
 		<Item Name="Tests.Generator" Type="Folder">
@@ -28,16 +27,16 @@
 				<Item Name="Application Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Application Directory.vi"/>
 				<Item Name="Check if File or Folder Exists.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Check if File or Folder Exists.vi"/>
 				<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
-				<Item Name="Equal Comparable.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Comparison/Equal/Equal Comparable/Equal Comparable.lvclass"/>
-				<Item Name="Equal Functor.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/Comparison/Equal/Equal Functor/Equal Functor.lvclass"/>
-				<Item Name="Equals.vim" Type="VI" URL="/&lt;vilib&gt;/Comparison/Equals.vim"/>
 				<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
+				<Item Name="Error Strings Global Internal.vi" Type="VI" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Server/Helpers/Error Strings Global Internal.vi"/>
 				<Item Name="Get File Extension.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/libraryn.llb/Get File Extension.vi"/>
 				<Item Name="Get System Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/sysdir.llb/Get System Directory.vi"/>
 				<Item Name="grpc-lvsupport-release.lvlib" Type="Library" URL="/&lt;vilib&gt;/gRPC/LabVIEW gRPC Library/grpc-lvsupport-release.lvlib"/>
 				<Item Name="gRPC-servicer-release.lvlib" Type="Library" URL="/&lt;vilib&gt;/gRPC/LabVIEW gRPC Servicer/gRPC-servicer-release.lvlib"/>
+				<Item Name="LVMapReplaceAction.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVMapReplaceAction.ctl"/>
 				<Item Name="MeasurementLink Discovery Client.lvlib" Type="Library" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Discovery Client/MeasurementLink Discovery Client.lvlib"/>
 				<Item Name="MeasurementLink gRPC Utilities.lvlib" Type="Library" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink gRPC Utilities/MeasurementLink gRPC Utilities.lvlib"/>
+				<Item Name="MeasurementLink Instrument.lvlib" Type="Library" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Instrument/MeasurementLink Instrument.lvlib"/>
 				<Item Name="MeasurementLink Measurement Server Internal.lvlib" Type="Library" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Server Internal/MeasurementLink Measurement Server Internal.lvlib"/>
 				<Item Name="MeasurementLink Measurement Server.lvlib" Type="Library" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Server/MeasurementLink Measurement Server.lvlib"/>
 				<Item Name="MeasurementLink Measurement Service Base V2.lvlib" Type="Library" URL="/&lt;vilib&gt;/MeasurementLink/MeasurementLink Measurement Service Base V2/MeasurementLink Measurement Service Base V2.lvlib"/>
@@ -48,8 +47,7 @@
 				<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
 				<Item Name="NI_LVConfig.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/config.llb/NI_LVConfig.lvlib"/>
 				<Item Name="NI_PackedLibraryUtility.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/LVLibp/NI_PackedLibraryUtility.lvlib"/>
-				<Item Name="Search Unsorted 1D Array Core.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Helpers/Search Unsorted 1D Array Core.vim"/>
-				<Item Name="Search Unsorted 1D Array.vim" Type="VI" URL="/&lt;vilib&gt;/Array/Search Unsorted 1D Array.vim"/>
+				<Item Name="Set Difference.vim" Type="VI" URL="/&lt;vilib&gt;/set operations/Set Difference.vim"/>
 				<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
 				<Item Name="System Directory Type.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/sysdir.llb/System Directory Type.ctl"/>
 				<Item Name="System Exec.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/system.llb/System Exec.vi"/>

diff --git a/...asurementLink Measurement Template/Measurement Service Helpers/Create Discovery Client.vi b/...asurementLink Measurement Template/Measurement Service Helpers/Create Discovery Client.vi
diff --git a/...nerator/MeasurementLink Measurement Template/Measurement Service Helpers/GRPC Clients.ctl b/...nerator/MeasurementLink Measurement Template/Measurement Service Helpers/GRPC Clients.ctl
diff --git a/...asurementLink Measurement Template/Measurement Service Helpers/Get Session Information.vi b/...asurementLink Measurement Template/Measurement Service Helpers/Get Session Information.vi
diff --git a/...tLink Measurement Template/Measurement Service Helpers/Get Session and Channel (1 Pin).vi b/...tLink Measurement Template/Measurement Service Helpers/Get Session and Channel (1 Pin).vi
diff --git a/...tLink Measurement Template/Measurement Service Helpers/Get Session and Channels (Poly).vi b/...tLink Measurement Template/Measurement Service Helpers/Get Session and Channels (Poly).vi
diff --git a/...nk Measurement Template/Measurement Service Helpers/Get Sessions and Channels (N Pins).vi b/...nk Measurement Template/Measurement Service Helpers/Get Sessions and Channels (N Pins).vi
diff --git a/...surementLink Measurement Template/Measurement Service Helpers/Get gRPC Device Location.vi b/...surementLink Measurement Template/Measurement Service Helpers/Get gRPC Device Location.vi
diff --git a/...asurementLink Measurement Template/Measurement Service Helpers/Location to Grpc Device.vi b/...asurementLink Measurement Template/Measurement Service Helpers/Location to Grpc Device.vi
diff --git a/...mentLink Measurement Template/Measurement Service Helpers/Location to Insecure Address.vi b/...mentLink Measurement Template/Measurement Service Helpers/Location to Insecure Address.vi
diff --git a/...ntLink Measurement Template/Measurement Service Helpers/Measurement Service Helpers.lvlib b/...ntLink Measurement Template/Measurement Service Helpers/Measurement Service Helpers.lvlib
diff --git a/...r/MeasurementLink Measurement Template/Measurement Service Helpers/Reserve (1 Session).vi b/...r/MeasurementLink Measurement Template/Measurement Service Helpers/Reserve (1 Session).vi
diff --git a/.../MeasurementLink Measurement Template/Measurement Service Helpers/Reserve (N Sessions).vi b/.../MeasurementLink Measurement Template/Measurement Service Helpers/Reserve (N Sessions).vi
diff --git a/...erator/MeasurementLink Measurement Template/Measurement Service Helpers/Reserve (Poly).vi b/...erator/MeasurementLink Measurement Template/Measurement Service Helpers/Reserve (Poly).vi
diff --git a/...MeasurementLink Measurement Template/Measurement Service Helpers/Unreserve (1 Session).vi b/...MeasurementLink Measurement Template/Measurement Service Helpers/Unreserve (1 Session).vi
diff --git a/...easurementLink Measurement Template/Measurement Service Helpers/Unreserve (N Sessions).vi b/...easurementLink Measurement Template/Measurement Service Helpers/Unreserve (N Sessions).vi
diff --git a/...ator/MeasurementLink Measurement Template/Measurement Service Helpers/Unreserve (Poly).vi b/...ator/MeasurementLink Measurement Template/Measurement Service Helpers/Unreserve (Poly).vi
diff --git a/.../MeasurementLink Measurement Template/Measurement Service Helpers/gRPC Device Options.ctl b/.../MeasurementLink Measurement Template/Measurement Service Helpers/gRPC Device Options.ctl
diff --git a/Source/Generator/_Editor/Add Library To Project.vi b/Source/Generator/_Editor/Add Library To Project.vi
diff --git a/Source/Generator/_Editor/Get Measurement Helper Library.vi b/Source/Generator/_Editor/Get Measurement Helper Library.vi
diff --git a/Source/Generator/_Editor/MeasurementService Editor Constants.vi b/Source/Generator/_Editor/MeasurementService Editor Constants.vi
diff --git a/Source/Generator/_Editor/MeasurementService Editor.lvlib b/Source/Generator/_Editor/MeasurementService Editor.lvlib
@@ -12,11 +12,8 @@
 		<Item Name="Create Build Specification.vi" Type="VI" URL="../Create Build Specification.vi"/>
 		<Item Name="Get Active Project Details.vi" Type="VI" URL="../Get Active Project Details.vi"/>
 		<Item Name="Get Library.vi" Type="VI" URL="../Get Library.vi"/>
-		<Item Name="Get Measurement Helper Library.vi" Type="VI" URL="../Get Measurement Helper Library.vi"/>
 		<Item Name="Get Reserved Names.vi" Type="VI" URL="../Get Reserved Names.vi"/>
-		<Item Name="MeasurementService Editor Constants.vi" Type="VI" URL="../MeasurementService Editor Constants.vi"/>
 		<Item Name="Open Project.vi" Type="VI" URL="../Open Project.vi"/>
-		<Item Name="Save As Measurement Service Helpers.vi" Type="VI" URL="../Save As Measurement Service Helpers.vi"/>
 		<Item Name="Save As Measurement Service template.vi" Type="VI" URL="../Save As Measurement Service template.vi"/>
 		<Item Name="Update Measurement Details.vi" Type="VI" URL="../Update Measurement Details.vi"/>
 		<Item Name="Valid Measurement Service Name.vi" Type="VI" URL="../Valid Measurement Service Name.vi"/>

diff --git a/Source/Generator/_Editor/Save As Measurement Service Helpers.vi b/Source/Generator/_Editor/Save As Measurement Service Helpers.vi