Compare commits

..

5 commits

Author SHA1 Message Date
09832b1d3e
Merge branch 'master' into zig-0.14 2025-03-05 11:03:51 +01:00
34afb46078
build: get tracy dependency indirectly from thespian 2025-03-05 11:02:18 +01:00
c7f8c1e6a5
build: update to zig-0.14 2025-03-05 11:00:29 +01:00
be06cb839f
Merge commit '77a69410b8' into zig-0.14 2025-03-05 10:44:47 +01:00
77a69410b8 Squashed 'src/syntax/' changes from ba10d896..d5c1cd2a
d5c1cd2a Merge branch 'master' into zig-0.14
6b4feb7d update dep hash
46cd19ca update to latest zig
7214ee0a refactor: run zig fmt
b2238178 Set php's default LSP to intelephense
8b3a5ac1 refactor: run zig fmt
942e8dfd Merge commit 'f3c35545e3ba6038460bab1d130be54eb1067a29' into zig-0.14
f3c35545 Merge branch 'master' into zig-0.14
28bc77f4 feat: add astro file type support
be80b598 refactor: run zig fmt
670aa9ae build: update to zig 0.14.0-dev.3039
f81314c1 feat: add .ref to diff file type extensions
01558741 feat: add sql file type support
942053ff add systemverilog lsp and formatter
3711541e anonymous struct do not coerce anymore since zig commit d11bbde
da812e05 fix(config): add gui_config to file_types
ec62f6c7 fix: build without tree-sitter
1226f473 add JuliaFormatter as julia formatter
bc723309 add rustfmt as rust formatter
e719a3b6 Merge branch 'master' into zig-0.14
65e5e6cc Merge branch 'master' into zig-0.14
231c5c1f Merge branch 'master' into zig-0.14
2a345ab7 Merge branch 'master' into zig-0.14
51e33d7b Merge pull request #3 from alichraghi/master
0b566414 update to latest zig

git-subtree-dir: src/syntax
git-subtree-split: d5c1cd2a328ec75fd9b0feddbc9eb84b5f590939
2025-03-05 10:43:03 +01:00
6 changed files with 24 additions and 25 deletions

View file

@ -31,7 +31,7 @@ Or check your favorite local system package repository.
Make sure your system meets the requirements listed above.
Flow builds with zig 0.14.0-dev.3091 at this time. Build with:
Flow builds with zig 0.14.0 at this time. Build with:
```shell
zig build -Doptimize=ReleaseSafe

View file

@ -206,7 +206,16 @@ pub fn build_exe(
.optimize = optimize,
});
const tracy_dep = if (tracy_enabled) b.dependency("tracy", .{
const thespian_dep = b.dependency("thespian", .{
.target = target,
.optimize = optimize_deps,
.enable_tracy = tracy_enabled,
});
const thespian_mod = thespian_dep.module("thespian");
const cbor_mod = thespian_dep.module("cbor");
const tracy_dep = if (tracy_enabled) thespian_dep.builder.dependency("tracy", .{
.target = target,
.optimize = optimize,
}) else undefined;
@ -234,15 +243,6 @@ pub fn build_exe(
});
const syntax_mod = syntax_dep.module("syntax");
const thespian_dep = b.dependency("thespian", .{
.target = target,
.optimize = optimize_deps,
.enable_tracy = tracy_enabled,
});
const thespian_mod = thespian_dep.module("thespian");
const cbor_mod = thespian_dep.module("cbor");
const help_mod = b.createModule(.{
.root_source_file = b.path("help.md"),
});

View file

@ -1 +1 @@
0.14.0-dev.3280+bbd13ab96
0.14.0

View file

@ -1,7 +1,8 @@
.{
.name = "flow",
.name = .flow,
.version = "0.2.0",
.minimum_zig_version = "0.14.0-dev.3091",
.minimum_zig_version = "0.14.0",
.fingerprint = 0x52c0d670590aa80f,
.dependencies = .{
.syntax = .{ .path = "src/syntax" },
@ -9,17 +10,13 @@
.url = "https://github.com/n0s4/flags/archive/372501d1576b5723829bcba98e41361132c7b618.tar.gz",
.hash = "1220ae181067a549c7a99cc0868193a7889b151381410419191ab1a79304f914336e",
},
.tracy = .{
.url = "https://github.com/neurocyte/zig-tracy/archive/e04e31c64498149a324491b8534758e6af43a5c2.tar.gz",
.hash = "1220d0fb2bff7b453dbb39d1db3eb472b6680e2564f2b23b0e947671be47bbdd188f",
},
.dizzy = .{
.url = "https://github.com/neurocyte/dizzy/archive/455d18369cbb2a0458ba70be919cd378338d695e.tar.gz",
.hash = "1220220dbc7fe91c1c54438193ca765cebbcb7d58f35cdcaee404a9d2245a42a4362",
},
.thespian = .{
.url = "https://github.com/neurocyte/thespian/archive/a3f0f5b089534a29f146768345eb32428f59f521.tar.gz",
.hash = "1220839522cd1d8b19c62488127f763a202c69b0ad629666280724902c23f10bd29f",
.url = "https://github.com/neurocyte/thespian/archive/78c9c1292c683478d8ac98d8318bc098442cc0b9.tar.gz",
.hash = "thespian-0.0.1-owFOjsnnBgBCsKhYw9XeHnQw0Um9SJQECEZ0aqomc04m",
},
.themes = .{
.url = "https://github.com/neurocyte/flow-themes/releases/download/master-59bf204551bcb238faddd06779063570e7e6d431/flow-themes.tar.gz",

View file

@ -9,7 +9,7 @@ pub fn build(b: *std.Build) void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});
const tree_sitter_dep = b.dependency("tree-sitter", .{
const tree_sitter_dep = b.dependency("tree_sitter", .{
.target = target,
.optimize = optimize,
});

View file

@ -1,11 +1,13 @@
.{
.name = "flow-syntax",
.version = "0.0.1",
.name = .flow_syntax,
.version = "0.1.0",
.fingerprint = 0x3ba2584ea1cec85f,
.minimum_zig_version = "0.14.0-dev.3451+d8d2aa9af",
.dependencies = .{
.@"tree-sitter" = .{
.tree_sitter = .{
.url = "https://github.com/neurocyte/tree-sitter/releases/download/master-86dd4d2536f2748c5b4ea0e1e70678039a569aac/source.tar.gz",
.hash = "1220e9fba96c468283129e977767472dee00b16f356e5912431cec8f1a009b6691a2",
.hash = "N-V-__8AACablCbp-6lsRoKDEp6Xd2dHLe4AsW81blkSQxzs",
},
},
.paths = .{