Commit d6a1a0803f6a9ecace8ff0c23d4ad54f65670bde | ix

author	dave caruso <me@paperdave.net> 2024-07-23 04:56:31-07:00
committer	dave caruso <me@paperdave.net> 2024-07-23 04:56:31-07:00
log	d6a1a0803f6a9ecace8ff0c23d4ad54f65670bde
tree	67bf454bec8ab9668743242692d63c2b578b39b2
parent	7514b71286a8659c2917b78acf7f36b5da7e9657
signature	Commit is signed but in an unrecognized format.

add automatic version detection from changelog

4 files changed, 32 insertions(+), 9 deletions(-)

CHANGELOG.md
build.zig
src
- core
  - js
    Link.zig
  - mod.zig

CHANGELOG.md+2

...	@@ -1,3 +1,5 @@	...	@@ -1,3 +1,5 @@
		1	## 0.1.5
		2
1	## 0.1.4	3	## 0.1.4
2		4
3	- feat: implement basic struct types (#42)	5	- feat: implement basic struct types (#42)

build.zig+18-4

 @@ -3,7 +3,7 @@ const Build = std.Build;
 const Target = std.Target;
 const OsVersion = Target.Query.OsVersion;
-pub fn build(b: *std.Build) void {
+pub fn build(b: *std.Build) !void {
     b.reference_trace = 20;
     const native_target = b.resolveTargetQuery(.{});
 @@ -40,8 +40,20 @@ pub fn build(b: *std.Build) void {
         "Experiment with the Zig self-hosted backends",
     ) orelse false;
-    const native_debug = buildWithTarget(b, native_target, .Debug, .none, no_llvm);
+    const version = version: {
-    const main = buildWithTarget(b, target, optimize, tracing, no_llvm);
+        const text = try b.build_root.handle.readFileAlloc(
+            b.graph.arena,
+            "CHANGELOG.md",
+            std.math.maxInt(usize),
+        );
+        const first_header = std.mem.indexOf(u8, text, "## ") orelse unreachable;
+        var tokenizer = std.mem.tokenizeAny(u8, text[first_header + 2 ..], " \t\n");
+        const version_text = tokenizer.next() orelse unreachable;
+        break :version std.SemanticVersion.parse(version_text) catch unreachable;
+    };
+    const native_debug = buildWithTarget(b, native_target, .Debug, .none, version, no_llvm);
+    const main = buildWithTarget(b, target, optimize, tracing, version, no_llvm);
     b.installArtifact(main.compiler);
 @@ -133,7 +145,7 @@ pub fn build(b: *std.Build) void {
             },
         ) catch @panic("OOM");
-        const artifacts = buildWithTarget(b, cross_target, .ReleaseSafe, .none, no_llvm);
+        const artifacts = buildWithTarget(b, cross_target, .ReleaseSafe, .none, version, no_llvm);
         inline for (.{
             .{ artifacts.compiler, "compiler" },
 @@ -173,6 +185,7 @@ fn buildWithTarget(
     target: Build.ResolvedTarget,
     optimize: std.builtin.OptimizeMode,
     tracing: TracingMode,
+    version: std.SemanticVersion,
     no_llvm: bool,
 ) Artifacts {
     const dep_opts = .{ .target = target, .optimize = optimize };
 @@ -185,6 +198,7 @@ fn buildWithTarget(
     // Options
     const opts = b.addOptions();
+    opts.addOption(std.SemanticVersion, "version", version);
     opts.addOption([]const u8, "tracing", @tagName(tracing));
     const opts_mod = opts.createModule();

src/core/js/Link.zig+9-5

 @@ -70,7 +70,10 @@ pub fn linkJsCode(link: *Link, entry_decl: Decl.Index, writer: Writer) !void {
         try link.decls.putNoClobber(link.comp.gpa, value, @enumFromInt(gop.index));
     }
-    try writer.print("// Language Compiler v0.1.4. Alpha quality software.\n", .{});
+    try writer.writeAll(std.fmt.comptimePrint(
+        "// Language Compiler v{}. Alpha quality software.\n",
+        .{core.version},
+    ));
     if (root_function.nodes.len > 1) {
         // 2. Print every function decl
 @@ -843,14 +846,15 @@ const Wyhash = std.hash.Wyhash;
 const log = std.log.scoped(.js_link);
 const Writer = std.io.AnyWriter;
-const Comp = @import("../Comp.zig");
+const core = @import("../mod.zig");
+const Comp = core.Comp;
 const Decl = Comp.Decl;
-const Js = @import("Js.zig");
+const Js = core.Js;
-const Tree = @import("Tree.zig");
+const Tree = Js.Tree;
 const Node = Tree.Node;
-const InternPool = @import("../InternPool.zig");
+const InternPool = core.InternPool;
 const String = InternPool.String;
 const tracer = @import("tracer");

src/core/mod.zig+3

...	@@ -48,6 +48,9 @@ pub const unicode_props = @import("unicode_props.zig");	...	@@ -48,6 +48,9 @@ pub const unicode_props = @import("unicode_props.zig");
48	// The rest of this file is utility functions, which are not specific to any of	48	// The rest of this file is utility functions, which are not specific to any of
49	// the above namespaces. Remember Zig discourages namespaces like `utils`	49	// the above namespaces. Remember Zig discourages namespaces like `utils`
50		50
		51	/// Language SDK version according to the latest entry in `CHANGELOG.md`
		52	pub const version = @import("build_options").version;
		53
51	/// This is an alternative to `std.debug.assert`, where you want to print some	54	/// This is an alternative to `std.debug.assert`, where you want to print some
52	/// debug info instead of "reached unreachable code". Usage is as follows:	55	/// debug info instead of "reached unreachable code". Usage is as follows:
53	///	56	///