mach-ecs moves back into the main repository

Helps hexops/mach#1165

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>

.github/ISSUE_TEMPLATE/dev_zig_nomination.md

@@ -45,7 +45,6 @@ You may have been linked to this issue because you sent a pull request to update
 
 These projects have zero `build.zig.zon` dependencies, we update them first - and in any order.
 
-* [ ] mach-ecs
 * [ ] mach-gamemode
 * [ ] mach-model3d
 * [ ] mach-sysjs
@@ -143,7 +142,6 @@ These projects have dependencies on other projects. We update them in the exact
 * [ ] mach, which depends on:
   * .zigversion
   * build.zig version check
-  * mach-ecs
   * mach-core
   * mach-basisu
   * mach-sysaudio

build.zig

@@ -18,10 +18,6 @@ pub fn build(b: *std.Build) !void {
         .target = target,
         .optimize = optimize,
     });
-    const mach_ecs_dep = b.dependency("mach_ecs", .{
-        .target = target,
-        .optimize = optimize,
-    });
     const mach_basisu_dep = b.dependency("mach_basisu", .{
         .target = target,
         .optimize = optimize,
@@ -40,7 +36,6 @@ pub fn build(b: *std.Build) !void {
         .root_source_file = .{ .path = sdkPath("/src/main.zig") },
         .imports = &.{
             .{ .name = "mach-core", .module = mach_core_dep.module("mach-core") },
-            .{ .name = "mach-ecs", .module = mach_ecs_dep.module("mach-ecs") },
             .{ .name = "mach-sysaudio", .module = mach_sysaudio_dep.module("mach-sysaudio") },
             .{ .name = "mach-basisu", .module = mach_basisu_dep.module("mach-basisu") },
             .{ .name = "mach-freetype", .module = mach_freetype_dep.module("mach-freetype") },

build.zig.zon

@@ -11,10 +11,6 @@
         "README.md",
     },
     .dependencies = .{
-        .mach_ecs = .{
-            .url = "https://pkg.machengine.org/mach-ecs/83a3ed801008a976dd79e10068157b02c3b76a36.tar.gz",
-            .hash = "1220ed76b7395bfca9519ae58e7aa1c4ee94abc7e65b35a076f91d9c4ffa50de27e6",
-        },
         .mach_core = .{
             .url = "https://pkg.machengine.org/mach-core/6a62bcc90e0d072d632788a6575d77942bd09a19.tar.gz",
             .hash = "12209d39954fcda0be158461c10f64d14d5c7d097bd6d26785b332d75ffefa7dd7a0",

src/engine.zig

@@ -1,7 +1,7 @@
 const core = @import("mach-core");
 const gpu = @import("mach-core").gpu;
 const std = @import("std");
-const ecs = @import("mach-ecs");
+const ecs = @import("../main.zig").ecs;
 
 var gpa = std.heap.GeneralPurposeAllocator(.{}){};
 const allocator = gpa.allocator();

src/gfx/Sprite.zig

@@ -1,7 +1,7 @@
 const std = @import("std");
 const core = @import("mach-core");
 const gpu = core.gpu;
-const ecs = @import("mach-ecs");
+const ecs = @import("../main.zig").ecs;
 const Engine = @import("../engine.zig").Engine;
 const mach = @import("../main.zig");
 

src/main.zig

@@ -5,10 +5,10 @@ pub const Timer = core.Timer;
 // Mach packages
 pub const gpu = core.gpu;
 pub const sysjs = @import("mach-sysjs");
-pub const ecs = @import("mach-ecs");
 pub const sysaudio = @import("mach-sysaudio");
 
 // Mach standard library
+pub const ecs = @import("ecs/main.zig");
 pub const gfx = @import("gfx/main.zig");
 pub const math = @import("math/main.zig");
 pub const testing = @import("testing.zig");
@@ -25,10 +25,10 @@ test {
     // std.testing.refAllDeclsRecursive(@This());
     _ = core;
     _ = gpu;
-    _ = ecs;
     _ = sysaudio;
     _ = gfx;
     _ = math;
     _ = testing;
+    std.testing.refAllDeclsRecursive(ecs);
     std.testing.refAllDeclsRecursive(math);
 }