Merge branch 'master' into encounter-journal

run.ps1

@@ -42,6 +42,7 @@ $SRC_DIR      = Join-Path $ROOT "src"
 $DIST_DIR     = Join-Path $ROOT "dist"
 $TOOL         = Join-Path $ROOT "tool\target\release\tool.exe"
 $RELOAD_SCRIPT = Join-Path $ROOT "reload_wow.bat"
+$WXL_BUILD_SCRIPT = Join-Path $ROOT "build-warcraftxl.ps1"
 
 # --- Ensure tool exists
 if (!(Test-Path $TOOL)) {
@@ -65,6 +66,16 @@ if (!(Test-Path (Join-Path $DIST_DIR "Data"))) {
     exit 1
 }
 
+# --- Build/package/deploy WarcraftXL before the dist sync. The packaged files
+#     are uploaded by upload_to_s3.py and consumed by the launcher manifest.
+Write-Host "Building and packaging WarcraftXL..."
+& $WXL_BUILD_SCRIPT -Configuration Release -ClientPath $WOW_HOME `
+    -PackagePath $DIST_DIR -Deploy
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "WarcraftXL build/deploy failed!"
+    exit 1
+}
+
 # --- Sync dist/ -> WOW_HOME
 Write-Host "Syncing dist/ -> WOW_HOME..."
 robocopy $DIST_DIR $WOW_HOME /E /NFL /NDL