Miscellaneous/NonMarketHousingSimulation - Simplify build-bevy workflow

Author: The-Nice-One

.github/workflows/build-bevy.yml

@@ -29,8 +29,6 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get update && sudo apt-get install -y g++ pkg-config libx11-dev libasound2-dev libudev-dev libxkbcommon-x11-0 libwayland-dev
 
-      # Use --profile dist so the binary lands in target/dist/ — which is where
-      # Package.wxs (WiX MSI) and the macOS DMG script expect to find it.
       - name: Build Project
         working-directory: ${{ matrix.project.path }}
         shell: bash
@@ -58,54 +56,18 @@ jobs:
           [ -d "credits" ] && cp -r credits dist/credits || true
           cd dist && tar -czf ../${{ matrix.project.name }}_ubuntu-latest.tar.gz *
 
-      # Produces a proper .app bundle + DMG.
-      #
-      # The project is expected to ship a pre-configured app bundle skeleton at
-      # build/macos/src/Game.app/ containing at minimum:
-      #   Contents/Info.plist   – display name, bundle ID, version, icon ref
-      #   Contents/Resources/   – .icns icon file
-      #   Contents/PkgInfo      – "APPL????"
-      #
-      # (This structure is created by bevy_game_template and is already present
-      # in the repository.)  The binary and assets are then copied in and the
-      # bundle is renamed before packaging.
-      #
-      # If the skeleton is absent the step falls back to a minimal bundle with
-      # no Info.plist (runs fine, but macOS Gatekeeper will warn on open).
       - name: Prepare Artifacts (macOS DMG)
         if: matrix.os == 'macos-latest'
         shell: bash
         working-directory: ${{ matrix.project.path }}
         run: |
-          APP_BIN="${{ matrix.project.app_name }}"
-          PROJ_NAME="${{ matrix.project.name }}"
-
-          # ── Locate or create the .app bundle skeleton ──────────────────────
-          TEMPLATE_APP=$(find build/macos/src -maxdepth 1 -name "*.app" -type d 2>/dev/null | head -1)
-
-          if [ -n "$TEMPLATE_APP" ]; then
-            # Use the repo-supplied skeleton (has Info.plist, icon, PkgInfo).
-            BUNDLE="build/macos/src/$PROJ_NAME.app"
-            mv "$TEMPLATE_APP" "$BUNDLE"
-          else
-            # Fallback: bare-bones bundle without Info.plist.
-            echo "Warning: no .app skeleton found in build/macos/src/; creating a minimal bundle."
-            BUNDLE="build/macos/src/$PROJ_NAME.app"
-            mkdir -p "$BUNDLE/Contents"
-          fi
-
-          # ── Copy binary and data into the bundle ───────────────────────────
-          mkdir -p "$BUNDLE/Contents/MacOS"
-          cp target/dist/$APP_BIN "$BUNDLE/Contents/MacOS/$APP_BIN"
-          [ -d "assets" ]  && cp -r assets/  "$BUNDLE/Contents/MacOS/assets"  || true
-          [ -d "credits" ] && cp -r credits/ "$BUNDLE/Contents/MacOS/credits" || true
-
-          # ── Package as DMG ─────────────────────────────────────────────────
-          ln -sf /Applications build/macos/src/
-          hdiutil create -fs HFS+ \
-            -volname "$PROJ_NAME" \
-            -srcfolder build/macos/src \
-            "$PROJ_NAME.dmg"
+          APP_NAME="${{ matrix.project.app_name }}"
+          mkdir -p build/macos/src/$APP_NAME.app/Contents/MacOS/assets
+          [ -d "assets" ] && cp -r assets/ build/macos/src/$APP_NAME.app/Contents/MacOS/assets || true
+          [ -d "credits" ] && cp -r credits/ build/macos/src/$APP_NAME.app/Contents/MacOS/credits || true
+          cp target/dist/$APP_NAME build/macos/src/$APP_NAME.app/Contents/MacOS/
+          ln -s /Applications build/macos/src/
+          hdiutil create -fs HFS+ -volname "${{ matrix.project.name }}" -srcfolder build/macos/src ${{ matrix.project.name }}.dmg
 
       - name: Prepare Artifacts (Windows)
         if: matrix.os == 'windows-latest'
@@ -172,10 +134,6 @@ jobs:
           yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platforms;android-35"
           cargo install --force cargo-apk
 
-      # Run from the workspace root (not from inside mobile/) so that Cargo
-      # resolves the [workspace] section correctly and --package selects the
-      # right crate.  This is what prevents the android-game-activity vs.
-      # android-native-activity feature-unification conflict.
       - name: Build Android
         if: matrix.target == 'android'
         working-directory: ${{ matrix.project.path }}
@@ -187,12 +145,6 @@ jobs:
         if: matrix.target == 'ios'
         run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
 
-      # Xcode calls build_rust_deps.sh which runs `cargo rustc --crate-type
-      # staticlib --lib [--profile dist] --target aarch64-apple-ios`.
-      # The root lib must NOT have `crate-type = ["cdylib", ...]` — doing so
-      # causes Cargo to also produce a .dylib for iOS which the linker rejects
-      # (it finds macOS SDK frameworks instead of iOS SDK ones).
-      # That crate-type was removed from the root Cargo.toml.
       - name: Build iOS
         if: matrix.target == 'ios'
         working-directory: ${{ matrix.project.path }}

Miscellaneous/NonMarketHousingSimulation/Cargo.toml

@@ -3,24 +3,9 @@ name = "non_market_housing_simulation"
 version = "0.1.0"
 edition = "2024"
 
-# The mobile crate is a separate entry point for Android and iOS.
-# It must be a workspace member so that Cargo resolves feature flags
-# across both crates together — without this, `cargo apk build --package mobile`
-# cannot find the root crate's workspace.
 [workspace]
 members = ["mobile"]
 
-# cdylib is intentionally absent.
-#
-# Previously "cdylib" was listed here to support compiling the lib directly as
-# a WASM module (via #[bevy_main]) and as a candidate dylib for Android.  Both
-# of those roles are now gone:
-#   • WASM  → trunk compiles `main.rs` as the binary entry point; no cdylib needed.
-#   • Mobile → the `mobile` crate is the cdylib/staticlib; this crate is rlib only.
-#
-# Keeping cdylib here caused `build_rust_deps.sh` (called by Xcode) to try to
-# produce a .dylib for aarch64-apple-ios, which fails because the linker picks
-# up macOS SDK frameworks instead of the iOS SDK ones.
 [lib]
 crate-type = ["rlib"]
 
@@ -37,8 +22,6 @@ codegen-units = 1
 strip = true
 panic = "abort"
 
-# Used by the release workflow for distribution builds (--profile dist).
-# Inherits release but with maximum throughput opt-level instead of size.
 [profile.dist]
 inherits = "release"
 opt-level = 3
@@ -51,10 +34,6 @@ dev = [
     "bevy/dynamic_linking",
 ]
 
-# Bevy with explicit features — android-game-activity and android-native-activity
-# are intentionally omitted here. They are exclusive to the `mobile` crate.
-# Enabling either here would cause a Cargo feature-unification conflict when the
-# `mobile` crate (which depends on android-native-activity) is built.
 [dependencies]
 bevy = { version = "0.18", default-features = false, features = [
     "default_app",
@@ -70,7 +49,7 @@ bevy = { version = "0.18", default-features = false, features = [
     "bevy_winit",
     "default_font",
     "multi_threaded",
-    "webgl2",       # internally gated on wasm32; safe to include for all targets
+    "webgl2",
     "x11",
     "wayland",
     "sysinfo_plugin",
@@ -102,8 +81,6 @@ web-sys                  = { version = "0.3", features = [
 send_wrapper             = { version = "0.6", features = ["futures"] }
 console_error_panic_hook = "0.1"
 
-# Required to make `rand`/`getrandom` work on wasm.
-# Backend is selected via `.cargo/config.toml` rustflags for wasm32-unknown-unknown.
 getrandom = { version = "0.3", features = ["wasm_js"] }
 
 [build-dependencies]

Miscellaneous/NonMarketHousingSimulation/build/windows/installer/Installer.wixproj

@@ -3,16 +3,6 @@
     <PropertyGroup>
         <DebugType>none</DebugType>
         <OutputName>installer</OutputName>
-        <!--
-            WiX 4.0.0 has a known issue where publish events defined inside a
-            custom <UI> fragment (InstallDirUi.wxs) are not recognised by the
-            ICE17/20/31 validators even though they are correctly compiled into
-            the MSI.  Suppressing these three ICEs is the recommended workaround
-            until WiX is updated to a version where this is fixed.
-            ICE17 – button-event validation
-            ICE20 – required dialog / property validation
-            ICE31 – text-style validation
-        -->
         <SuppressIces>ICE17;ICE20;ICE31</SuppressIces>
     </PropertyGroup>
     <ItemGroup>

Miscellaneous/NonMarketHousingSimulation/src/lib.rs

@@ -31,8 +31,7 @@ use crate::plugin::{MapConfig, MapSimulationPlugin};
 /// remote PMTiles URL.  See the README for setup instructions.
 pub const RUN_LOCAL: bool = false;
 
-const PMTILES_URL: &str =
-    "https://content-spf.funguylabs.app/user-uploads/new-york.pmtiles";
+const PMTILES_URL: &str = "https://content-spf.funguylabs.app/user-uploads/new-york.pmtiles";
 const MBTILES_PATH: &str = "./res/new-york.mbtiles";
 
 /// Top-level plugin for the simulation.
@@ -48,7 +47,7 @@ impl Plugin for AppPlugin {
     fn build(&self, app: &mut App) {
         let config = MapConfig {
             zoom: 14,
-            origin_x: 4822, // centre of Manhattan at zoom 14
+            origin_x: 4822, // center of Manhattan at zoom 14
             origin_y: 6160,
             lru_capacity: 25,
             ..MapConfig::default()
@@ -63,7 +62,7 @@ impl Plugin for AppPlugin {
     }
 }
 
-/// Spawns the directional sun light that illuminates the 3-D building meshes.
+/// Spawns the directional sun light that illuminates the 3d building meshes.
 fn setup_scene(mut commands: Commands) {
     commands.spawn((
         DirectionalLight {

Miscellaneous/NonMarketHousingSimulation/src/main.rs

@@ -11,31 +11,23 @@ fn main() {
     console_error_panic_hook::set_once();
 
     App::new()
-        .add_plugins(
-            DefaultPlugins.set(WindowPlugin {
-                primary_window: Some(Window {
-                    title: "NYC Non-Market Housing Simulation".into(),
+        .add_plugins(DefaultPlugins.set(WindowPlugin {
+            primary_window: Some(Window {
+                title: "NYC Non-Market Housing Simulation".into(),
 
-                    // Desktop: open at a fixed resolution in borderless fullscreen.
-                    // WASM: resolution is ignored; the canvas is sized by CSS /
-                    //       `fit_canvas_to_parent` instead.
-                    #[cfg(not(target_arch = "wasm32"))]
-                    resolution: (1400_u32, 900_u32).into(),
+                #[cfg(not(target_arch = "wasm32"))]
+                resolution: (1400_u32, 900_u32).into(),
 
-                    #[cfg(not(target_arch = "wasm32"))]
-                    mode: WindowMode::BorderlessFullscreen(MonitorSelection::Primary),
+                #[cfg(not(target_arch = "wasm32"))]
+                mode: WindowMode::BorderlessFullscreen(MonitorSelection::Primary),
 
-                    // Bind to the <canvas id="bevy"> element in index.html.
-                    canvas: Some("#bevy".to_owned()),
-                    fit_canvas_to_parent: true,
-                    // Let the browser handle F5 / Ctrl+R rather than Bevy.
-                    prevent_default_event_handling: false,
-
-                    ..default()
-                }),
+                canvas: Some("#bevy".to_owned()),
+                fit_canvas_to_parent: true,
+                prevent_default_event_handling: false,
                 ..default()
             }),
-        )
+            ..default()
+        }))
         .add_plugins(AppPlugin)
         .run();
 }