Improving NScurl integration

Contrib/NScurl/SConscript

@@ -5,7 +5,7 @@ from urllib import request
 
 target = 'NScurl'
 
-Import('BuildPlugin env')
+Import('env')
 
 scriptpath = Path((lambda x:x).__code__.co_filename)
 scriptdir = scriptpath.parent
@@ -18,13 +18,12 @@ scriptdir = scriptpath.parent
 
 unicode = 'UNICODE' in env['CPPDEFINES']
 archdir = env['TARGET_ARCH'] + ('-unicode' if unicode else '-ansi')    # x86-unicode|x86-amsi|amd64-unicode
-root = scriptdir
 
 # Download
 pluginUrl = 'https://github.com/negrutiu/nsis-nscurl/releases/latest/download/NScurl.zip'
-pluginZip = root.joinpath('Contrib', 'NScurl', 'latest', 'NScurl.zip')
-pluginEtag = root.joinpath('Contrib', 'NScurl', 'latest', 'NScurl.etag')
-pluginDir = root.joinpath('Contrib', 'NScurl', 'latest', 'package')
+pluginZip = scriptdir.joinpath('github', 'NScurl.zip')
+pluginEtag = scriptdir.joinpath('github', 'NScurl.etag')
+pluginDir = scriptdir.joinpath('github', 'package')
 
 print(f"Download {pluginUrl} to {pluginZip} ({archdir}) ...")
 headers = {}
@@ -59,27 +58,22 @@ with ZipFile(pluginZip) as myzip:
     shutil.rmtree(pluginDir, ignore_errors=True)
     myzip.extractall(pluginDir)
 
-# BuildPlugin
-files = [
-    'main.c'    # build a dummy NScurl.dll
-]
-
-libs = [
-	'kernel32'
-]
+# Distribute
+Import('defenv')
 
 examples = [
-    pluginDir.joinpath("Examples/NScurl/NScurl-Test.nsi"),
-    pluginDir.joinpath("Examples/NScurl/NScurl-Test-build.bat")
+    pluginDir.joinpath('Examples', 'NScurl', 'NScurl-Test.nsi'),
+    pluginDir.joinpath('Examples', 'NScurl', 'NScurl-Test-build.bat')
 ]
 
 docs = [
-    pluginDir.joinpath("Docs/NScurl/NScurl.readme.md")
+    pluginDir.joinpath('Docs', 'NScurl', 'NScurl.readme.md')
 ]
 
-BuildPlugin(target, files, libs, examples, docs)
+plugins = [
+    pluginDir.joinpath('Plugins', archdir, 'NScurl.dll')
+]
 
-# Overwrite the dummy dll with the real one downloaded from GitHub
-outdir = root.joinpath(env['BUILD_PREFIX'], 'NScurl', archdir)       # <root>/nsis-mingw-negrutiu-x86/build/urelease/NScurl/x86-unicode, ('BUILD_PREFIX': 'build/urelease')
-outdir.mkdir(parents=True, exist_ok=True)
-shutil.copytree(pluginDir.joinpath('Plugins', archdir), outdir, dirs_exist_ok=True)
+defenv.DistributeExamples(examples, path=target)
+defenv.DistributeDocs(docs, path=target)
+defenv.DistributePlugin(plugins, arcsubpath=archdir)