fixed exe building, renamed and cleaned library

kleinsimon · Jan 31, 2023 · c3a4f46 · c3a4f46
1 parent d51d203
commit c3a4f46
Show file tree

Hide file tree

Showing 71 changed files with 76 additions and 59,585 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,14 +1,10 @@
 *.vip
+builds/
 
 # Libraries
 *.lvlibp
 *.llb
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
+*.nupkg
 
 # Executables
 *.exe
@@ -17,3 +13,9 @@
 *.aliases
 *.lvlps
 .cache/
+
+
+microsoft.web.webview2/**/*.*
+!/microsoft.web.webview2/build/**/*.dll
+!/microsoft.web.webview2/lib/**/*.dll
+!/microsoft.web.webview2/*.txt
diff --git a/Example/Dual.vi b/Example/Dual.vi
diff --git a/Example/WebView2 Demo Browser.vi b/Example/WebView2 Demo Browser.vi
diff --git a/Example/Webview2 Demo.lvproj b/Example/Webview2 Demo.lvproj
@@ -16,16 +16,30 @@
 			<Item Name="Dual.vi" Type="VI" URL="../Dual.vi"/>
 			<Item Name="WebView2 Demo Browser.vi" Type="VI" URL="../WebView2 Demo Browser.vi"/>
 		</Item>
+		<Item Name="Libs" Type="Folder">
+			<Item Name="x64" Type="Folder">
+				<Item Name="WebView2Loader.dll" Type="Document" URL="../../microsoft.web.webview2/build/native/x64/WebView2Loader.dll"/>
+			</Item>
+			<Item Name="x86" Type="Folder">
+				<Item Name="WebView2Loader.dll" Type="Document" URL="../../microsoft.web.webview2/build/native/x86/WebView2Loader.dll"/>
+			</Item>
+			<Item Name="Microsoft.Web.WebView2.Core.dll" Type="Document" URL="../../microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.Core.dll"/>
+			<Item Name="Microsoft.Web.WebView2.WinForms.dll" Type="Document" URL="../../microsoft.web.webview2/lib/net45/Microsoft.Web.WebView2.WinForms.dll"/>
+		</Item>
+		<Item Name="WebView2 Control.xctl" Type="XControl" URL="../../Webview2 Control/WebView2 Control.xctl"/>
 		<Item Name="Dependencies" Type="Dependencies">
 			<Item Name="vi.lib" Type="Folder">
 				<Item Name=".NET Object To Variant.vi" Type="VI" URL="/&lt;vilib&gt;/Platform/dotnet.llb/.NET Object To Variant.vi"/>
+				<Item Name="Application Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Application Directory.vi"/>
 				<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.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="Check Special Tags.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Check Special Tags.vi"/>
 				<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
 				<Item Name="Convert property node font to graphics font.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Convert property node font to graphics font.vi"/>
 				<Item Name="Details Display Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Details Display Dialog.vi"/>
 				<Item Name="DialogType.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogType.ctl"/>
 				<Item Name="DialogTypeEnum.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/DialogTypeEnum.ctl"/>
+				<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 Code Database.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Code Database.vi"/>
 				<Item Name="ErrWarn.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/ErrWarn.ctl"/>
 				<Item Name="eventvkey.ctl" Type="VI" URL="/&lt;vilib&gt;/event_ctls.llb/eventvkey.ctl"/>
@@ -41,6 +55,8 @@
 				<Item Name="Longest Line Length in Pixels.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Longest Line Length in Pixels.vi"/>
 				<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
 				<Item Name="LVRectTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVRectTypeDef.ctl"/>
+				<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
+				<Item Name="NI_PackedLibraryUtility.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/LVLibp/NI_PackedLibraryUtility.lvlib"/>
 				<Item Name="Not Found Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Not Found Dialog.vi"/>
 				<Item Name="Search and Replace Pattern.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Search and Replace Pattern.vi"/>
 				<Item Name="Set Bold Text.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set Bold Text.vi"/>
@@ -54,13 +70,61 @@
 				<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
 				<Item Name="XControlSupport.lvlib" Type="Library" URL="/&lt;vilib&gt;/_xctls/XControlSupport.lvlib"/>
 			</Item>
-			<Item Name="Microsoft.Web.WebView2.Core.dll" Type="Document" URL="../../microsoft.web.webview2.1.0.1370.28/lib/net45/Microsoft.Web.WebView2.Core.dll"/>
-			<Item Name="Microsoft.Web.WebView2.WinForms.dll" Type="Document" URL="../../microsoft.web.webview2.1.0.1370.28/lib/net45/Microsoft.Web.WebView2.WinForms.dll"/>
 			<Item Name="mscorlib" Type="VI" URL="mscorlib">
 				<Property Name="NI.PreserveRelativePath" Type="Bool">true</Property>
 			</Item>
-			<Item Name="WebView2 Control.xctl" Type="XControl" URL="../../Webview2 Control/WebView2 Control.xctl"/>
 		</Item>
-		<Item Name="Build Specifications" Type="Build"/>
+		<Item Name="Build Specifications" Type="Build">
+			<Item Name="LV Edge Browser" Type="EXE">
+				<Property Name="App_copyErrors" Type="Bool">true</Property>
+				<Property Name="App_INI_aliasGUID" Type="Str">{CC69395A-E6A7-45CE-8FD4-5FFCC4F76C2E}</Property>
+				<Property Name="App_INI_GUID" Type="Str">{CE947938-A395-40F2-8F6B-1CBB0C8FB903}</Property>
+				<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
+				<Property Name="App_serverType" Type="Int">0</Property>
+				<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
+				<Property Name="Bld_buildCacheID" Type="Str">{2D87E2CB-5327-448C-A314-254D25320325}</Property>
+				<Property Name="Bld_buildSpecName" Type="Str">LV Edge Browser</Property>
+				<Property Name="Bld_excludeInlineSubVIs" 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">../builds/NI_AB_PROJECTNAME/LV Edge Browser</Property>
+				<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
+				<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
+				<Property Name="Bld_previewCacheID" Type="Str">{792C4A5E-FCFA-4267-863D-E6D846FFDCED}</Property>
+				<Property Name="Bld_version.build" Type="Int">4</Property>
+				<Property Name="Bld_version.major" Type="Int">1</Property>
+				<Property Name="Destination[0].destName" Type="Str">LV Edge Browser.exe</Property>
+				<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/LV Edge Browser/LV Edge Browser.exe</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">../builds/NI_AB_PROJECTNAME/LV Edge Browser/data</Property>
+				<Property Name="DestinationCount" Type="Int">2</Property>
+				<Property Name="Source[0].itemID" Type="Str">{80D3DD3F-CE2A-4F01-982E-C8785B094B13}</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/Examples/WebView2 Demo Browser.vi</Property>
+				<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
+				<Property Name="Source[1].type" Type="Str">VI</Property>
+				<Property Name="Source[2].destinationIndex" Type="Int">0</Property>
+				<Property Name="Source[2].itemID" Type="Ref">/My Computer/Libs/Microsoft.Web.WebView2.Core.dll</Property>
+				<Property Name="Source[2].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="Source[3].destinationIndex" Type="Int">0</Property>
+				<Property Name="Source[3].itemID" Type="Ref">/My Computer/Libs/Microsoft.Web.WebView2.WinForms.dll</Property>
+				<Property Name="Source[3].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="Source[4].destinationIndex" Type="Int">0</Property>
+				<Property Name="Source[4].itemID" Type="Ref">/My Computer/Libs/x64/WebView2Loader.dll</Property>
+				<Property Name="Source[4].sourceInclusion" Type="Str">Include</Property>
+				<Property Name="SourceCount" Type="Int">5</Property>
+				<Property Name="TgtF_companyName" Type="Str">KNIPEX-Werk C. Gustav Putsch KG</Property>
+				<Property Name="TgtF_fileDescription" Type="Str">LV Edge Browser</Property>
+				<Property Name="TgtF_internalName" Type="Str">LV Edge Browser</Property>
+				<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2023 KNIPEX-Werk C. Gustav Putsch KG</Property>
+				<Property Name="TgtF_productName" Type="Str">LV Edge Browser</Property>
+				<Property Name="TgtF_targetfileGUID" Type="Str">{9D02D03A-D2D8-4D57-8AAF-94A03F44472A}</Property>
+				<Property Name="TgtF_targetfileName" Type="Str">LV Edge Browser.exe</Property>
+				<Property Name="TgtF_versionIndependent" Type="Bool">true</Property>
+			</Item>
+		</Item>
 	</Item>
 </Project>
diff --git a/Webview2 Control/Control Read 2.vi b/Webview2 Control/Control Read 2.vi
diff --git a/Webview2 Control/Events Read 5.vi b/Webview2 Control/Events Read 5.vi
diff --git a/Webview2 Control/Facade.vi b/Webview2 Control/Facade.vi
diff --git a/Webview2 Control/Get Environment.vi b/Webview2 Control/Get Environment.vi
diff --git a/Webview2 Control/Go Back.vi b/Webview2 Control/Go Back.vi
diff --git a/Webview2 Control/Go Forward.vi b/Webview2 Control/Go Forward.vi
diff --git a/Webview2 Control/Init Core.vi b/Webview2 Control/Init Core.vi
diff --git a/Webview2 Control/Init WebView2 Core.vi b/Webview2 Control/Init WebView2 Core.vi
diff --git a/Webview2 Control/Init.vi b/Webview2 Control/Init.vi
diff --git a/Webview2 Control/Paths Read 2.vi b/Webview2 Control/Paths Read 2.vi
diff --git a/Webview2 Control/Register Events.vi b/Webview2 Control/Register Events.vi
diff --git a/Webview2 Control/Reload.vi b/Webview2 Control/Reload.vi
diff --git a/Webview2 Control/Run Javascript.vi b/Webview2 Control/Run Javascript.vi
diff --git a/Webview2 Control/Site Info Read 4.vi b/Webview2 Control/Site Info Read 4.vi
diff --git a/Webview2 Control/State.ctl b/Webview2 Control/State.ctl
diff --git a/Webview2 Control/URL Read 3.vi b/Webview2 Control/URL Read 3.vi
diff --git a/Webview2 Control/URL Write 3.vi b/Webview2 Control/URL Write 3.vi
diff --git a/Webview2 Control/Uninit.vi b/Webview2 Control/Uninit.vi
diff --git a/Webview2 Control/_Raise Document Title Changed.vi b/Webview2 Control/_Raise Document Title Changed.vi
diff --git a/Webview2 Control/_Raise Nav Complete Event.vi b/Webview2 Control/_Raise Nav Complete Event.vi
diff --git a/Webview2 Control/_Raise Navigation Starting Event.vi b/Webview2 Control/_Raise Navigation Starting Event.vi
diff --git a/Webview2 Control/_Raise Source Changed Event.vi b/Webview2 Control/_Raise Source Changed Event.vi
diff --git a/Webview2 Control/_Raise StatusBarTextChanged.vi b/Webview2 Control/_Raise StatusBarTextChanged.vi
diff --git a/Webview2 Control/_Raise WebMessageReceived.vi b/Webview2 Control/_Raise WebMessageReceived.vi
diff --git a/Webview2 Control/_Raise WindowCloseRequested.vi b/Webview2 Control/_Raise WindowCloseRequested.vi
diff --git a/microsoft.web.webview2.1.0.1370.28/.signature.p7s b/microsoft.web.webview2.1.0.1370.28/.signature.p7s
diff --git a/microsoft.web.webview2.1.0.1370.28/Microsoft.Web.WebView2.nuspec b/microsoft.web.webview2.1.0.1370.28/Microsoft.Web.WebView2.nuspec