Codemanager installer codemg-setup.msi using WiX Toolset v5. ✨🎉

- Generating custom `codemg-setup.msi` installer using `wix toolset`.
- Python scripts Error printing into `stderr` stream.
- In-activated Tauri bundle creation: `msi, nish`.

Author: rahulml25

.github/workflows/build_and_release.yml

@@ -4,8 +4,10 @@ on:
   push:
     branches:
       - "main"
+      - "development"
     tags:
-      - "e*"
+      - "v*"
+      - "beta-*"
 
 permissions: write-all
 
@@ -72,6 +74,11 @@ jobs:
         with:
           bun-version: "1.1.13"
 
+      - name: Set up MSBuild
+        uses: microsoft/setup-msbuild@v2
+        with:
+          msbuild-architecture: "x64"
+
       - name: Install OpenSSL using vcpkg
         if: steps.cache-libraries.outputs.cache-hit != 'true'
         shell: pwsh
@@ -88,29 +95,18 @@ jobs:
 
       - name: Install dependencies
         run: |
+          dotnet tool install --global wix
           bun pys fullinstall
 
-      - name: Build Tauri catch-dependencies
-        if: startsWith(github.ref, 'refs/heads/')
-        env:
-          VCPKG_ROOT: ${{ github.workspace }}\vcpkg
-          OPENSSL_DIR: ${{ github.workspace }}\vcpkg\installed\x64-windows
-          VCPKGRS_DYNAMIC: 1
-
-          JWT_SECRET: ${{ secrets.JWT_SECRET }}
-          SQLITE_DB_KEY: ${{ secrets.SQLITE_DB_KEY }}
-        run: |
-          bun tauri build
-
       - name: Build Components
-        if: startsWith(github.ref, 'refs/tags/')
         env:
           VCPKG_ROOT: ${{ github.workspace }}\vcpkg
           OPENSSL_DIR: ${{ github.workspace }}\vcpkg\installed\x64-windows
           VCPKGRS_DYNAMIC: 1
 
           JWT_SECRET: ${{ secrets.JWT_SECRET }}
           SQLITE_DB_KEY: ${{ secrets.SQLITE_DB_KEY }}
+          UPGRADE_CODE: ${{ vars.UPGRADE_CODE }}
         run: |
           ./.venv/Scripts/activate
           bun pys build
@@ -122,4 +118,4 @@ jobs:
           name: Release ${{ needs.get_tag.outputs.tag_name }}
           tag_name: ${{ needs.get_tag.outputs.tag_name }}
           body_path: CHANGELOG.md
-          files: dist/codemg-setup.exe
+          files: dist/codemg-setup.msi

CHANGELOG.md

@@ -1,8 +1,5 @@
-Rebuilt the codemanager using Tauri ✨🎉
+Codemanager installer `codemg-setup.msi` using `WiX Toolset v5`. ✨🎉
 
-- Using Rust backend at the app background.
-- Completed The app development to an end usable by the end user.
-- Automated GitHub Actions to build final `codemg-setup` installer.
-- Cached previous GitHub Actions dependencies to reduce Build time.
-- Compressed all installation dependencies into `codemg-setup` installer, reducing all the Release assets and size.
-- Rewrote project automation scripts in `python`.
+- Generating custom `codemg-setup.msi` installer using `wix toolset`.
+- Python scripts Error printing into `stderr` stream.
+- In-activated Tauri bundle creation: `msi, nish`.

scripts/lib/config/codebase.py

@@ -1,6 +1,5 @@
 import json
 from . import Path
-from .consumer import codemanagerApp_setup_name, codemgCLI_name, codemgCLI_exe_name
 
 
 CODEBASE_DIR = Path.cwd()
@@ -17,37 +16,42 @@
 pip_path = PYTHON_VENV_SCRIPTS_DIR / "pip.exe"
 pyinstaller_path = PYTHON_VENV_SCRIPTS_DIR / "pyinstaller.exe"
 
-secrets_path = BUILD_DIR / ".env"
+secrets_build_path = BUILD_DIR / ".env"
 
 # Tauri Config
 tauri_conf_path = TAURI_DIR / "tauri.conf.json"
-tauri_msi_dir = TAURI_DIR / "target/release/bundle/msi"
+tauri_release_dir = TAURI_DIR / "target/release"
 
 
 # Tauri Package Config
 with open(tauri_conf_path) as f:
-    tauri_conf_package = json.load(f)["package"]
+    tauri_conf_data = json.load(f)
+    tauri_conf_package = tauri_conf_data["package"]
+    tauri_conf_bundle = tauri_conf_data["tauri"]["bundle"]
 
+app_manufacturer = "cloutcoders"
 app_name = tauri_conf_package["productName"]
 app_version = tauri_conf_package["version"]
+app_identifier = tauri_conf_bundle["identifier"]
 
 
 #############################     #-#-# CodeManager Build Config #-#-#     #############################
 
 # CodeManager-App config
-codemanagerApp_setup_init_path = (
-    tauri_msi_dir / f"{app_name}_{app_version}_x64_en-US.msi"
-)
-codemanagerApp_setup_path = DIST_DIR / codemanagerApp_setup_name
+codemanagerApp_exe_name = "codemanager.exe"
+codemanagerApp_exe_path = tauri_release_dir / codemanagerApp_exe_name
 
 # codemg-CLI config
+codemgCLI_name = "codemg"
+codemgCLI_exe_name = f"{codemgCLI_name}.exe"
 codemgCLI_source = SCRIPTS_DIR / "codemg_cli.py"
 codemgCLI_exe_path = DIST_DIR / codemgCLI_exe_name
 
 # Config: CodeManager-Setup
 codemanagerSetup_name = "codemg-setup"
-codemanagerSetup_exe_name = f"{codemanagerSetup_name}.exe"
-codemanagerSetup_source = SCRIPTS_DIR / "setup.py"
-codemanagerSetup_exe_path = DIST_DIR / codemanagerSetup_exe_name
+codemanagerSetup_msi_name = f"{codemanagerSetup_name}.msi"
+codemanagerSetup_source = CODEBASE_DIR / "wix/codemg-setup.wsx"
+codemanagerSetup_msi_path = DIST_DIR / codemanagerSetup_msi_name
+codemanagerSCC_sidecar_path = tauri_release_dir / "scc.exe"
 
 #############################     #-#-# CodeManager Build Config #-#-#     #############################

scripts/lib/config/consumer.py

@@ -22,18 +22,3 @@
 autoStartup_registryKey_path = r"Software\Microsoft\Windows\CurrentVersion\Run"
 
 ############################     #-#-# Windows Config - [End] #-#-#     ############################
-
-
-#############################     #-#-# CodeManager Installation Config #-#-#     #############################
-
-# CodeManager App config
-codemanagerApp_setup_name = "codemanager.msi"
-codemanagerApp_setup_path = MEIPASS_PATH / codemanagerApp_setup_name
-
-# codemg CLI config
-codemgCLI_name = "codemg"
-codemgCLI_exe_name = f"{codemgCLI_name}.exe"
-codemgCLI_exe_init_path = MEIPASS_PATH / codemgCLI_exe_name
-codemgCLI_exe_path = EXECUTABLES_DIR / codemgCLI_exe_name
-
-#############################     #-#-# Codemanager Installation Config - [END] #-#-#     #############################

scripts/lib/utils.py

@@ -1,11 +1,16 @@
 import zipfile
-import os, shutil, pathlib
+import os, sys, shutil, pathlib
 from .config import consumer as config
 from typing import TypeAlias, Literal
 
 StrOrBytesPath: TypeAlias = str | bytes | os.PathLike[str] | os.PathLike[bytes]
 
 
+# Console printing
+def eprint(*args, **kwargs):
+    return print(*args, file=sys.stderr, **kwargs)
+
+
 # Process Handeling
 def find_process_by_name(process_name: str):
     import psutil

scripts/project_scripts.py

@@ -1,7 +1,20 @@
-import os, sys, shutil
+from typing import Literal
+import os, sys, pathlib
 import lib.config.codebase as config
 from lib.config.consumer import signing_key_name
-from lib.utils import run_command
+from lib.utils import run_command, eprint
+
+
+def build_component(
+    name: str,
+    command: list[str | pathlib.Path],
+    output: Literal["shell", "none"] = "none",
+):
+    print(f"Generating {name}...", end="", flush=True)
+    if run_command(command, output):
+        eprint("\nBuild Abroaded.")
+        exit(1)
+    print("done.")
 
 
 def build_codemg_setup():
@@ -12,11 +25,12 @@ def build_codemg_setup():
         os.makedirs(config.BUILD_DIR)
 
     # Writing seperate Secrets file for production
-    with open(config.secrets_path, "w") as file:
+    with open(config.secrets_build_path, "w") as file:
         file.write(f'{signing_key_name}="{os.environ.get(signing_key_name)}"')
 
     # Making: codemg-CLI
-    run_command(
+    build_component(
+        "codemg cli",
         [
             config.pyinstaller_path,
             config.codemgCLI_source,
@@ -28,36 +42,45 @@ def build_codemg_setup():
             #
             # Secrets
             "--add-data",
-            f"{config.secrets_path}:./",
+            f"{config.secrets_build_path}:./",
         ],
-        output="none",
     )
 
-    # Making: CodeManager-App
-    run_command(["bun", "tauri", "build"])
-    shutil.copy2(
-        config.codemanagerApp_setup_init_path,
-        config.codemanagerApp_setup_path,
-    )
+    # Making: CodeManager
+    build_component("CodeManager", ["bun", "tauri", "build"], "shell")
 
-    # Making: CodeManager-Setup
-    run_command(
+    # Making: codemg-Setup
+    upgradeCode = os.environ.get("UPGRADE_CODE")
+    build_component(
+        "codemg-setup executable",
         [
-            config.pyinstaller_path,
+            "wix",
+            "build",
             config.codemanagerSetup_source,
-            "-n",
-            config.codemanagerSetup_name,
-            "--onefile",
-            "--specpath",
-            config.BUILD_DIR,
+            "-o",
+            config.codemanagerSetup_msi_path,
             #
-            # CLI
-            "--add-binary",
-            f"{config.codemgCLI_exe_path}:./",
+            # App Info
+            "-d",
+            f"appName={config.app_name}",
+            "-d",
+            f"appVersion={config.app_version}",
+            "-d",
+            f"appManufacturer={config.app_manufacturer}",
+            "-d",
+            f"appIdentifier={config.app_identifier}",
+            "-d",
+            f"upgradeCode={upgradeCode}",
             #
-            # App
-            "--add-binary",
-            f"{config.codemanagerApp_setup_path}:./",
+            # Components Info
+            "-d",
+            f"iconPath={config.codemanagerApp_exe_path}",
+            "-d",
+            f"codemgCLIPath={config.codemgCLI_exe_path}",
+            "-d",
+            f"codemamagerPath={config.codemanagerApp_exe_path}",
+            "-d",
+            f"sccSidecarPath={config.codemanagerSCC_sidecar_path}",
         ],
     )
 

scripts/setup.py

@@ -16,6 +16,7 @@ fn write_secrets(env_vars: Vec<&str>, file_path: &str) {
 
 fn main() {
     dotenv().ok();
+    
     let env_variables: Vec<&str> = vec!["JWT_SECRET", "SQLITE_DB_KEY"];
     write_secrets(env_variables, "src/secrets.rs");
 

src-tauri/build.rs

@@ -46,7 +46,7 @@
       "csp": null
     },
     "bundle": {
-      "active": true,
+      "active": false,
       "targets": "all",
       "identifier": "com.cloutcoders.codemg",
       "icon": [