Build KSS and the style packs from the KSS package
KSS moved out of Kryon into kryonlabs/kss. Inbe depends on it, compiles it from build/packages/kss/src with --module-path kryon=... for its Kryon imports, and embeds the style packs from build/packages/kss/styles as styles/NAME.kss. The Android build, the source check, and the tests use the same paths, and the lock moves Kryon and Ziran to the commits that carry the move.
This commit is contained in:
1 parent
8e92872f86
commit
602c81260b
33 files changed
+81
-61
No files matched your search
@@ -180,6 +180,7 @@ APP_VERSION := $(shell awk '/APP_VERSION_STRING/ { print $$3; exit }' $(VERSION_
|
||||
SOCIAL_PY ?= $(if $(wildcard .local/social-venv/bin/python),.local/social-venv/bin/python,python3)
|
||||
|
||||
KRYON_DIR ?= build/packages/kryon
|
||||
KSS_DIR ?= build/packages/kss
|
||||
KRYON_BACKEND ?= raylib
|
||||
ifeq ($(KRYON_BACKEND),tui)
|
||||
KRYON_BACKEND := termi
|
||||
@@ -236,8 +237,8 @@ KRYON_UI_ZI := $(addprefix $(KRYON_DIR)/src/ui/,$(shell cat $(KRYON_DIR)/src/ui/
|
||||
KRYON_UI_C := $(patsubst $(KRYON_DIR)/src/ui/%.zi,$(KRYON_GENERATED_SRC_DIR)/ui/%.c,$(KRYON_UI_ZI))
|
||||
KRYON_UI_H := $(KRYON_UI_C:.c=.h)
|
||||
KRYON_UI_STAMP := $(KRYON_GENERATED_SRC_DIR)/ui/.fresh
|
||||
KRYON_KSS_ZI := $(wildcard $(KRYON_DIR)/src/kss/*.zi)
|
||||
KRYON_KSS_C := $(patsubst $(KRYON_DIR)/src/kss/%.zi,$(KRYON_GENERATED_SRC_DIR)/kss/%.c,$(KRYON_KSS_ZI))
|
||||
KRYON_KSS_ZI := $(wildcard $(KSS_DIR)/src/*.zi)
|
||||
KRYON_KSS_C := $(patsubst $(KSS_DIR)/src/%.zi,$(KRYON_GENERATED_SRC_DIR)/kss/%.c,$(KRYON_KSS_ZI))
|
||||
KRYON_KSS_H := $(KRYON_KSS_C:.c=.h)
|
||||
KRYON_KSS_STAMP := $(KRYON_GENERATED_SRC_DIR)/kss/.fresh
|
||||
KRYON_ICON_ASSETS_C := $(KRYON_GENERATED_SRC_DIR)/ui/ui_icon_assets.c
|
||||
@@ -404,7 +405,7 @@ FONT_FILES := \
|
||||
$(FONT_SUBSET_DIR)/NotoSansKR-App-Regular.otf \
|
||||
$(FONT_SUBSET_DIR)/NotoSansTC-App-Regular.otf
|
||||
EMBEDDED_ASSETS_C := $(BUILD_OBJ_DIR)/$(APP_NAME)_embedded_assets.c
|
||||
STYLE_FILES := $(wildcard $(KRYON_DIR)/styles/kryon/*.kss) \
|
||||
STYLE_FILES := $(wildcard $(KSS_DIR)/styles/*.kss) \
|
||||
$(wildcard assets/styles/*.kss) \
|
||||
$(wildcard themes/catalog_*.kss)
|
||||
IMAGE_FILES += assets/app/icon-sky-cradle.png assets/app/icon-ink-and-air.png
|
||||
@@ -650,7 +651,7 @@ zi-check: $(ZI_CHECK_STAMP) | build-laws
|
||||
$(ZI_CHECK_STAMP): Makefile scripts/check-zi-sources.py $(ZI2C_BIN) \
|
||||
$(ZI_SRCS) $(DAOCHI_CLIENT_MODULES) $(ZIRAN_STD_MODULES) \
|
||||
$(KRYON_UI_ZI) $(KRYON_KSS_ZI) $(GAME2D_MODULES) | build-laws
|
||||
@ZI_CHECK_DEFINES="$(ZI_NATIVE_DEFINES)" python3 scripts/check-zi-sources.py $(ZI2ZIR_BIN) $(KRYON_DIR)/src/ui $(ZIRAN_DIR)/std $(KRYON_DIR)/src/kss
|
||||
@ZI_CHECK_DEFINES="$(ZI_NATIVE_DEFINES)" python3 scripts/check-zi-sources.py $(ZI2ZIR_BIN) $(KRYON_DIR)/src/ui $(ZIRAN_DIR)/std $(KSS_DIR)/src
|
||||
@mkdir -p $(dir $@)
|
||||
@touch $@
|
||||
|
||||
@@ -853,8 +854,8 @@ $(KRYON_UI_C) $(KRYON_UI_H): $(KRYON_UI_STAMP)
|
||||
|
||||
$(KRYON_KSS_STAMP): Makefile $(ZI2C_BIN) $(KRYON_KSS_ZI) $(KRYON_DIR)/src/ui/modules.txt
|
||||
mkdir -p $(dir $@)
|
||||
$(ZI2C_BIN) --no-main --root $(KRYON_DIR)/src/kss \
|
||||
--module-path $(KRYON_DIR)/src/ui \
|
||||
$(ZI2C_BIN) --no-main --root $(KSS_DIR)/src \
|
||||
--module-path $(KRYON_DIR)/src/ui --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
-o $(dir $@) $(KRYON_KSS_ZI)
|
||||
touch $@
|
||||
|
||||
@@ -866,7 +867,7 @@ $(KRY_GEN_STAMP): Makefile $(ZI2C_BIN) $(ZI_SRCS) $(KRYON_ZI_MODULES) $(GAME2D_M
|
||||
sh scripts/run-ziran.sh $(ZI2C_BIN) --no-main --prune-stale --root . \
|
||||
$(foreach define,$(ZI_NATIVE_DEFINES),--define $(define)) \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/kss \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
@@ -880,7 +881,7 @@ $(WEB_GEN_STAMP): Makefile $(ZI2C_BIN) $(ZI_SRCS) $(KRYON_ZI_MODULES) $(GAME2D_M
|
||||
sh scripts/run-ziran.sh $(ZI2C_BIN) --no-main --root . \
|
||||
--define PLATFORM_WEB --define __EMSCRIPTEN__ \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/kss \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
@@ -899,7 +900,7 @@ $(WINDOWS_GEN_STAMP): Makefile $(ZI2C_BIN) $(ZI_SRCS) $(KRYON_ZI_MODULES) $(GAME
|
||||
--define PLATFORM_DESKTOP --define _WIN32 \
|
||||
--define DESKTOP_TRAY_ENABLED \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/kss \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
@@ -926,7 +927,7 @@ zi-c-plan9: $(KRY_GEN_STAMP)
|
||||
sh scripts/run-ziran.sh $(ZI2C_BIN) --no-main --plan9 --define PLAN9_BUILD \
|
||||
--define KRYON_PLATFORM_PLAN9 --root . \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/kss \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
|
||||
@@ -77,7 +77,7 @@ set(APP_ZIRAN_MANIFEST "${CMAKE_BINARY_DIR}/ziran/generated-sources.cmake")
|
||||
file(GLOB_RECURSE APP_ZIRAN_SOURCES CONFIGURE_DEPENDS "${SRC_DIR}/*.zi")
|
||||
file(GLOB_RECURSE APP_LIBRARY_ZIRAN_SOURCES CONFIGURE_DEPENDS
|
||||
"${KRYON_DIR}/src/ui/*.zi" "${KRYON_DIR}/src/backend/*.zi"
|
||||
"${KRYON_DIR}/src/kss/*.zi" "${REPO_ROOT}/build/packages/game2d/src/*.zi"
|
||||
"${REPO_ROOT}/build/packages/kss/src/*.zi" "${REPO_ROOT}/build/packages/game2d/src/*.zi"
|
||||
"${ZIRAN_DIR}/std/*.zi" "${REPO_ROOT}/build/packages/daochi-client/*.zi")
|
||||
set(APP_ZIRAN_DEFINES --define ANDROID_BUILD)
|
||||
set(APP_ZIRAN_CHECK_DEFINES "ANDROID_BUILD")
|
||||
@@ -191,7 +191,7 @@ file(GLOB APP_PRACTICE_BANNER_ASSETS RELATIVE "${REPO_ROOT}" CONFIGURE_DEPENDS
|
||||
"${REPO_ROOT}/assets/practices/*/banner-light.png"
|
||||
"${REPO_ROOT}/assets/practices/*/banner-dark.png")
|
||||
file(GLOB APP_STYLE_ASSETS RELATIVE "${REPO_ROOT}"
|
||||
"${KRYON_DIR}/styles/kryon/*.kss" "${REPO_ROOT}/assets/styles/*.kss"
|
||||
"${REPO_ROOT}/build/packages/kss/styles/*.kss" "${REPO_ROOT}/assets/styles/*.kss"
|
||||
"${REPO_ROOT}/themes/catalog_*.kss")
|
||||
foreach(mode light dark)
|
||||
file(SHA256 "${REPO_ROOT}/themes/catalog_${mode}.kss" APP_CATALOG_HASH)
|
||||
|
||||
@@ -12,7 +12,7 @@ root = Path(__file__).resolve().parent.parent
|
||||
compiler = Path(sys.argv[1]).resolve()
|
||||
ui = Path(sys.argv[2]).resolve() if len(sys.argv) > 2 else root / "build/packages/kryon/src/ui"
|
||||
standard = Path(sys.argv[3]).resolve() if len(sys.argv) > 3 else root / "build/packages/ziran/std"
|
||||
kss = Path(sys.argv[4]).resolve() if len(sys.argv) > 4 else root / "build/packages/kryon/src/kss"
|
||||
kss = Path(sys.argv[4]).resolve() if len(sys.argv) > 4 else root / "build/packages/kss/src"
|
||||
client = root / "build/packages/daochi-client"
|
||||
game2d = root / "build/packages/game2d/src"
|
||||
sources = sorted((root / "src").rglob("*.zi"))
|
||||
@@ -44,6 +44,9 @@ result = subprocess.run(
|
||||
str(ui),
|
||||
"--module-path",
|
||||
str(kss),
|
||||
# KSS imports Kryon as kryon/NAME.
|
||||
"--module-path",
|
||||
f"kryon={ui}",
|
||||
"--module-path",
|
||||
str(ui.parent / "backend"),
|
||||
"--module-path",
|
||||
|
||||
@@ -29,8 +29,8 @@ def emit(output: Path, files: list[Path], root: Path) -> None:
|
||||
# Keep build/packages/<name> links unresolved so package assets get
|
||||
# stable embedded names regardless of the package cache location.
|
||||
path = Path(os.path.abspath(file)).relative_to(root).as_posix()
|
||||
if path.startswith("build/packages/kryon/styles/"):
|
||||
path = path.removeprefix("build/packages/kryon/")
|
||||
if path.startswith("build/packages/kss/styles/"):
|
||||
path = path.removeprefix("build/packages/kss/")
|
||||
if path.startswith("build/packages/kryon/icons/"):
|
||||
path = path.removeprefix("build/packages/kryon/")
|
||||
if path in entries:
|
||||
|
||||
@@ -26,10 +26,12 @@ command = ["sh", str(root / "scripts/run-ziran.sh"), str(args.compiler),
|
||||
for name in args.define:
|
||||
command.extend(["--define", name])
|
||||
for directory in (
|
||||
root / "src", kryon / "src/ui", kryon / "src/backend", kryon / "src/kss",
|
||||
root / "src", kryon / "src/ui", kryon / "src/backend", root / "build/packages/kss/src",
|
||||
root / "build/packages/game2d/src", root / "build/packages/ziran/std", root / "build/packages/daochi-client",
|
||||
):
|
||||
command.extend(["--module-path", str(directory)])
|
||||
# KSS imports Kryon as kryon/NAME.
|
||||
command.extend(["--module-path", f"kryon={kryon / 'src/ui'}"])
|
||||
command.extend(["-o", str(args.output)])
|
||||
command.extend(str(path.relative_to(root)) for path in sources)
|
||||
completed = subprocess.run(command, cwd=root)
|
||||
|
||||
@@ -79,6 +79,7 @@ link() {
|
||||
|
||||
link ziran ziran
|
||||
link kryon kryon
|
||||
link kss kss
|
||||
link raylib raylib
|
||||
link game2d game2d
|
||||
link daochi-client daochi_client
|
||||
|
||||
@@ -196,13 +196,13 @@ StyleRootFor :: (index: s32) -> string {
|
||||
|
||||
StyleImport :: (name: KssName) -> AssetView {
|
||||
if KssNameEquals(name, "classic") {
|
||||
return AssetRead("styles/kryon/classic.kss")
|
||||
return AssetRead("styles/classic.kss")
|
||||
}
|
||||
if KssNameEquals(name, "lightfield") {
|
||||
return AssetRead("styles/kryon/lightfield.kss")
|
||||
return AssetRead("styles/lightfield.kss")
|
||||
}
|
||||
if KssNameEquals(name, "material") {
|
||||
return AssetRead("styles/kryon/material.kss")
|
||||
return AssetRead("styles/material.kss")
|
||||
}
|
||||
if KssNameEquals(name, "inbe") {
|
||||
return AssetRead("assets/styles/inbe.kss")
|
||||
|
||||
@@ -6,7 +6,7 @@ Answer :: () -> s32 {
|
||||
if !style.found || style.mime != "text/plain" ||
|
||||
style.data.count < 4 || style.data[0] != 84 ||
|
||||
style.data[1] != 101 { return 1 }
|
||||
pack := AssetRead("styles/kryon/material.kss")
|
||||
pack := AssetRead("styles/material.kss")
|
||||
if !pack.found || pack.mime != "text/plain" ||
|
||||
pack.data.count < 5 || pack.data[0] != 64 { return 5 }
|
||||
index := AssetRead("locales/index.txt")
|
||||
|
||||
@@ -14,7 +14,7 @@ cp "$work/c/assets.h" "$work/c/app/assets.h"
|
||||
python3 "$root/scripts/embed-app-assets.py" "$work/assets.c" \
|
||||
"$root/assets/styles/inbe.kss" "$root/locales/index.txt" \
|
||||
"$root/assets/pet/egg1.png" \
|
||||
"$root/build/packages/kryon/styles/kryon/material.kss"
|
||||
"$root/build/packages/kss/styles/material.kss"
|
||||
"${CC:-cc}" -std=c11 -DZIRAN_BOUNDS_CHECK -Wall -Wextra \
|
||||
-I"$root/build/packages/ziran/include" -I"$work/c" -I"$root/src/app" \
|
||||
"$root/tests/assets_link_test.c" \
|
||||
|
||||
@@ -9,14 +9,14 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
-o "$work/c" "$root/tests/device_preferences_link_behavior.zi"
|
||||
mv "$work/c/device_host.c" "$work/c/device_host.c.skip"
|
||||
mkdir -p "$work/c/app"
|
||||
cp "$work/c/assets.h" "$work/c/app/assets.h"
|
||||
python3 "$root/scripts/embed-app-assets.py" "$work/assets.c" \
|
||||
"$root/themes/catalog_light.kss" "$root/themes/catalog_dark.kss" \
|
||||
"$root/build/packages/kryon/styles/kryon/material.kss" \
|
||||
"$root/build/packages/kss/styles/material.kss" \
|
||||
"$root/assets/styles/inbe.kss"
|
||||
"${CC:-cc}" -std=c11 -DZIRAN_BOUNDS_CHECK -ffunction-sections \
|
||||
-fdata-sections -Wl,--gc-sections \
|
||||
|
||||
@@ -8,13 +8,13 @@ mkdir -p "$work/c"
|
||||
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
"$root/src/screens/elist_screen.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
-o "$work/c" "$root/src/screens/elist_screen.zi"
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -8,12 +8,12 @@ mkdir -p "$work/c"
|
||||
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/app/language_selection.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/c" "$root/src/app/language_selection.zi"
|
||||
"${CC:-cc}" -std=c11 -Wall -Wextra -Werror \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/tests/fakes" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -7,7 +7,7 @@ trap 'rm -rf "$work"' EXIT HUP INT TERM
|
||||
sh "$root/scripts/run-ziran.sh" "$bin/zi2c" --no-main --root "$root" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
-o "$work/c" "$root/tests/settings_mutation_behavior.zi"
|
||||
|
||||
@@ -9,12 +9,12 @@ trap 'rm -rf "$work"' EXIT HUP INT TERM
|
||||
mkdir -p "$work/c"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_ui.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/c" "$root/src/screens/settings/settings_ui.zi"
|
||||
set -- "$root/tests/settings_ui_link_test.c"
|
||||
@@ -28,12 +28,12 @@ env -u DISPLAY -u WAYLAND_DISPLAY "$work/test"
|
||||
mkdir -p "$work/device"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_device.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/device" "$root/src/screens/settings/settings_device.zi"
|
||||
"${CC:-cc}" -std=c11 -Wno-unused-function \
|
||||
@@ -43,12 +43,12 @@ mkdir -p "$work/device"
|
||||
mkdir -p "$work/breaks"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_breaks.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/breaks" "$root/src/screens/settings/settings_breaks.zi"
|
||||
"${CC:-cc}" -std=c11 -Wno-unused-function -Wno-unused-variable \
|
||||
@@ -58,12 +58,12 @@ mkdir -p "$work/breaks"
|
||||
mkdir -p "$work/notifications"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_notifications.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/notifications" \
|
||||
"$root/src/screens/settings/settings_notifications.zi"
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -9,15 +9,15 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
-o "$work/c" "$root/tests/style_apply_link_behavior.zi"
|
||||
mkdir -p "$work/c/app"
|
||||
cp "$work/c/assets.h" "$work/c/app/assets.h"
|
||||
python3 "$root/scripts/embed-app-assets.py" "$work/assets.c" \
|
||||
"$root/themes/catalog_light.kss" "$root/themes/catalog_dark.kss" \
|
||||
"$root/build/packages/kryon/styles/kryon/material.kss" \
|
||||
"$root/build/packages/kryon/styles/kryon/classic.kss" \
|
||||
"$root/build/packages/kryon/styles/kryon/lightfield.kss" \
|
||||
"$root/build/packages/kss/styles/material.kss" \
|
||||
"$root/build/packages/kss/styles/classic.kss" \
|
||||
"$root/build/packages/kss/styles/lightfield.kss" \
|
||||
"$root/assets/styles/inbe.kss"
|
||||
"${CC:-cc}" -std=c11 -DZIRAN_BOUNDS_CHECK -ffunction-sections \
|
||||
-fdata-sections -Wl,--gc-sections \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -10,7 +10,7 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
|
||||
@@ -11,7 +11,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -17,7 +17,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -9,7 +9,7 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/kss" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
-o "$work/c" "$root/tests/theme_catalog_link_behavior.zi"
|
||||
mkdir -p "$work/c/app"
|
||||
cp "$work/c/assets.h" "$work/c/app/assets.h"
|
||||
|
||||
@@ -77,7 +77,8 @@ def build_probe(work, compiler, env):
|
||||
str(compiler), "--no-main", *definitions,
|
||||
"--root", "tests", "--module-path", "src",
|
||||
"--module-path", "build/packages/kryon/src/ui",
|
||||
"--module-path", "build/packages/kryon/src/kss",
|
||||
"--module-path", "build/packages/kss/src",
|
||||
"--module-path", "kryon=build/packages/kryon/src/ui",
|
||||
"--module-path", "build/packages/ziran/std",
|
||||
"--module-path", "build/packages/daochi-client",
|
||||
"-o", str(output), "tests/update_flow_probe.zi",
|
||||
|
||||
+13
-5
@@ -47,16 +47,16 @@
|
||||
},
|
||||
{
|
||||
"commit": "cfd9fc0e73658c09a218feb21b8281fe367647b6",
|
||||
"dependencies": {"Kryon": "p945de5b19cde8910"},
|
||||
"dependencies": {"Kryon": "p83be2ed3d78fa9cf"},
|
||||
"id": "p8120950c86e3937b",
|
||||
"name": "Game2D",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/game2d.git"
|
||||
},
|
||||
{
|
||||
"commit": "e3d00814af6da02f2a986777d0fc697c5a686649",
|
||||
"commit": "2dacc9eb7c2c023c0cc111b2c4deb210afdb4886",
|
||||
"dependencies": {"raylib": "p5a77c9c35110e925"},
|
||||
"id": "p945de5b19cde8910",
|
||||
"id": "p83be2ed3d78fa9cf",
|
||||
"name": "Kryon",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
@@ -78,14 +78,22 @@
|
||||
"ref": "master",
|
||||
"source": true,
|
||||
"url": "https://github.com/LoupVaillant/Monocypher.git"
|
||||
},
|
||||
{
|
||||
"commit": "e1f07e615e9255a513dbb6d66e5e6e9d335ef690",
|
||||
"dependencies": {"kryon": "p83be2ed3d78fa9cf"},
|
||||
"id": "pfdf70946e0505dfe",
|
||||
"name": "Kss",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kss.git"
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p8120950c86e3937b", "kryon": "p945de5b19cde8910", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
|
||||
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p8120950c86e3937b", "kryon": "p83be2ed3d78fa9cf", "kss": "pfdf70946e0505dfe", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
|
||||
"name": "Inbe"
|
||||
},
|
||||
"toolchain": {
|
||||
"commit": "d48c091ad805e9705b376cd43d4573684861e0b4",
|
||||
"commit": "18d60d0c467b5afb664e257c3bb28a9004e77f1a",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/ziran.git"
|
||||
}
|
||||
|
||||
@@ -11,6 +11,10 @@ ref = "master"
|
||||
git = "https://github.com/kryonlabs/kryon.git"
|
||||
ref = "master"
|
||||
|
||||
[dependencies.kss]
|
||||
git = "https://github.com/kryonlabs/kss.git"
|
||||
ref = "master"
|
||||
|
||||
[dependencies.game2d]
|
||||
git = "https://github.com/kryonlabs/game2d.git"
|
||||
ref = "master"
|
||||
|
||||
Reference in new issue
Block a user