GH-19: Replaced _acquire_pluginapi.bat with _get_nsis_sdk.py

negrutiu · Jun 1, 2024 · 6216faa · 6216faa
1 parent 1e89c4c
commit 6216faa
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 30 deletions.
diff --git a/src/nscurl/Makefile.windows b/src/nscurl/Makefile.windows
@@ -120,7 +120,7 @@ RCFLAGS += \
 	$(CUSTOM_RCFLAGS)
 
 
-.PHONY: clean all-before all all-after nsis-sdk curl-ca-bundle vcpkg-install
+.PHONY: clean all-before all all-after nsis-sdk curl-ca-bundle update-file-version vcpkg-install
 
 clean:
 	@echo.
@@ -133,7 +133,7 @@ all-before:
 
 nsis-sdk:
 	REM ----- NSIS SDK ------------------------------------------------------------
-	call _acquire_pluginapi.bat
+	call py -3 _get_nsis_sdk.py
 
 curl-ca-bundle:
 	REM ----- curl-ca-bundle.crt --------------------------------------------------

diff --git a/src/nscurl/NScurl.vcxproj b/src/nscurl/NScurl.vcxproj
@@ -88,7 +88,7 @@
       <AdditionalDependencies>version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
+      <Command>call py -3 _get_nsis_sdk.py &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -105,7 +105,7 @@
       <AdditionalDependencies>version.lib;libcurl-d.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlibd.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
+      <Command>call py -3 _get_nsis_sdk.py &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -125,7 +125,7 @@
       <AdditionalDependencies>version.lib;libcurl.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlib.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
+      <Command>call py -3 _get_nsis_sdk.py &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -144,7 +144,7 @@
       <AdditionalDependencies>version.lib;libcurl.lib;libcrypto.lib;libssl.lib;nghttp2.lib;zlib.lib;zstd.lib;brotlicommon.lib;brotlidec.lib;ws2_32.lib;Wldap32.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PreBuildEvent>
-      <Command>call _acquire_pluginapi.bat &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
+      <Command>call py -3 _get_nsis_sdk.py &amp;&amp; call _acquire_curl-ca-bundle.bat &amp;&amp; call py -3 _update_resource_version.py &amp;&amp; call "$(SolutionDir)_install_vcpkg.bat" $(Platform) msbuild static
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>

diff --git a/src/nscurl/_acquire_pluginapi.bat b/src/nscurl/_acquire_pluginapi.bat
diff --git a/src/nscurl/_get_nsis_sdk.py b/src/nscurl/_get_nsis_sdk.py
@@ -0,0 +1,28 @@
+# Download NSIS SDK files from GitHub
+
+from pathlib import Path
+from urllib import request
+
+cd = Path(__file__).parent
+files = {
+    cd.joinpath('nsis', 'api.h')        : "https://raw.githubusercontent.com/kichik/nsis/master/Source/exehead/api.h",
+    cd.joinpath('nsis', 'nsis_tchar.h') : "https://raw.githubusercontent.com/kichik/nsis/master/Contrib/ExDLL/nsis_tchar.h",
+    cd.joinpath('nsis', 'pluginapi.c')  : "https://raw.githubusercontent.com/kichik/nsis/master/Contrib/ExDLL/pluginapi.c",
+    cd.joinpath('nsis', 'pluginapi.h')  : "https://raw.githubusercontent.com/kichik/nsis/master/Contrib/ExDLL/pluginapi.h",
+}
+
+download = False
+for file in files:
+    if not file.exists(): download = True
+
+if download:
+    print("Downloading NSIS SDK ...")
+    for file, url in files.items():
+        print(file.name)
+        with request.urlopen(url) as http:
+            file.parent.mkdir(parents=True, exist_ok=True)
+            with open(file, 'wb') as outfile:
+                outfile.write(http.read())
+            print(f"  {http.status} {http.reason}, {http.getheader('Content-Length')} bytes")
+else:
+    print("Use existing NSIS SDK ...")