Skip to content

Commit b92453c

Browse files
authored
Merge pull request #2429 from zigtools/techatrix/config-manager
move configuration logic from Server.zig to main.zig and configuration.zig
2 parents 2765a6b + 64f0139 commit b92453c

File tree

15 files changed

+1041
-825
lines changed

15 files changed

+1041
-825
lines changed

build.zig

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,11 @@ pub fn build(b: *Build) !void {
160160
.version_data = version_data_module,
161161
});
162162

163+
const known_folders_module = b.dependency("known_folders", .{
164+
.target = release_target,
165+
.optimize = optimize,
166+
}).module("known-folders");
167+
163168
const exe_module = b.createModule(.{
164169
.root_source_file = b.path("src/main.zig"),
165170
.target = release_target,
@@ -169,7 +174,7 @@ pub fn build(b: *Build) !void {
169174
.strip = strip,
170175
.imports = &.{
171176
.{ .name = "exe_options", .module = exe_options },
172-
.{ .name = "known-folders", .module = zls_release_module.import_table.get("known-folders").? },
177+
.{ .name = "known-folders", .module = known_folders_module },
173178
.{ .name = "tracy", .module = zls_release_module.import_table.get("tracy").? },
174179
.{ .name = "zls", .module = zls_release_module },
175180
},
@@ -196,6 +201,11 @@ pub fn build(b: *Build) !void {
196201
.version_data = version_data_module,
197202
});
198203

204+
const known_folders_module = b.dependency("known_folders", .{
205+
.target = target,
206+
.optimize = optimize,
207+
}).module("known-folders");
208+
199209
const exe_module = b.createModule(.{
200210
.root_source_file = b.path("src/main.zig"),
201211
.target = target,
@@ -205,7 +215,7 @@ pub fn build(b: *Build) !void {
205215
.strip = strip,
206216
.imports = &.{
207217
.{ .name = "exe_options", .module = exe_options },
208-
.{ .name = "known-folders", .module = zls_module.import_table.get("known-folders").? },
218+
.{ .name = "known-folders", .module = known_folders_module },
209219
.{ .name = "tracy", .module = zls_module.import_table.get("tracy").? },
210220
.{ .name = "zls", .module = zls_module },
211221
},
@@ -405,10 +415,6 @@ fn createZLSModule(
405415
version_data: *std.Build.Module,
406416
},
407417
) *std.Build.Module {
408-
const known_folders_module = b.dependency("known_folders", .{
409-
.target = options.target,
410-
.optimize = options.optimize,
411-
}).module("known-folders");
412418
const diffz_module = b.dependency("diffz", .{
413419
.target = options.target,
414420
.optimize = options.optimize,
@@ -429,7 +435,6 @@ fn createZLSModule(
429435
.target = options.target,
430436
.optimize = options.optimize,
431437
.imports = &.{
432-
.{ .name = "known-folders", .module = known_folders_module },
433438
.{ .name = "diffz", .module = diffz_module },
434439
.{ .name = "lsp", .module = lsp_module },
435440
.{ .name = "tracy", .module = tracy_module },

0 commit comments

Comments
 (0)