Import Oqs by its package-qualified name
Oqs names its module file after its export, so Inbe imports it as oqs/Oqs through a named module path, as project builds of other apps do. The lock moves Oqs to that commit and keeps liboqs where it was. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
1 parent
2fbebbec05
commit
decfee4212
36 files changed
+63
-63
No files matched your search
@@ -889,7 +889,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 $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path oqs=$(OQS_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 \
|
||||
@@ -903,7 +903,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 $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path oqs=$(OQS_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 \
|
||||
@@ -922,7 +922,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 $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path oqs=$(OQS_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 \
|
||||
@@ -949,7 +949,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 $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path oqs=$(OQS_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 \
|
||||
|
||||
@@ -45,7 +45,7 @@ result = subprocess.run(
|
||||
"--module-path",
|
||||
str(kss),
|
||||
"--module-path",
|
||||
str(root / "build/packages/oqs/src"),
|
||||
f"oqs={root / 'build/packages/oqs/src'}",
|
||||
# KSS imports Kryon as kryon/NAME.
|
||||
"--module-path",
|
||||
f"kryon={ui}",
|
||||
|
||||
@@ -27,12 +27,12 @@ for name in args.define:
|
||||
command.extend(["--define", name])
|
||||
for directory in (
|
||||
root / "src", kryon / "src/ui", kryon / "src/backend", root / "build/packages/kss/src",
|
||||
root / "build/packages/oqs/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.
|
||||
# KSS imports Kryon as kryon/NAME, and account code imports oqs/Oqs.
|
||||
command.extend(["--module-path", f"kryon={kryon / 'src/ui'}"])
|
||||
command.extend(["--module-path", f"oqs={root / 'build/packages/oqs/src'}"])
|
||||
command.extend(["-o", str(args.output)])
|
||||
command.extend(str(path.relative_to(root)) for path in sources)
|
||||
completed = subprocess.run(command, cwd=root)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#import, file "account_types.zi";
|
||||
#import, file "sync_crypto.zi";
|
||||
#import "oqs"
|
||||
#import "oqs/Oqs"
|
||||
|
||||
// ML-DSA-44's fixed wire sizes are part of Inbe's account format.
|
||||
AccountPublicKeyBytes :: 1312
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#import, file "account_types.zi";
|
||||
#import, file "sync_crypto.zi";
|
||||
#import "byte_text_linux"
|
||||
#import "oqs"
|
||||
#import "oqs/Oqs"
|
||||
|
||||
AccountSignatureBytes :: 2420
|
||||
AccountSigningKeyBytes :: 2560
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#import "byte_text_linux"
|
||||
#import "oqs"
|
||||
#import "oqs/Oqs"
|
||||
|
||||
#program_export
|
||||
SyncCryptoRandom :: (output: *u8, length: s64) -> s32 {
|
||||
|
||||
@@ -5,6 +5,6 @@ bin=${1:-"$root/build/ziran-toolchain/bin"}
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
"$root/src/platform/android/android_health.zi"
|
||||
exec python3 "$root/tests/android_jni_zi_test.py" "$bin"
|
||||
@@ -10,12 +10,12 @@ trap 'rm -rf "$work"' EXIT HUP INT TERM
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
"$root/src/platform/android/android_lifecycle.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
-o "$work/gen" "$root/src/platform/android/android_lifecycle.zi" \
|
||||
"$root/src/app/current_app.zi" "$root/src/app/exercise_types.zi" \
|
||||
"$root/src/app/practice_lifecycle.zi"
|
||||
|
||||
@@ -115,13 +115,13 @@ with tempfile.TemporaryDirectory(prefix="inbe-daochi-native-") as temporary:
|
||||
str(COMPILER), "--no-main", "--root", str(ROOT / "src"),
|
||||
"--module-path", str(ROOT / "build/packages/ziran/std"),
|
||||
"--module-path", str(ROOT / "build/packages/daochi-client"),
|
||||
"--module-path", str(ROOT / "build/packages/oqs/src"),
|
||||
"--module-path", f"oqs={ROOT / 'build/packages/oqs/src'}",
|
||||
"-o", str(generated), str(ROOT / "src/storage/daochi_native.zi"),
|
||||
], check=True)
|
||||
sources = [
|
||||
"storage/daochi_native.c", "daochi_account.c", "client.c", "auth.c", "url.c", "wire.c",
|
||||
"sync.c", "transaction.c", "sync_account_sign.c", "sync_crypto.c",
|
||||
"sync_crypto_random.c", "oqs.c",
|
||||
"sync_crypto_random.c", "Oqs.c",
|
||||
"net_http_curl_linux.c", "json_scan.c", "text.c", "text_buffer.c",
|
||||
"byte_text_linux.c", "c_string.c",
|
||||
]
|
||||
|
||||
@@ -16,13 +16,13 @@ with tempfile.TemporaryDirectory(prefix="inbe-device-key-") as temporary:
|
||||
subprocess.run([
|
||||
str(COMPILER), "--no-main", "--root", str(ROOT / "src"),
|
||||
"--module-path", str(ROOT / "build/packages/ziran/std"),
|
||||
"--module-path", str(ROOT / "build/packages/oqs/src"),
|
||||
"--module-path", f"oqs={ROOT / 'build/packages/oqs/src'}",
|
||||
"--module-path", str(ROOT / "build/packages/daochi-client"),
|
||||
"--module-path", str(ROOT / "build/packages/kryon/src/ui"),
|
||||
"-o", str(generated), str(ROOT / "src/storage/device_key_store.zi"),
|
||||
], check=True)
|
||||
names = {"device_key_store.c", "device_key.c", "sync_crypto.c",
|
||||
"sync_crypto_random.c", "byte_text_linux.c", "oqs.c"}
|
||||
"sync_crypto_random.c", "byte_text_linux.c", "Oqs.c"}
|
||||
sources = sorted(str(path) for path in generated.rglob("*.c")
|
||||
if path.name in names)
|
||||
monocypher = ROOT / "build/packages/monocypher/src"
|
||||
|
||||
@@ -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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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"
|
||||
|
||||
@@ -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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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 \
|
||||
|
||||
@@ -8,17 +8,17 @@ mkdir -p "$work/c" "$work/stubs"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
"$root/src/app/music_library.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
-o "$work/c" "$root/src/app/music_library.zi" \
|
||||
"$root/src/app/music_library_host.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
-o "$work/stubs" "$root/tests/music_library_host_stubs.zi"
|
||||
"${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/tests/fakes" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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,7 +8,7 @@ mkdir -p "$work/generated"
|
||||
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
-o "$work/generated" "$root/src/storage/paths.zi"
|
||||
|
||||
"${CC:-cc}" -std=c11 -O0 -Wall -Wextra -Werror \
|
||||
|
||||
@@ -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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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"
|
||||
|
||||
@@ -9,7 +9,7 @@ mkdir -p "$work/generated"
|
||||
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
--module-path "oqs=$root/build/packages/oqs/src" \
|
||||
-o "$work/generated" \
|
||||
"$root/src/storage/sync_crypto.zi" \
|
||||
"$root/src/storage/sync_account_crypto.zi" \
|
||||
@@ -40,7 +40,7 @@ mkdir -p "$work/generated"
|
||||
"$work/generated/storage/sync_crypto_chacha.c" \
|
||||
"$work/generated/storage/sync_account_encrypted.c" \
|
||||
"$work/generated/byte_text_linux.c" \
|
||||
"$work/generated/oqs.c" \
|
||||
"$work/generated/Oqs.c" \
|
||||
"$work/generated/text_buffers.c" \
|
||||
"$liboqs" -lm -lpthread -o "$work/test"
|
||||
|
||||
|
||||
@@ -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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "oqs=$root/build/packages/oqs/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"
|
||||
|
||||
@@ -80,7 +80,7 @@ def build_probe(work, compiler, env):
|
||||
"--module-path", "build/packages/kss/src",
|
||||
"--module-path", "kryon=build/packages/kryon/src/ui",
|
||||
"--module-path", "build/packages/ziran/std",
|
||||
"--module-path", "build/packages/oqs/src",
|
||||
"--module-path", "oqs=build/packages/oqs/src",
|
||||
"--module-path", "build/packages/daochi-client",
|
||||
"-o", str(output), "tests/update_flow_probe.zi",
|
||||
], cwd=ROOT, check=True, env=env)
|
||||
|
||||
+9
-9
@@ -28,6 +28,14 @@
|
||||
"source": true,
|
||||
"url": "https://github.com/sqlite/sqlite.git"
|
||||
},
|
||||
{
|
||||
"commit": "1c4714bad445fe786dd9874943417feddb3461bb",
|
||||
"dependencies": {"liboqs": "p051fa9c56d0358ad"},
|
||||
"id": "p1b5dd8d89e3ab867",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/oqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "a2d6a5db8202c1468743cc8d1c90316cfeab2148",
|
||||
"dependencies": {},
|
||||
@@ -79,14 +87,6 @@
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "714f11106347d954e8903e88260d36c3044f9dd1",
|
||||
"dependencies": {"liboqs": "p051fa9c56d0358ad"},
|
||||
"id": "pfbeb8acb0fb12fb8",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/oqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "e1f07e615e9255a513dbb6d66e5e6e9d335ef690",
|
||||
"dependencies": {"kryon": "pe1833b296eb48392"},
|
||||
@@ -97,7 +97,7 @@
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p8120950c86e3937b", "kryon": "pe1833b296eb48392", "kss": "pfdf70946e0505dfe", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "oqs": "pfbeb8acb0fb12fb8", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
|
||||
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p8120950c86e3937b", "kryon": "pe1833b296eb48392", "kss": "pfdf70946e0505dfe", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "oqs": "p1b5dd8d89e3ab867", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
|
||||
"name": "Inbe"
|
||||
},
|
||||
"toolchain": {
|
||||
|
||||
Reference in new issue
Block a user