Build - windows: add

Author: howetuft

build-system/luxmake/__main__.py

@@ -17,6 +17,7 @@
 from .build import build_and_install, install
 from .wheel import make_wheel
 from .clear import clean, clear
+from .windows import win_recompose
 
 
 def main():
@@ -64,6 +65,11 @@ def main():
     parser_wheel = subparsers.add_parser("wheel-test")
     parser_wheel.set_defaults(func=make_wheel)
 
+    # Win wheel recomposing
+    parser_wheel = subparsers.add_parser("win-recompose")
+    parser_build_and_install.add_argument("wheel")
+    parser_wheel.set_defaults(func=win_recompose)
+
     # Clear
     parser_clear = subparsers.add_parser("clear")
     parser_clear.set_defaults(func=clear)

build-system/luxmake/wheel.py

@@ -150,4 +150,5 @@ def make_wheel(args):
 
         # And, for Windows, recompose
         if platform.system() == "Windows":
-            recompose(WHEELHOUSE_DIR / wheelname)
+            args.wheel = WHEELHOUSE_DIR / wheelname
+            win_recompose(args)

build-system/luxmake/windows.py

@@ -19,8 +19,9 @@
 from .utils import pack, unpack, logger
 
 
-def recompose(wheel_path):
+def win_recompose(args):
     """Recompose Windows wheel (see module docstring)."""
+    wheel_path = Path(args.wheel)
     wheel_folder = wheel_path.parents[0]
 
     logger.info("Recomposing '%s'", wheel_path)

make.bat

@@ -15,7 +15,7 @@ if "%LUX_PYTHON%" == "" (
     set LUX_PYTHON=python
 )
 
-set LUX_CMAKE="%LUX_PYTHON%" -u -m build-system.luxmake
+set LUXMAKE="%LUX_PYTHON%" -u -m build-system.luxmake
 
 if "%COMMAND%" == "" (
     call :Config
@@ -53,6 +53,8 @@ if "%COMMAND%" == "" (
     call :Clear
 ) else if "%COMMAND%" == "deps" (
     call :Deps
+) else if "%COMMAND%" == "win-recompose" (
+    call :WinRecompose %2
 ) else if "%COMMAND%" == "list-presets" (
     call :ListPresets
 ) else (
@@ -61,36 +63,41 @@ if "%COMMAND%" == "" (
 exit /B
 
 :Deps
-call %LUX_CMAKE% deps
+call %LUXMAKE% deps
 goto :EOF
 
 :ListPresets
-call %LUX_CMAKE% list-presets
+call %LUXMAKE% list-presets
 goto :EOF
 
 :Config
-call %LUX_CMAKE% config
+call %LUXMAKE% config
 goto :EOF
 
 :BuildAndInstall
-call %LUX_CMAKE% build-and-install %1
+call %LUXMAKE% build-and-install %1
 goto :EOF
 
 :Install
 IF "%~1" == "" (
-    %LUX_CMAKE% all
+    %LUXMAKE% all
 ) else (
-    %LUX_CMAKE% %1
+    %LUXMAKE% %1
 )
 goto :EOF
 
+:WinRecompose
+REM Exists only in windows make
+call %LUXMAKE% win-recompose %1
+goto :EOF
+
 :Clean
-call %LUX_CMAKE% clean
+call %LUXMAKE% clean
 goto :EOF
 
 :Clear
 REM rmdir /S /Q
-call %LUX_CMAKE% clear
+call %LUXMAKE% clear
 goto :EOF
 
 :EOF