Merge remote-tracking branch 'upstream/dev' into dev

scripts/embedded_python_env.py

@@ -0,0 +1,13 @@
+"""WizardKit: Embedded Python helper.
+
+This saves the keystrokes needed to fix the path and import wk. To use:
+python.exe -i embedded_python_env.py
+"""
+# vim: sts=2 sw=2 ts=2
+
+import os
+import sys
+
+os.chdir(os.path.dirname(os.path.realpath(__file__)))
+sys.path.append(os.getcwd())
+import wk # pylint: disable=wrong-import-position

scripts/wk/kit/build_win.py

@@ -277,7 +277,7 @@ def download_openshell():
   """Download OpenShell installer and Fluent-Metro skin."""
   for name in ('OpenShell.exe', 'Fluent-Metro.zip'):
     out_path = BIN_DIR.joinpath(f'OpenShell/{name}')
-    download_file(out_path, SOURCES[name])
+    download_file(out_path, SOURCES[name[:-4]])
 
 
 def download_prime95():

setup/build_pe.cmd

@@ -4,8 +4,12 @@
 
 :Init
 setlocal EnableDelayedExpansion
-title WizardKit: Windows PE Build Tool
+title WizardKit: Build Tool
 call :CheckFlags %*
+rem TODO: Remove warning
+echo "Windows PE build is currently under development"
+echo "  Proceeding will likely result in errors so be warned"
+pause
 call :CheckElevation || goto Exit
 call :FindKitsRoot || goto ErrorKitNotFound
 

setup/linux/build_additions.txt

@@ -1,5 +0,0 @@
-rsync -aI "${script_path}/${install_dir}/" "${work_dir}/iso/${install_dir}/"
-rm "${work_dir}/iso/EFI" -R
-rm "${work_dir}/iso/loader" -R
-rsync -aI "${script_path}/EFI/" "${work_dir}/iso/EFI/"
-

setup/windows/build.ps1

@@ -192,6 +192,13 @@ if ($MyInvocation.InvocationName -ne ".") {
 
   ## Done ##
   Pop-Location
-  $ArgumentList = @("-run", "$Bin\Python\x32\python.exe", "$Bin\Scripts\build_kit_windows.py", "-new_console:n")
-  Start-Process -FilePath "$Bin\ConEmu\ConEmu.exe" -ArgumentList $ArgumentList -verb RunAs
+  if ([System.Environment]::Is64BitOperatingSystem) {
+    $ConEmu = "$Bin\ConEmu\ConEmu64.exe"
+    $Python = "$Bin\Python\x64\python.exe"
+  } else {
+    $ConEmu = "$Bin\ConEmu\ConEmu.exe"
+    $Python = "$Bin\Python\x32\python.exe"
+  }
+  $ArgumentList = @("-run", "$Python", "$Bin\Scripts\build_kit_windows.py", "-new_console:n")
+  Start-Process -FilePath "$ConEmu" -ArgumentList $ArgumentList -verb RunAs
 }