Skip to content

Commit 5c9b6d0

Browse files
committed
WIP: Editor and runner
1 parent e70146c commit 5c9b6d0

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

.github/workflows/test.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ jobs:
9898
# uses: pyvista/setup-headless-display-action@v2
9999

100100
- name: Test headless standalone
101-
run: zig-out/bin/cetech1 --headless --max-kernel-tick 5
101+
run: zig-out/bin/cetech1_editor --headless --max-kernel-tick 5
102102

103103
- name: Test headless standalone with asset root
104-
run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
104+
run: zig-out/bin/cetech1_editor --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
105105

106106
- name: Test UI headless
107-
run: zig-out/bin/cetech1 --headless --test-ui --test-ui-junit ./result.xml
107+
run: zig-out/bin/cetech1_editor --headless --test-ui --test-ui-junit ./result.xml
108108

109109
- name: Publish Test Report
110110
uses: mikepenz/action-junit-report@v4
@@ -150,13 +150,13 @@ jobs:
150150
#run: kcov --include-pattern=/cetech1/src/,/cetech/public/ kcov-output zig-out/bin/cetech1_test
151151

152152
- name: Test headless standalone
153-
run: zig-out/bin/cetech1 --headless --max-kernel-tick 5
153+
run: zig-out/bin/cetech1_editor --headless --max-kernel-tick 5
154154

155155
- name: Test headless standalone with asset root
156-
run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
156+
run: zig-out/bin/cetech1_editor --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
157157

158158
- name: Test UI headless
159-
run: zig-out/bin/cetech1 --headless --test-ui --test-ui-junit ./result.xml
159+
run: zig-out/bin/cetech1_editor --headless --test-ui --test-ui-junit ./result.xml
160160

161161
- name: Publish Test Report
162162
uses: mikepenz/action-junit-report@v4
@@ -206,15 +206,15 @@ jobs:
206206
# FIXME: Windows
207207
- name: Test headless standalone
208208
shell: bash
209-
run: zig-out/bin/cetech1 --headless --max-kernel-tick 5
209+
run: zig-out/bin/cetech1_editor --headless --max-kernel-tick 5
210210

211211
- name: Test headless standalone with asset root
212212
shell: bash
213-
run: zig-out/bin/cetech1 --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
213+
run: zig-out/bin/cetech1_editor --headless --max-kernel-tick 5 --asset-root fixtures/test_asset/
214214

215215
- name: Test UI headless
216216
shell: bash
217-
run: zig-out/bin/cetech1 --headless --test-ui --test-ui-junit ./result.xml
217+
run: zig-out/bin/cetech1_editor --headless --test-ui --test-ui-junit ./result.xml
218218

219219
- name: Publish Test Report
220220
uses: mikepenz/action-junit-report@v4

build.zig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ pub fn build(b: *std.Build) !void {
403403
gen_ide.addArgs(&.{ "--ide", @tagName(options.ide) });
404404

405405
gen_ide.addArg("--bin-path");
406-
gen_ide.addDirectoryArg(b.path("zig-out/bin/cetech1"));
406+
gen_ide.addDirectoryArg(b.path("zig-out/bin/cetech1_editor"));
407407

408408
gen_ide.addArg("--project-path");
409409
gen_ide.addDirectoryArg(b.path(""));
@@ -528,19 +528,19 @@ pub fn build(b: *std.Build) !void {
528528
//
529529
// CETech1 kernel standalone exe
530530
//
531-
const exe = createKernelExe(
531+
const editor_exe = createKernelExe(
532532
b,
533-
"cetech1",
534-
b.path("src/main.zig"),
533+
"cetech1_editor",
534+
b.path("src/editor.zig"),
535535
kernel_module,
536536
kernel_lib,
537537
cetech1_version,
538538
target,
539539
optimize,
540540
);
541-
try linkStaticModules(b, exe, target, optimize, static_modules.keys());
541+
try linkStaticModules(b, editor_exe, target, optimize, static_modules.keys());
542542
// Make exe depends on generated files.
543-
exe.step.dependOn(&generated_files.step);
543+
editor_exe.step.dependOn(&generated_files.step);
544544

545545
//
546546
// CETech1 kernel standalone tests
@@ -567,7 +567,7 @@ pub fn build(b: *std.Build) !void {
567567
const test_step = b.step("test", "Run unit tests");
568568
test_step.dependOn(&run_unit_tests.step);
569569

570-
const run_tests_ui = b.addRunArtifact(exe);
570+
const run_tests_ui = b.addRunArtifact(editor_exe);
571571
run_tests_ui.addArgs(&.{ "--test-ui", "--headless" });
572572
run_tests_ui.step.dependOn(b.getInstallStep());
573573
const testui_step = b.step("test-ui", "Run UI headless test");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
zig-out/bin/cetech1_test && zig-out/bin/cetech1 --asset-root fixtures/test_asset/
1+
zig-out/bin/cetech1_test && zig-out/bin/cetech1_editor --asset-root fixtures/test_asset/
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Desktop mode
2-
zig-out/bin/cetech1_test && zig-out/bin/cetech1 --asset-root fixtures/test_asset/
2+
zig-out/bin/cetech1_test && zig-out/bin/cetech1_editor --asset-root fixtures/test_asset/
33

44
# Standalone
5-
zig-out/bin/cetech1 --fullscreen --asset-root fixtures/test_asset/
5+
zig-out/bin/cetech1_editor --fullscreen --asset-root fixtures/test_asset/
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
zig-out/bin/cetech1_test.exe && zig-out/bin/cetech1.exe --asset-root fixtures/test_asset/
1+
zig-out/bin/cetech1_test.exe && zig-out/bin/cetech1_editor.exe --asset-root fixtures/test_asset/

docs/topics/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ CETech1 has builtin support for tracy profiler and provide Tracy as submodule, b
152152
<tab title="MacOS">
153153
<code-block lang="bash">
154154
profiler/build/tracy-profiler -a localhost
155-
zig-out/bin/cetech1 # on separate terminal
155+
zig-out/bin/cetech1_editor # on separate terminal
156156
# Have fun
157157
</code-block>
158158
</tab>
159159
<tab title="Linux">
160160
<code-block lang="bash">
161161
# install tracy by your way
162162
profiler/build/tracy-profiler -a localhost
163-
zig-out/bin/cetech1 # on separate terminal
163+
zig-out/bin/cetech1_editor # on separate terminal
164164
# Have fun
165165
</code-block>
166166
</tab>
File renamed without changes.

0 commit comments

Comments
 (0)