From d72155df4c7398ba9030f05be7534a3322806e78 Mon Sep 17 00:00:00 2001
From: Stephen Gutekanst <stephen@hexops.com>
Date: Wed, 12 Jul 2023 10:28:21 -0700
Subject: [PATCH] fold app/ into src/editor/

Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
---
 build.zig                                       |   2 +-
 {app => src/editor}/Builder.zig                 |   2 +-
 {app => src/editor}/Builder/mime.zig            |   0
 {app => src/editor}/Builder/www/ansi_to_html.js |   0
 {app => src/editor}/Builder/www/favicon.ico     | Bin
 {app => src/editor}/Builder/www/index.html      |   0
 {app => src/editor}/Builder/www/wasmserve.js    |   0
 app/main.zig => src/editor/entrypoint.zig       |   2 +-
 {app => src/editor}/target.zig                  |   2 +-
 src/mach.zig                                    |   7 +++++++
 10 files changed, 11 insertions(+), 4 deletions(-)
 rename {app => src/editor}/Builder.zig (99%)
 rename {app => src/editor}/Builder/mime.zig (100%)
 rename {app => src/editor}/Builder/www/ansi_to_html.js (100%)
 rename {app => src/editor}/Builder/www/favicon.ico (100%)
 rename {app => src/editor}/Builder/www/index.html (100%)
 rename {app => src/editor}/Builder/www/wasmserve.js (100%)
 rename app/main.zig => src/editor/entrypoint.zig (99%)
 rename {app => src/editor}/target.zig (96%)
 create mode 100644 src/mach.zig

diff --git a/build.zig b/build.zig
index bd55abe0..e7accb34 100644
--- a/build.zig
+++ b/build.zig
@@ -63,7 +63,7 @@ pub fn build(b: *std.Build) !void {
     if (target.getCpuArch() != .wasm32) {
         const app = b.addExecutable(.{
             .name = "mach",
-            .root_source_file = .{ .path = "app/main.zig" },
+            .root_source_file = .{ .path = "src/mach.zig" },
             .version = .{ .major = 0, .minor = 1, .patch = 0 },
             .optimize = optimize,
             .target = target,
diff --git a/app/Builder.zig b/src/editor/Builder.zig
similarity index 99%
rename from app/Builder.zig
rename to src/editor/Builder.zig
index c95df3a3..9cb2a2c4 100644
--- a/app/Builder.zig
+++ b/src/editor/Builder.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const mime_map = @import("Builder/mime.zig").mime_map;
 const Target = @import("target.zig").Target;
 const OptimizeMode = std.builtin.OptimizeMode;
-const allocator = @import("root").allocator;
+const allocator = @import("entrypoint.zig").allocator;
 
 const Builder = @This();
 
diff --git a/app/Builder/mime.zig b/src/editor/Builder/mime.zig
similarity index 100%
rename from app/Builder/mime.zig
rename to src/editor/Builder/mime.zig
diff --git a/app/Builder/www/ansi_to_html.js b/src/editor/Builder/www/ansi_to_html.js
similarity index 100%
rename from app/Builder/www/ansi_to_html.js
rename to src/editor/Builder/www/ansi_to_html.js
diff --git a/app/Builder/www/favicon.ico b/src/editor/Builder/www/favicon.ico
similarity index 100%
rename from app/Builder/www/favicon.ico
rename to src/editor/Builder/www/favicon.ico
diff --git a/app/Builder/www/index.html b/src/editor/Builder/www/index.html
similarity index 100%
rename from app/Builder/www/index.html
rename to src/editor/Builder/www/index.html
diff --git a/app/Builder/www/wasmserve.js b/src/editor/Builder/www/wasmserve.js
similarity index 100%
rename from app/Builder/www/wasmserve.js
rename to src/editor/Builder/www/wasmserve.js
diff --git a/app/main.zig b/src/editor/entrypoint.zig
similarity index 99%
rename from app/main.zig
rename to src/editor/entrypoint.zig
index f1b2a18e..5fba7ee6 100644
--- a/app/main.zig
+++ b/src/editor/entrypoint.zig
@@ -10,7 +10,7 @@ var arg_i: usize = 1;
 var gpa = std.heap.GeneralPurposeAllocator(.{}){};
 pub const allocator = gpa.allocator();
 
-pub fn main() !void {
+pub fn Main() !void {
     defer _ = gpa.deinit();
 
     args = try std.process.argsAlloc(allocator);
diff --git a/app/target.zig b/src/editor/target.zig
similarity index 96%
rename from app/target.zig
rename to src/editor/target.zig
index 78672f00..5f57b209 100644
--- a/app/target.zig
+++ b/src/editor/target.zig
@@ -1,5 +1,5 @@
 const std = @import("std");
-const allocator = @import("root").allocator;
+const allocator = @import("entrypoint.zig").allocator;
 
 pub const Target = enum {
     @"linux-x86_64",
diff --git a/src/mach.zig b/src/mach.zig
new file mode 100644
index 00000000..982c06a9
--- /dev/null
+++ b/src/mach.zig
@@ -0,0 +1,7 @@
+//! The 'mach' CLI and engine editor
+
+const entrypoint = @import("editor/entrypoint.zig");
+
+pub fn main() !void {
+    try entrypoint.Main();
+}