Download Wasmer library for module

Use .a library suffix for Windows MinGW build

SConstruct

@@ -1,9 +1,6 @@
 #!python
 import os
-import shutil
-import re
-from urllib import request
-import tarfile
+from utils import download_wasmer, VERSION_DEFAULT
 
 # Initial options inheriting from CLI args
 opts = Variables([], ARGUMENTS)
@@ -13,48 +10,21 @@ opts.Add(EnumVariable('target', 'Compilation target', 'release', ['debug', 'rele
 opts.Add(EnumVariable('platform', 'Compilation platform', '', ['', 'windows', 'linux', 'osx'], {'x11': 'linux', 'macos': 'osx'}))
 opts.Add(BoolVariable('use_llvm', 'Use LLVM/Clang compiler', 'no'))
 opts.Add(BoolVariable('download_wasmer', 'Download Wasmer library', 'no'))
-opts.Add('wasmer_version', 'Wasmer library version', 'v3.1.1')
+opts.Add('wasmer_version', 'Wasmer library version', VERSION_DEFAULT)
 
 # Standard flags CC, CCX, etc. with options
 env = DefaultEnvironment(variables=opts)
 
-# Wasmer download
-def download_wasmer(env):
-    def download_tarfile(url, dest, rename={}):
-        filename = 'tmp.tar.gz'
-        os.makedirs(dest, exist_ok=True)
-        request.urlretrieve(url, filename)
-        file = tarfile.open(filename)
-        file.extractall(dest)
-        file.close()
-        for k, v in rename.items(): os.rename(k, v)
-        os.remove(filename)
-    base_url = 'https://github.com/wasmerio/wasmer/releases/download/{}/wasmer-{}.tar.gz'
-    if env['platform'] in ['osx', 'macos']:
-        # For macOS, we need to universalize the AMD and ARM libraries
-        download_tarfile(base_url.format(env['wasmer_version'], 'darwin-amd64'), 'wasmer', {'wasmer/lib/libwasmer.a': 'wasmer/lib/libwasmer.amd64.a'})
-        download_tarfile(base_url.format(env['wasmer_version'], 'darwin-arm64'), 'wasmer', {'wasmer/lib/libwasmer.a': 'wasmer/lib/libwasmer.arm64.a'})
-        os.system('lipo wasmer/lib/libwasmer.*64.a -output wasmer/lib/libwasmer.a -create')
-    elif env['platform'] == 'linux':
-        download_tarfile(base_url.format(env['wasmer_version'], 'linux-amd64'), 'wasmer')
-    elif env['platform'] == 'windows':
-        download_tarfile(base_url.format(env['wasmer_version'], 'windows-amd64'), 'wasmer')
-
 # Process some arguments
 if env['platform'] == '':
     exit('Invalid platform selected')
 
-if not re.fullmatch(r'v\d+\.\d+\.\d+(-.+)?', env['wasmer_version']):
-    exit('Invalid Wasmer version')
-
 if env['use_llvm']:
     env['CC'] = 'clang'
     env['CXX'] = 'clang++'
 
-if env['download_wasmer'] or not os.path.isdir('wasmer'):
-    print('Downloading Wasmer {}'.format(env['wasmer_version']))
-    shutil.rmtree('wasmer', True)
-    download_wasmer(env)
+# Download Wasmer if required
+download_wasmer(env, env['download_wasmer'], env['wasmer_version'])
 
 # Check platform specifics
 if env['platform'] in ['osx', 'macos']:
@@ -69,15 +39,15 @@ elif env['platform'] == 'linux':
 elif env['platform'] == 'windows':
     env['LIBPREFIX'] = ''
     env['LIBSUFFIX'] = '.lib'
-    env['LIBWASMERSUFFIX'] = '.dll.lib' # Requires special suffix
+    env['LIBWASMERSUFFIX'] = '.a' if env.get('use_mingw') else '.dll.lib'
     env.Append(ENV=os.environ) # Keep session env variables to support VS 2017 prompt
     env.Append(CPPDEFINES=['WIN32', '_WIN32', '_WINDOWS', '_CRT_SECURE_NO_WARNINGS', 'NDEBUG'])
     env.Append(CCFLAGS=['-W3', '-GR', '-O2', '-EHsc', '-MD'])
     env.Append(CCFLAGS='/std:c++20')
     env.Append(LIBS=['bcrypt', 'userenv', 'ws2_32', 'advapi32'])
 
 # Defines for GDNative specific API
-env.Append(CPPDEFINES=["GDNATIVE"])
+env.Append(CPPDEFINES=['GDNATIVE'])
 
 # Explicit static libraries
 cpp_library = env.File('godot-cpp/bin/libgodot-cpp.{}.{}.64{}'.format(env['platform'], env['target'], env['LIBSUFFIX']))

SCsub

@@ -1,7 +1,12 @@
+from utils import download_wasmer
+
 # Import env and create module-specific clone
 Import('env')
 module_env = env.Clone()
 
+# Download Wasmer if required
+download_wasmer(env)
+
 # Check platform specifics
 if env['platform'] in ['linux', 'linuxbsd']:
     module_env['LIBWASMERSUFFIX'] = '.a'
@@ -11,7 +16,7 @@ elif env['platform'] in ['osx', 'macos']:
     module_env.Append(CXXFLAGS=['-std=c++17'])
     env.Append(LINKFLAGS=['-framework', 'Security'])
 elif env['platform'] == 'windows':
-    module_env['LIBWASMERSUFFIX'] = '.dll.lib'
+    module_env['LIBWASMERSUFFIX'] = '.a' if env.get('use_mingw') else '.dll.lib'
 
 # Explicit static libraries
 wasmer_library = env.File('wasmer/lib/{}wasmer{}'.format(env['LIBPREFIX'], module_env.get('LIBWASMERSUFFIX', module_env['LIBSUFFIX'])))

utils.py

@@ -0,0 +1,37 @@
+import os
+import re
+import shutil
+from urllib import request
+import tarfile
+
+BASE_URL = 'https://github.com/wasmerio/wasmer/releases/download/{}/wasmer-{}.tar.gz'
+VERSION_DEFAULT = 'v3.1.1'
+
+def validate_version(v):
+    if not re.fullmatch(r'v\d+\.\d+\.\d+(-.+)?', v):
+        raise(ValueError('Invalid Wasmer version'))
+
+def download_tarfile(url, dest, rename={}):
+    filename = 'tmp.tar.gz'
+    os.makedirs(dest, exist_ok=True)
+    request.urlretrieve(url, filename)
+    file = tarfile.open(filename)
+    file.extractall(dest)
+    file.close()
+    for k, v in rename.items(): os.rename(k, v)
+    os.remove(filename)
+
+def download_wasmer(env, force=False, version=VERSION_DEFAULT):
+    validate_version(version)
+    if not force and os.path.isdir('wasmer'): return # Skip download
+    print('Downloading Wasmer library {}'.format(version))
+    shutil.rmtree('wasmer', True) # Remove old library
+    if env['platform'] in ['osx', 'macos']:
+        # For macOS, we need to universalize the AMD and ARM libraries
+        download_tarfile(BASE_URL.format(version, 'darwin-amd64'), 'wasmer', {'wasmer/lib/libwasmer.a': 'wasmer/lib/libwasmer.amd64.a'})
+        download_tarfile(BASE_URL.format(version, 'darwin-arm64'), 'wasmer', {'wasmer/lib/libwasmer.a': 'wasmer/lib/libwasmer.arm64.a'})
+        os.system('lipo wasmer/lib/libwasmer.*64.a -output wasmer/lib/libwasmer.a -create')
+    elif env['platform'] in ['linux', 'linuxbsd']:
+        download_tarfile(BASE_URL.format(version, 'linux-amd64'), 'wasmer')
+    elif env['platform'] == 'windows':
+        download_tarfile(BASE_URL.format(version, 'windows-amd64'), 'wasmer')