2019-03-02 21:46:04 +00:00
|
|
|
const std = @import("std.zig");
|
2017-05-01 17:12:38 +00:00
|
|
|
const builtin = @import("builtin");
|
2017-10-31 08:47:55 +00:00
|
|
|
const io = std.io;
|
2019-05-26 17:17:34 +00:00
|
|
|
const fs = std.fs;
|
2017-10-31 08:47:55 +00:00
|
|
|
const mem = std.mem;
|
|
|
|
const debug = std.debug;
|
2019-09-03 20:19:10 +00:00
|
|
|
const panic = std.debug.panic;
|
2017-04-13 21:21:00 +00:00
|
|
|
const assert = debug.assert;
|
2017-10-31 08:47:55 +00:00
|
|
|
const warn = std.debug.warn;
|
|
|
|
const ArrayList = std.ArrayList;
|
2019-09-03 21:53:05 +00:00
|
|
|
const StringHashMap = std.StringHashMap;
|
2017-10-31 08:47:55 +00:00
|
|
|
const Allocator = mem.Allocator;
|
2019-05-26 17:17:34 +00:00
|
|
|
const process = std.process;
|
2017-10-31 08:47:55 +00:00
|
|
|
const BufSet = std.BufSet;
|
|
|
|
const BufMap = std.BufMap;
|
|
|
|
const fmt_lib = std.fmt;
|
2019-05-25 02:52:07 +00:00
|
|
|
const File = std.fs.File;
|
2017-03-31 09:48:15 +00:00
|
|
|
|
2019-02-26 23:10:40 +00:00
|
|
|
pub const FmtStep = @import("build/fmt.zig").FmtStep;
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const Builder = struct {
|
2017-05-01 01:03:23 +00:00
|
|
|
install_tls: TopLevelStep,
|
2019-07-04 19:32:44 +00:00
|
|
|
uninstall_tls: TopLevelStep,
|
2018-05-31 14:56:59 +00:00
|
|
|
allocator: *Allocator,
|
2019-03-11 19:22:05 +00:00
|
|
|
native_system_lib_paths: ArrayList([]const u8),
|
|
|
|
native_system_include_dirs: ArrayList([]const u8),
|
|
|
|
native_system_rpaths: ArrayList([]const u8),
|
2017-04-06 09:34:04 +00:00
|
|
|
user_input_options: UserInputOptionsMap,
|
|
|
|
available_options_map: AvailableOptionsMap,
|
2017-05-04 18:05:06 +00:00
|
|
|
available_options_list: ArrayList(AvailableOption),
|
2017-04-06 09:34:04 +00:00
|
|
|
verbose: bool,
|
2017-10-26 03:10:41 +00:00
|
|
|
verbose_tokenize: bool,
|
|
|
|
verbose_ast: bool,
|
|
|
|
verbose_link: bool,
|
2019-02-25 16:37:54 +00:00
|
|
|
verbose_cc: bool,
|
2017-10-26 03:10:41 +00:00
|
|
|
verbose_ir: bool,
|
|
|
|
verbose_llvm_ir: bool,
|
|
|
|
verbose_cimport: bool,
|
2017-04-06 09:34:04 +00:00
|
|
|
invalid_user_input: bool,
|
2017-04-13 21:21:00 +00:00
|
|
|
zig_exe: []const u8,
|
2018-05-31 14:56:59 +00:00
|
|
|
default_step: *Step,
|
2018-11-08 02:22:42 +00:00
|
|
|
env_map: *BufMap,
|
2018-05-31 14:56:59 +00:00
|
|
|
top_level_steps: ArrayList(*TopLevelStep),
|
2019-07-04 19:32:44 +00:00
|
|
|
install_prefix: ?[]const u8,
|
2019-07-21 22:04:23 +00:00
|
|
|
dest_dir: ?[]const u8,
|
2019-09-03 20:19:10 +00:00
|
|
|
lib_dir: []const u8,
|
|
|
|
exe_dir: []const u8,
|
2019-07-22 14:45:59 +00:00
|
|
|
install_path: []const u8,
|
2019-07-21 22:04:23 +00:00
|
|
|
search_prefixes: ArrayList([]const u8),
|
2019-07-04 19:32:44 +00:00
|
|
|
installed_files: ArrayList(InstalledFile),
|
2017-04-19 05:13:15 +00:00
|
|
|
build_root: []const u8,
|
2017-04-28 06:22:12 +00:00
|
|
|
cache_root: []const u8,
|
2017-05-10 01:20:09 +00:00
|
|
|
release_mode: ?builtin.Mode,
|
2019-07-04 19:32:44 +00:00
|
|
|
is_release: bool,
|
stage1 is now a hybrid of C++ and Zig
This modifies the build process of Zig to put all of the source files
into libcompiler.a, except main.cpp and userland.cpp.
Next, the build process links main.cpp, userland.cpp, and libcompiler.a
into zig1. userland.cpp is a shim for functions that will later be
replaced with self-hosted implementations.
Next, the build process uses zig1 to build src-self-hosted/stage1.zig
into libuserland.a, which does not depend on any of the things that
are shimmed in userland.cpp, such as translate-c.
Finally, the build process re-links main.cpp and libcompiler.a, except
with libuserland.a instead of userland.cpp. Now the shims are replaced
with .zig code. This provides all of the Zig standard library to the
stage1 C++ compiler, and enables us to move certain things to userland,
such as translate-c.
As a proof of concept I have made the `zig zen` command use text defined
in userland. I added `zig translate-c-2` which is a work-in-progress
reimplementation of translate-c in userland, which currently calls
`std.debug.panic("unimplemented")` and you can see the stack trace makes
it all the way back into the C++ main() function (Thanks LemonBoy for
improving that!).
This could potentially let us move other things into userland, such as
hashing algorithms, the entire cache system, .d file parsing, pretty
much anything that libuserland.a itself doesn't need to depend on.
This can also let us have `zig fmt` in stage1 without the overhead
of child process execution, and without the initial compilation delay
before it gets cached.
See #1964
2019-04-16 20:47:47 +00:00
|
|
|
override_lib_dir: ?[]const u8,
|
2019-10-10 19:58:47 +00:00
|
|
|
vcpkg_root: VcpkgRoot,
|
2019-09-23 17:33:43 +00:00
|
|
|
pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null,
|
|
|
|
|
|
|
|
const PkgConfigError = error{
|
|
|
|
PkgConfigCrashed,
|
|
|
|
PkgConfigFailed,
|
|
|
|
PkgConfigNotInstalled,
|
|
|
|
PkgConfigInvalidOutput,
|
|
|
|
};
|
|
|
|
|
|
|
|
pub const PkgConfigPkg = struct {
|
|
|
|
name: []const u8,
|
|
|
|
desc: []const u8,
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const CStd = enum {
|
2018-09-06 20:29:35 +00:00
|
|
|
C89,
|
|
|
|
C99,
|
|
|
|
C11,
|
|
|
|
};
|
|
|
|
|
2019-09-03 21:53:05 +00:00
|
|
|
const UserInputOptionsMap = StringHashMap(UserInputOption);
|
|
|
|
const AvailableOptionsMap = StringHashMap(AvailableOption);
|
2017-04-06 09:34:04 +00:00
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const AvailableOption = struct {
|
2017-04-06 09:34:04 +00:00
|
|
|
name: []const u8,
|
|
|
|
type_id: TypeId,
|
|
|
|
description: []const u8,
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const UserInputOption = struct {
|
2017-04-06 09:34:04 +00:00
|
|
|
name: []const u8,
|
|
|
|
value: UserValue,
|
|
|
|
used: bool,
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const UserValue = union(enum) {
|
2017-12-04 01:43:56 +00:00
|
|
|
Flag: void,
|
2017-04-06 09:34:04 +00:00
|
|
|
Scalar: []const u8,
|
2017-05-04 18:05:06 +00:00
|
|
|
List: ArrayList([]const u8),
|
2017-04-06 09:34:04 +00:00
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const TypeId = enum {
|
2017-04-06 09:34:04 +00:00
|
|
|
Bool,
|
|
|
|
Int,
|
|
|
|
Float,
|
|
|
|
String,
|
|
|
|
List,
|
|
|
|
};
|
2017-03-31 09:48:15 +00:00
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const TopLevelStep = struct {
|
2017-04-13 21:21:00 +00:00
|
|
|
step: Step,
|
|
|
|
description: []const u8,
|
|
|
|
};
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
pub fn create(
|
|
|
|
allocator: *Allocator,
|
|
|
|
zig_exe: []const u8,
|
|
|
|
build_root: []const u8,
|
|
|
|
cache_root: []const u8,
|
|
|
|
) !*Builder {
|
|
|
|
const env_map = try allocator.create(BufMap);
|
|
|
|
env_map.* = try process.getEnvMap(allocator);
|
|
|
|
|
|
|
|
const self = try allocator.create(Builder);
|
|
|
|
self.* = Builder{
|
2017-04-19 05:13:15 +00:00
|
|
|
.zig_exe = zig_exe,
|
|
|
|
.build_root = build_root,
|
2019-07-04 19:32:44 +00:00
|
|
|
.cache_root = try fs.path.relative(allocator, build_root, cache_root),
|
2017-04-06 09:34:04 +00:00
|
|
|
.verbose = false,
|
2017-10-26 03:10:41 +00:00
|
|
|
.verbose_tokenize = false,
|
|
|
|
.verbose_ast = false,
|
|
|
|
.verbose_link = false,
|
2019-02-25 16:37:54 +00:00
|
|
|
.verbose_cc = false,
|
2017-10-26 03:10:41 +00:00
|
|
|
.verbose_ir = false,
|
|
|
|
.verbose_llvm_ir = false,
|
|
|
|
.verbose_cimport = false,
|
2017-04-06 09:34:04 +00:00
|
|
|
.invalid_user_input = false,
|
2017-03-31 09:48:15 +00:00
|
|
|
.allocator = allocator,
|
2019-03-11 19:22:05 +00:00
|
|
|
.native_system_lib_paths = ArrayList([]const u8).init(allocator),
|
|
|
|
.native_system_include_dirs = ArrayList([]const u8).init(allocator),
|
|
|
|
.native_system_rpaths = ArrayList([]const u8).init(allocator),
|
2017-04-06 09:34:04 +00:00
|
|
|
.user_input_options = UserInputOptionsMap.init(allocator),
|
|
|
|
.available_options_map = AvailableOptionsMap.init(allocator),
|
2017-05-04 18:05:06 +00:00
|
|
|
.available_options_list = ArrayList(AvailableOption).init(allocator),
|
2018-05-31 14:56:59 +00:00
|
|
|
.top_level_steps = ArrayList(*TopLevelStep).init(allocator),
|
2017-04-13 21:21:00 +00:00
|
|
|
.default_step = undefined,
|
2018-10-15 22:23:47 +00:00
|
|
|
.env_map = env_map,
|
2017-12-24 01:21:57 +00:00
|
|
|
.search_prefixes = ArrayList([]const u8).init(allocator),
|
2019-07-21 22:04:23 +00:00
|
|
|
.install_prefix = null,
|
2019-09-03 20:19:10 +00:00
|
|
|
.lib_dir = undefined,
|
|
|
|
.exe_dir = undefined,
|
2019-07-21 22:04:23 +00:00
|
|
|
.dest_dir = env_map.get("DESTDIR"),
|
2019-07-04 19:32:44 +00:00
|
|
|
.installed_files = ArrayList(InstalledFile).init(allocator),
|
2018-11-13 13:08:37 +00:00
|
|
|
.install_tls = TopLevelStep{
|
2017-05-01 01:03:23 +00:00
|
|
|
.step = Step.initNoOp("install", allocator),
|
|
|
|
.description = "Copy build artifacts to prefix path",
|
|
|
|
},
|
2019-07-04 19:32:44 +00:00
|
|
|
.uninstall_tls = TopLevelStep{
|
|
|
|
.step = Step.init("uninstall", allocator, makeUninstall),
|
|
|
|
.description = "Remove build artifacts from prefix path",
|
|
|
|
},
|
2017-05-10 01:20:09 +00:00
|
|
|
.release_mode = null,
|
2019-07-04 19:32:44 +00:00
|
|
|
.is_release = false,
|
stage1 is now a hybrid of C++ and Zig
This modifies the build process of Zig to put all of the source files
into libcompiler.a, except main.cpp and userland.cpp.
Next, the build process links main.cpp, userland.cpp, and libcompiler.a
into zig1. userland.cpp is a shim for functions that will later be
replaced with self-hosted implementations.
Next, the build process uses zig1 to build src-self-hosted/stage1.zig
into libuserland.a, which does not depend on any of the things that
are shimmed in userland.cpp, such as translate-c.
Finally, the build process re-links main.cpp and libcompiler.a, except
with libuserland.a instead of userland.cpp. Now the shims are replaced
with .zig code. This provides all of the Zig standard library to the
stage1 C++ compiler, and enables us to move certain things to userland,
such as translate-c.
As a proof of concept I have made the `zig zen` command use text defined
in userland. I added `zig translate-c-2` which is a work-in-progress
reimplementation of translate-c in userland, which currently calls
`std.debug.panic("unimplemented")` and you can see the stack trace makes
it all the way back into the C++ main() function (Thanks LemonBoy for
improving that!).
This could potentially let us move other things into userland, such as
hashing algorithms, the entire cache system, .d file parsing, pretty
much anything that libuserland.a itself doesn't need to depend on.
This can also let us have `zig fmt` in stage1 without the overhead
of child process execution, and without the initial compilation delay
before it gets cached.
See #1964
2019-04-16 20:47:47 +00:00
|
|
|
.override_lib_dir = null,
|
2019-07-22 14:45:59 +00:00
|
|
|
.install_path = undefined,
|
2019-10-10 19:58:47 +00:00
|
|
|
.vcpkg_root = VcpkgRoot{ .Unattempted = {} },
|
2017-04-04 05:52:20 +00:00
|
|
|
};
|
2019-07-04 19:32:44 +00:00
|
|
|
try self.top_level_steps.append(&self.install_tls);
|
|
|
|
try self.top_level_steps.append(&self.uninstall_tls);
|
2019-03-11 19:22:05 +00:00
|
|
|
self.detectNativeSystemPaths();
|
2019-07-04 19:32:44 +00:00
|
|
|
self.default_step = &self.install_tls.step;
|
2017-04-04 05:52:20 +00:00
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
pub fn destroy(self: *Builder) void {
|
2019-03-11 19:22:05 +00:00
|
|
|
self.native_system_lib_paths.deinit();
|
|
|
|
self.native_system_include_dirs.deinit();
|
|
|
|
self.native_system_rpaths.deinit();
|
2017-04-13 21:21:00 +00:00
|
|
|
self.env_map.deinit();
|
|
|
|
self.top_level_steps.deinit();
|
2019-07-04 19:32:44 +00:00
|
|
|
self.allocator.destroy(self);
|
2017-03-31 09:48:15 +00:00
|
|
|
}
|
|
|
|
|
2019-09-03 20:19:10 +00:00
|
|
|
/// This function is intended to be called by std/special/build_runner.zig, not a build.zig file.
|
2019-07-04 19:32:44 +00:00
|
|
|
pub fn setInstallPrefix(self: *Builder, optional_prefix: ?[]const u8) void {
|
|
|
|
self.install_prefix = optional_prefix;
|
|
|
|
}
|
|
|
|
|
2019-09-03 20:19:10 +00:00
|
|
|
/// This function is intended to be called by std/special/build_runner.zig, not a build.zig file.
|
|
|
|
pub fn resolveInstallPrefix(self: *Builder) void {
|
2019-07-22 14:45:59 +00:00
|
|
|
if (self.dest_dir) |dest_dir| {
|
|
|
|
const install_prefix = self.install_prefix orelse "/usr";
|
|
|
|
self.install_path = fs.path.join(self.allocator, [_][]const u8{ dest_dir, install_prefix }) catch unreachable;
|
|
|
|
} else {
|
|
|
|
const install_prefix = self.install_prefix orelse blk: {
|
|
|
|
const p = self.cache_root;
|
|
|
|
self.install_prefix = p;
|
|
|
|
break :blk p;
|
|
|
|
};
|
|
|
|
self.install_path = install_prefix;
|
|
|
|
}
|
|
|
|
self.lib_dir = fs.path.join(self.allocator, [_][]const u8{ self.install_path, "lib" }) catch unreachable;
|
|
|
|
self.exe_dir = fs.path.join(self.allocator, [_][]const u8{ self.install_path, "bin" }) catch unreachable;
|
2017-03-31 09:48:15 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addExecutable(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep {
|
2018-12-01 06:21:59 +00:00
|
|
|
return LibExeObjStep.createExecutable(self, name, root_src, false);
|
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
pub fn addObject(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep {
|
2017-04-26 23:17:05 +00:00
|
|
|
return LibExeObjStep.createObject(self, name, root_src);
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
|
2018-10-15 22:23:47 +00:00
|
|
|
pub fn addSharedLibrary(self: *Builder, name: []const u8, root_src: ?[]const u8, ver: Version) *LibExeObjStep {
|
2017-04-26 23:17:05 +00:00
|
|
|
return LibExeObjStep.createSharedLibrary(self, name, root_src, ver);
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addStaticLibrary(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep {
|
2017-04-26 23:17:05 +00:00
|
|
|
return LibExeObjStep.createStaticLibrary(self, name, root_src);
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
pub fn addTest(self: *Builder, root_src: []const u8) *LibExeObjStep {
|
|
|
|
return LibExeObjStep.createTest(self, "test", root_src);
|
2017-04-19 05:13:15 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addAssemble(self: *Builder, name: []const u8, src: []const u8) *LibExeObjStep {
|
2017-04-26 23:17:05 +00:00
|
|
|
const obj_step = LibExeObjStep.createObject(self, name, null);
|
|
|
|
obj_step.addAssemblyFile(src);
|
|
|
|
return obj_step;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
/// Initializes a RunStep with argv, which must at least have the path to the
|
|
|
|
/// executable. More command line arguments can be added with `addArg`,
|
|
|
|
/// `addArgs`, and `addArtifactArg`.
|
|
|
|
/// Be careful using this function, as it introduces a system dependency.
|
|
|
|
/// To run an executable built with zig build, see `LibExeObjStep.run`.
|
|
|
|
pub fn addSystemCommand(self: *Builder, argv: []const []const u8) *RunStep {
|
|
|
|
assert(argv.len >= 1);
|
|
|
|
const run_step = RunStep.create(self, self.fmt("run {}", argv[0]));
|
|
|
|
run_step.addArgs(argv);
|
|
|
|
return run_step;
|
|
|
|
}
|
|
|
|
|
|
|
|
fn dupe(self: *Builder, bytes: []const u8) []u8 {
|
|
|
|
return mem.dupe(self.allocator, u8, bytes) catch unreachable;
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
|
|
|
|
2019-07-15 05:41:06 +00:00
|
|
|
fn dupePath(self: *Builder, bytes: []const u8) []u8 {
|
|
|
|
const the_copy = self.dupe(bytes);
|
|
|
|
for (the_copy) |*byte| {
|
|
|
|
switch (byte.*) {
|
|
|
|
'/', '\\' => byte.* = fs.path.sep,
|
|
|
|
else => {},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return the_copy;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addWriteFile(self: *Builder, file_path: []const u8, data: []const u8) *WriteFileStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const write_file_step = self.allocator.create(WriteFileStep) catch unreachable;
|
|
|
|
write_file_step.* = WriteFileStep.init(self, file_path, data);
|
2017-04-19 05:13:15 +00:00
|
|
|
return write_file_step;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addLog(self: *Builder, comptime format: []const u8, args: ...) *LogStep {
|
2017-04-19 19:38:12 +00:00
|
|
|
const data = self.fmt(format, args);
|
2019-02-03 21:13:28 +00:00
|
|
|
const log_step = self.allocator.create(LogStep) catch unreachable;
|
|
|
|
log_step.* = LogStep.init(self, data);
|
2017-04-19 05:13:15 +00:00
|
|
|
return log_step;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addRemoveDirTree(self: *Builder, dir_path: []const u8) *RemoveDirStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const remove_dir_step = self.allocator.create(RemoveDirStep) catch unreachable;
|
|
|
|
remove_dir_step.* = RemoveDirStep.init(self, dir_path);
|
2017-04-20 06:26:36 +00:00
|
|
|
return remove_dir_step;
|
|
|
|
}
|
|
|
|
|
2019-02-26 23:10:40 +00:00
|
|
|
pub fn addFmt(self: *Builder, paths: []const []const u8) *FmtStep {
|
|
|
|
return FmtStep.create(self, paths);
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn version(self: *const Builder, major: u32, minor: u32, patch: u32) Version {
|
2018-11-13 13:08:37 +00:00
|
|
|
return Version{
|
2017-04-13 21:21:00 +00:00
|
|
|
.major = major,
|
|
|
|
.minor = minor,
|
|
|
|
.patch = patch,
|
2017-12-22 05:50:30 +00:00
|
|
|
};
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
|
|
|
|
2019-03-11 19:22:05 +00:00
|
|
|
pub fn addNativeSystemIncludeDir(self: *Builder, path: []const u8) void {
|
|
|
|
self.native_system_include_dirs.append(path) catch unreachable;
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
|
|
|
|
2019-03-11 19:22:05 +00:00
|
|
|
pub fn addNativeSystemRPath(self: *Builder, path: []const u8) void {
|
|
|
|
self.native_system_rpaths.append(path) catch unreachable;
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
|
|
|
|
2019-03-11 19:22:05 +00:00
|
|
|
pub fn addNativeSystemLibPath(self: *Builder, path: []const u8) void {
|
|
|
|
self.native_system_lib_paths.append(path) catch unreachable;
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn make(self: *Builder, step_names: []const []const u8) !void {
|
2018-09-11 22:15:08 +00:00
|
|
|
try self.makePath(self.cache_root);
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
var wanted_steps = ArrayList(*Step).init(self.allocator);
|
2017-04-13 21:21:00 +00:00
|
|
|
defer wanted_steps.deinit();
|
2017-04-03 08:58:19 +00:00
|
|
|
|
2017-04-13 21:21:00 +00:00
|
|
|
if (step_names.len == 0) {
|
2018-06-15 17:49:39 +00:00
|
|
|
try wanted_steps.append(self.default_step);
|
2017-04-13 21:21:00 +00:00
|
|
|
} else {
|
|
|
|
for (step_names) |step_name| {
|
2018-01-07 21:51:46 +00:00
|
|
|
const s = try self.getTopLevelStepByName(step_name);
|
2018-01-15 05:01:02 +00:00
|
|
|
try wanted_steps.append(s);
|
2017-04-06 09:34:04 +00:00
|
|
|
}
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
2017-04-06 09:34:04 +00:00
|
|
|
|
2017-04-13 21:21:00 +00:00
|
|
|
for (wanted_steps.toSliceConst()) |s| {
|
2018-01-07 21:51:46 +00:00
|
|
|
try self.makeOneStep(s);
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
|
|
|
}
|
2017-04-03 08:58:19 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn getInstallStep(self: *Builder) *Step {
|
2017-05-01 01:03:23 +00:00
|
|
|
return &self.install_tls.step;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn getUninstallStep(self: *Builder) *Step {
|
2017-04-17 10:45:44 +00:00
|
|
|
return &self.uninstall_tls.step;
|
|
|
|
}
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
fn makeUninstall(uninstall_step: *Step) anyerror!void {
|
2017-04-19 05:13:15 +00:00
|
|
|
const uninstall_tls = @fieldParentPtr(TopLevelStep, "step", uninstall_step);
|
|
|
|
const self = @fieldParentPtr(Builder, "uninstall_tls", uninstall_tls);
|
2017-04-17 10:45:44 +00:00
|
|
|
|
|
|
|
for (self.installed_files.toSliceConst()) |installed_file| {
|
2019-07-04 19:32:44 +00:00
|
|
|
const full_path = self.getInstallPath(installed_file.dir, installed_file.path);
|
2017-05-01 01:03:23 +00:00
|
|
|
if (self.verbose) {
|
2019-07-04 19:32:44 +00:00
|
|
|
warn("rm {}\n", full_path);
|
2017-05-01 01:03:23 +00:00
|
|
|
}
|
2019-09-19 06:56:45 +00:00
|
|
|
fs.deleteTree(full_path) catch {};
|
2017-04-17 10:45:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// TODO remove empty directories
|
|
|
|
}
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
fn makeOneStep(self: *Builder, s: *Step) anyerror!void {
|
2017-04-13 21:21:00 +00:00
|
|
|
if (s.loop_flag) {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Dependency loop detected:\n {}\n", s.name);
|
2017-04-13 21:21:00 +00:00
|
|
|
return error.DependencyLoopDetected;
|
|
|
|
}
|
|
|
|
s.loop_flag = true;
|
2017-04-03 08:58:19 +00:00
|
|
|
|
2017-04-13 21:21:00 +00:00
|
|
|
for (s.dependencies.toSlice()) |dep| {
|
2018-01-07 22:28:20 +00:00
|
|
|
self.makeOneStep(dep) catch |err| {
|
2017-04-13 21:21:00 +00:00
|
|
|
if (err == error.DependencyLoopDetected) {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn(" {}\n", s.name);
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
2017-04-13 21:21:00 +00:00
|
|
|
return err;
|
|
|
|
};
|
|
|
|
}
|
2017-04-04 05:52:20 +00:00
|
|
|
|
2017-04-13 21:21:00 +00:00
|
|
|
s.loop_flag = false;
|
2017-04-04 05:52:20 +00:00
|
|
|
|
2018-01-07 21:51:46 +00:00
|
|
|
try s.make();
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
2017-04-04 05:52:20 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn getTopLevelStepByName(self: *Builder, name: []const u8) !*Step {
|
2017-04-13 21:21:00 +00:00
|
|
|
for (self.top_level_steps.toSliceConst()) |top_level_step| {
|
|
|
|
if (mem.eql(u8, top_level_step.step.name, name)) {
|
|
|
|
return &top_level_step.step;
|
2017-04-06 09:34:04 +00:00
|
|
|
}
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Cannot run step '{}' because it does not exist\n", name);
|
2017-04-13 21:21:00 +00:00
|
|
|
return error.InvalidStepName;
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
|
|
|
|
2019-03-11 19:22:05 +00:00
|
|
|
fn detectNativeSystemPaths(self: *Builder) void {
|
|
|
|
var is_nixos = false;
|
2019-05-26 17:17:34 +00:00
|
|
|
if (process.getEnvVarOwned(self.allocator, "NIX_CFLAGS_COMPILE")) |nix_cflags_compile| {
|
2019-03-11 19:22:05 +00:00
|
|
|
is_nixos = true;
|
2019-02-04 20:24:06 +00:00
|
|
|
var it = mem.tokenize(nix_cflags_compile, " ");
|
2017-04-04 05:52:20 +00:00
|
|
|
while (true) {
|
2018-06-10 05:13:51 +00:00
|
|
|
const word = it.next() orelse break;
|
2017-04-04 05:52:20 +00:00
|
|
|
if (mem.eql(u8, word, "-isystem")) {
|
2018-06-10 05:13:51 +00:00
|
|
|
const include_path = it.next() orelse {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Expected argument after -isystem in NIX_CFLAGS_COMPILE\n");
|
2017-04-04 05:52:20 +00:00
|
|
|
break;
|
|
|
|
};
|
2019-03-11 19:22:05 +00:00
|
|
|
self.addNativeSystemIncludeDir(include_path);
|
2017-04-04 05:52:20 +00:00
|
|
|
} else {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Unrecognized C flag from NIX_CFLAGS_COMPILE: {}\n", word);
|
2017-04-04 05:52:20 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2017-10-15 05:23:10 +00:00
|
|
|
} else |err| {
|
|
|
|
assert(err == error.EnvironmentVariableNotFound);
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
2019-05-26 17:17:34 +00:00
|
|
|
if (process.getEnvVarOwned(self.allocator, "NIX_LDFLAGS")) |nix_ldflags| {
|
2019-03-11 19:22:05 +00:00
|
|
|
is_nixos = true;
|
2019-02-04 20:24:06 +00:00
|
|
|
var it = mem.tokenize(nix_ldflags, " ");
|
2017-04-04 05:52:20 +00:00
|
|
|
while (true) {
|
2018-06-10 05:13:51 +00:00
|
|
|
const word = it.next() orelse break;
|
2017-04-04 05:52:20 +00:00
|
|
|
if (mem.eql(u8, word, "-rpath")) {
|
2018-06-10 05:13:51 +00:00
|
|
|
const rpath = it.next() orelse {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Expected argument after -rpath in NIX_LDFLAGS\n");
|
2017-04-04 05:52:20 +00:00
|
|
|
break;
|
|
|
|
};
|
2019-03-11 19:22:05 +00:00
|
|
|
self.addNativeSystemRPath(rpath);
|
2017-04-04 05:52:20 +00:00
|
|
|
} else if (word.len > 2 and word[0] == '-' and word[1] == 'L') {
|
2017-05-19 14:39:59 +00:00
|
|
|
const lib_path = word[2..];
|
2019-03-11 19:22:05 +00:00
|
|
|
self.addNativeSystemLibPath(lib_path);
|
2017-04-04 05:52:20 +00:00
|
|
|
} else {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Unrecognized C flag from NIX_LDFLAGS: {}\n", word);
|
2017-04-04 05:52:20 +00:00
|
|
|
break;
|
|
|
|
}
|
2017-04-02 22:19:59 +00:00
|
|
|
}
|
2017-10-15 05:23:10 +00:00
|
|
|
} else |err| {
|
|
|
|
assert(err == error.EnvironmentVariableNotFound);
|
2017-03-31 09:48:15 +00:00
|
|
|
}
|
2019-03-11 19:22:05 +00:00
|
|
|
if (is_nixos) return;
|
|
|
|
switch (builtin.os) {
|
2019-05-26 17:17:34 +00:00
|
|
|
.windows => {},
|
2019-03-11 19:22:05 +00:00
|
|
|
else => {
|
2019-07-09 17:31:42 +00:00
|
|
|
const triple = (Target{
|
|
|
|
.Cross = CrossTarget{
|
|
|
|
.arch = builtin.arch,
|
|
|
|
.os = builtin.os,
|
|
|
|
.abi = builtin.abi,
|
|
|
|
},
|
2019-03-11 19:22:05 +00:00
|
|
|
}).linuxTriple(self.allocator);
|
|
|
|
|
2019-03-14 18:48:33 +00:00
|
|
|
// TODO: $ ld --verbose | grep SEARCH_DIR
|
|
|
|
// the output contains some paths that end with lib64, maybe include them too?
|
|
|
|
// also, what is the best possible order of things?
|
|
|
|
|
2019-03-11 19:22:05 +00:00
|
|
|
self.addNativeSystemIncludeDir("/usr/local/include");
|
|
|
|
self.addNativeSystemLibPath("/usr/local/lib");
|
|
|
|
|
|
|
|
self.addNativeSystemIncludeDir(self.fmt("/usr/include/{}", triple));
|
|
|
|
self.addNativeSystemLibPath(self.fmt("/usr/lib/{}", triple));
|
|
|
|
|
|
|
|
self.addNativeSystemIncludeDir("/usr/include");
|
|
|
|
self.addNativeSystemLibPath("/usr/lib");
|
2019-03-14 18:48:33 +00:00
|
|
|
|
|
|
|
// example: on a 64-bit debian-based linux distro, with zlib installed from apt:
|
|
|
|
// zlib.h is in /usr/include (added above)
|
|
|
|
// libz.so.1 is in /lib/x86_64-linux-gnu (added here)
|
|
|
|
self.addNativeSystemLibPath(self.fmt("/lib/{}", triple));
|
2019-03-11 19:22:05 +00:00
|
|
|
},
|
|
|
|
}
|
2017-03-31 09:48:15 +00:00
|
|
|
}
|
2017-04-06 09:34:04 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn option(self: *Builder, comptime T: type, name: []const u8, description: []const u8) ?T {
|
2017-04-19 05:13:15 +00:00
|
|
|
const type_id = comptime typeToEnum(T);
|
2018-11-13 13:08:37 +00:00
|
|
|
const available_option = AvailableOption{
|
2017-04-06 09:34:04 +00:00
|
|
|
.name = name,
|
|
|
|
.type_id = type_id,
|
|
|
|
.description = description,
|
|
|
|
};
|
2018-01-09 05:07:01 +00:00
|
|
|
if ((self.available_options_map.put(name, available_option) catch unreachable) != null) {
|
2019-09-03 20:19:10 +00:00
|
|
|
panic("Option '{}' declared twice", name);
|
2017-04-06 09:34:04 +00:00
|
|
|
}
|
2018-01-09 05:07:01 +00:00
|
|
|
self.available_options_list.append(available_option) catch unreachable;
|
2017-04-06 09:34:04 +00:00
|
|
|
|
2018-06-10 05:13:51 +00:00
|
|
|
const entry = self.user_input_options.get(name) orelse return null;
|
2017-04-06 09:34:04 +00:00
|
|
|
entry.value.used = true;
|
|
|
|
switch (type_id) {
|
|
|
|
TypeId.Bool => switch (entry.value.value) {
|
|
|
|
UserValue.Flag => return true,
|
|
|
|
UserValue.Scalar => |s| {
|
|
|
|
if (mem.eql(u8, s, "true")) {
|
|
|
|
return true;
|
|
|
|
} else if (mem.eql(u8, s, "false")) {
|
|
|
|
return false;
|
|
|
|
} else {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Expected -D{} to be a boolean, but received '{}'\n", name, s);
|
2017-04-06 09:34:04 +00:00
|
|
|
self.markInvalidUserInput();
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
UserValue.List => {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Expected -D{} to be a boolean, but received a list.\n", name);
|
2017-04-06 09:34:04 +00:00
|
|
|
self.markInvalidUserInput();
|
|
|
|
return null;
|
|
|
|
},
|
|
|
|
},
|
2019-09-03 20:19:10 +00:00
|
|
|
TypeId.Int => panic("TODO integer options to build script"),
|
|
|
|
TypeId.Float => panic("TODO float options to build script"),
|
2017-04-19 05:13:15 +00:00
|
|
|
TypeId.String => switch (entry.value.value) {
|
|
|
|
UserValue.Flag => {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Expected -D{} to be a string, but received a boolean.\n", name);
|
2017-04-19 05:13:15 +00:00
|
|
|
self.markInvalidUserInput();
|
|
|
|
return null;
|
|
|
|
},
|
|
|
|
UserValue.List => {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Expected -D{} to be a string, but received a list.\n", name);
|
2017-04-19 05:13:15 +00:00
|
|
|
self.markInvalidUserInput();
|
|
|
|
return null;
|
|
|
|
},
|
|
|
|
UserValue.Scalar => |s| return s,
|
|
|
|
},
|
2019-09-03 20:19:10 +00:00
|
|
|
TypeId.List => panic("TODO list options to build script"),
|
2017-04-06 09:34:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn step(self: *Builder, name: []const u8, description: []const u8) *Step {
|
2019-02-03 21:13:28 +00:00
|
|
|
const step_info = self.allocator.create(TopLevelStep) catch unreachable;
|
|
|
|
step_info.* = TopLevelStep{
|
2017-04-13 21:21:00 +00:00
|
|
|
.step = Step.initNoOp(name, self.allocator),
|
|
|
|
.description = description,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2018-01-09 05:07:01 +00:00
|
|
|
self.top_level_steps.append(step_info) catch unreachable;
|
2017-04-13 21:21:00 +00:00
|
|
|
return &step_info.step;
|
|
|
|
}
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
/// This provides the -Drelease option to the build user and does not give them the choice.
|
|
|
|
pub fn setPreferredReleaseMode(self: *Builder, mode: builtin.Mode) void {
|
|
|
|
if (self.release_mode != null) {
|
|
|
|
@panic("setPreferredReleaseMode must be called before standardReleaseOptions and may not be called twice");
|
|
|
|
}
|
|
|
|
const description = self.fmt("create a release build ({})", @tagName(mode));
|
|
|
|
self.is_release = self.option(bool, "release", description) orelse false;
|
2019-07-04 21:43:56 +00:00
|
|
|
self.release_mode = if (self.is_release) mode else builtin.Mode.Debug;
|
2019-07-04 19:32:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// If you call this without first calling `setPreferredReleaseMode` then it gives the build user
|
|
|
|
/// the choice of what kind of release.
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn standardReleaseOptions(self: *Builder) builtin.Mode {
|
2017-05-10 01:20:09 +00:00
|
|
|
if (self.release_mode) |mode| return mode;
|
|
|
|
|
2018-06-10 05:13:51 +00:00
|
|
|
const release_safe = self.option(bool, "release-safe", "optimizations on and safety on") orelse false;
|
|
|
|
const release_fast = self.option(bool, "release-fast", "optimizations on and safety off") orelse false;
|
|
|
|
const release_small = self.option(bool, "release-small", "size optimizations on and safety off") orelse false;
|
2017-05-02 21:34:21 +00:00
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
const mode = if (release_safe and !release_fast and !release_small)
|
|
|
|
builtin.Mode.ReleaseSafe
|
|
|
|
else if (release_fast and !release_safe and !release_small)
|
|
|
|
builtin.Mode.ReleaseFast
|
|
|
|
else if (release_small and !release_fast and !release_safe)
|
|
|
|
builtin.Mode.ReleaseSmall
|
|
|
|
else if (!release_fast and !release_safe and !release_small)
|
|
|
|
builtin.Mode.Debug
|
|
|
|
else x: {
|
2018-04-16 00:26:10 +00:00
|
|
|
warn("Multiple release modes (of -Drelease-safe, -Drelease-fast and -Drelease-small)");
|
2017-05-02 21:34:21 +00:00
|
|
|
self.markInvalidUserInput();
|
2017-12-22 05:50:30 +00:00
|
|
|
break :x builtin.Mode.Debug;
|
2017-05-10 01:20:09 +00:00
|
|
|
};
|
2019-07-04 19:32:44 +00:00
|
|
|
self.is_release = mode != .Debug;
|
2017-05-10 01:20:09 +00:00
|
|
|
self.release_mode = mode;
|
|
|
|
return mode;
|
2017-05-02 21:34:21 +00:00
|
|
|
}
|
|
|
|
|
2019-07-09 17:31:42 +00:00
|
|
|
/// Exposes standard `zig build` options for choosing a target. Pass `null` to support all targets.
|
|
|
|
pub fn standardTargetOptions(self: *Builder, supported_targets: ?[]const Target) Target {
|
|
|
|
if (supported_targets) |target_list| {
|
|
|
|
// TODO detect multiple args and emit an error message
|
|
|
|
// there's probably a better way to collect the target
|
|
|
|
for (target_list) |targ| {
|
|
|
|
const targ_str = targ.zigTriple(self.allocator) catch unreachable;
|
|
|
|
const targ_desc = targ.allocDescription(self.allocator) catch unreachable;
|
|
|
|
const this_targ_opt = self.option(bool, targ_str, targ_desc) orelse false;
|
|
|
|
if (this_targ_opt) {
|
|
|
|
return targ;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Target.Native;
|
|
|
|
} else {
|
|
|
|
const target_str = self.option([]const u8, "target", "the target to build for") orelse return Target.Native;
|
|
|
|
return Target.parse(target_str) catch unreachable; // TODO better error message for bad target
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-03 21:22:17 +00:00
|
|
|
pub fn addUserInputOption(self: *Builder, name: []const u8, value: []const u8) !bool {
|
|
|
|
const gop = try self.user_input_options.getOrPut(name);
|
|
|
|
if (!gop.found_existing) {
|
2018-11-13 13:08:37 +00:00
|
|
|
gop.kv.value = UserInputOption{
|
2018-08-03 21:22:17 +00:00
|
|
|
.name = name,
|
2018-11-13 13:08:37 +00:00
|
|
|
.value = UserValue{ .Scalar = value },
|
2018-08-03 21:22:17 +00:00
|
|
|
.used = false,
|
|
|
|
};
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// option already exists
|
|
|
|
switch (gop.kv.value.value) {
|
|
|
|
UserValue.Scalar => |s| {
|
|
|
|
// turn it into a list
|
|
|
|
var list = ArrayList([]const u8).init(self.allocator);
|
|
|
|
list.append(s) catch unreachable;
|
|
|
|
list.append(value) catch unreachable;
|
2018-11-13 13:08:37 +00:00
|
|
|
_ = self.user_input_options.put(name, UserInputOption{
|
2018-08-03 21:22:17 +00:00
|
|
|
.name = name,
|
2018-11-13 13:08:37 +00:00
|
|
|
.value = UserValue{ .List = list },
|
2018-08-03 21:22:17 +00:00
|
|
|
.used = false,
|
|
|
|
}) catch unreachable;
|
|
|
|
},
|
|
|
|
UserValue.List => |*list| {
|
|
|
|
// append to the list
|
|
|
|
list.append(value) catch unreachable;
|
2018-11-13 13:08:37 +00:00
|
|
|
_ = self.user_input_options.put(name, UserInputOption{
|
2018-08-03 21:22:17 +00:00
|
|
|
.name = name,
|
2018-11-13 13:08:37 +00:00
|
|
|
.value = UserValue{ .List = list.* },
|
2018-08-03 21:22:17 +00:00
|
|
|
.used = false,
|
|
|
|
}) catch unreachable;
|
|
|
|
},
|
|
|
|
UserValue.Flag => {
|
|
|
|
warn("Option '-D{}={}' conflicts with flag '-D{}'.\n", name, value, name);
|
|
|
|
return true;
|
|
|
|
},
|
2017-04-06 09:34:04 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2018-08-03 21:22:17 +00:00
|
|
|
pub fn addUserInputFlag(self: *Builder, name: []const u8) !bool {
|
|
|
|
const gop = try self.user_input_options.getOrPut(name);
|
|
|
|
if (!gop.found_existing) {
|
2018-11-13 13:08:37 +00:00
|
|
|
gop.kv.value = UserInputOption{
|
2018-08-03 21:22:17 +00:00
|
|
|
.name = name,
|
2018-11-13 13:08:37 +00:00
|
|
|
.value = UserValue{ .Flag = {} },
|
2018-08-03 21:22:17 +00:00
|
|
|
.used = false,
|
|
|
|
};
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// option already exists
|
|
|
|
switch (gop.kv.value.value) {
|
|
|
|
UserValue.Scalar => |s| {
|
|
|
|
warn("Flag '-D{}' conflicts with option '-D{}={}'.\n", name, name, s);
|
|
|
|
return true;
|
|
|
|
},
|
|
|
|
UserValue.List => {
|
|
|
|
warn("Flag '-D{}' conflicts with multiple options of the same name.\n", name);
|
|
|
|
return true;
|
|
|
|
},
|
|
|
|
UserValue.Flag => {},
|
2017-04-06 09:34:04 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2018-01-25 09:10:11 +00:00
|
|
|
fn typeToEnum(comptime T: type) TypeId {
|
2017-12-22 05:50:30 +00:00
|
|
|
return switch (@typeId(T)) {
|
2017-05-17 16:26:35 +00:00
|
|
|
builtin.TypeId.Int => TypeId.Int,
|
|
|
|
builtin.TypeId.Float => TypeId.Float,
|
|
|
|
builtin.TypeId.Bool => TypeId.Bool,
|
|
|
|
else => switch (T) {
|
|
|
|
[]const u8 => TypeId.String,
|
|
|
|
[]const []const u8 => TypeId.List,
|
|
|
|
else => @compileError("Unsupported type: " ++ @typeName(T)),
|
|
|
|
},
|
2017-12-22 05:50:30 +00:00
|
|
|
};
|
2017-04-06 09:34:04 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn markInvalidUserInput(self: *Builder) void {
|
2017-04-06 09:34:04 +00:00
|
|
|
self.invalid_user_input = true;
|
|
|
|
}
|
|
|
|
|
2018-01-25 09:10:11 +00:00
|
|
|
pub fn typeIdName(id: TypeId) []const u8 {
|
2017-04-06 09:34:04 +00:00
|
|
|
return switch (id) {
|
2017-04-06 22:07:38 +00:00
|
|
|
TypeId.Bool => "bool",
|
|
|
|
TypeId.Int => "int",
|
|
|
|
TypeId.Float => "float",
|
|
|
|
TypeId.String => "string",
|
|
|
|
TypeId.List => "list",
|
2017-04-06 09:34:04 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn validateUserInputDidItFail(self: *Builder) bool {
|
2017-04-06 09:34:04 +00:00
|
|
|
// make sure all args are used
|
|
|
|
var it = self.user_input_options.iterator();
|
|
|
|
while (true) {
|
2018-06-10 05:13:51 +00:00
|
|
|
const entry = it.next() orelse break;
|
2017-04-06 09:34:04 +00:00
|
|
|
if (!entry.value.used) {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Invalid option: -D{}\n\n", entry.key);
|
2017-04-06 09:34:04 +00:00
|
|
|
self.markInvalidUserInput();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return self.invalid_user_input;
|
|
|
|
}
|
2017-04-17 06:58:42 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn spawnChild(self: *Builder, argv: []const []const u8) !void {
|
2018-10-15 22:23:47 +00:00
|
|
|
return self.spawnChildEnvMap(null, self.env_map, argv);
|
2017-04-17 07:20:56 +00:00
|
|
|
}
|
|
|
|
|
2018-01-25 09:10:11 +00:00
|
|
|
fn printCmd(cwd: ?[]const u8, argv: []const []const u8) void {
|
2017-10-31 08:47:55 +00:00
|
|
|
if (cwd) |yes_cwd| warn("cd {} && ", yes_cwd);
|
2017-10-26 03:10:41 +00:00
|
|
|
for (argv) |arg| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("{} ", arg);
|
2017-10-26 03:10:41 +00:00
|
|
|
}
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("\n");
|
2017-10-26 03:10:41 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn spawnChildEnvMap(self: *Builder, cwd: ?[]const u8, env_map: *const BufMap, argv: []const []const u8) !void {
|
2017-04-17 06:58:42 +00:00
|
|
|
if (self.verbose) {
|
2017-10-26 03:10:41 +00:00
|
|
|
printCmd(cwd, argv);
|
2017-04-17 06:58:42 +00:00
|
|
|
}
|
|
|
|
|
2019-05-26 17:17:34 +00:00
|
|
|
const child = std.ChildProcess.init(argv, self.allocator) catch unreachable;
|
2017-09-26 05:01:49 +00:00
|
|
|
defer child.deinit();
|
2017-04-17 06:58:42 +00:00
|
|
|
|
2017-09-26 05:01:49 +00:00
|
|
|
child.cwd = cwd;
|
|
|
|
child.env_map = env_map;
|
|
|
|
|
2018-01-07 22:28:20 +00:00
|
|
|
const term = child.spawnAndWait() catch |err| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Unable to spawn {}: {}\n", argv[0], @errorName(err));
|
2017-04-21 05:56:12 +00:00
|
|
|
return err;
|
|
|
|
};
|
2017-09-26 05:01:49 +00:00
|
|
|
|
2017-04-17 06:58:42 +00:00
|
|
|
switch (term) {
|
2019-05-26 17:17:34 +00:00
|
|
|
.Exited => |code| {
|
2017-04-17 06:58:42 +00:00
|
|
|
if (code != 0) {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("The following command exited with error code {}:\n", code);
|
2017-10-26 03:10:41 +00:00
|
|
|
printCmd(cwd, argv);
|
2017-04-21 05:56:12 +00:00
|
|
|
return error.UncleanExit;
|
2017-04-17 06:58:42 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
else => {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("The following command terminated unexpectedly:\n");
|
2017-10-26 03:10:41 +00:00
|
|
|
printCmd(cwd, argv);
|
|
|
|
|
2017-04-21 05:56:12 +00:00
|
|
|
return error.UncleanExit;
|
2017-04-17 06:58:42 +00:00
|
|
|
},
|
2017-12-22 05:50:30 +00:00
|
|
|
}
|
2017-04-17 06:58:42 +00:00
|
|
|
}
|
2017-04-17 10:45:44 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn makePath(self: *Builder, path: []const u8) !void {
|
2019-05-26 17:17:34 +00:00
|
|
|
fs.makePath(self.allocator, self.pathFromRoot(path)) catch |err| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Unable to create path {}: {}\n", path, @errorName(err));
|
2017-04-30 17:01:35 +00:00
|
|
|
return err;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn installArtifact(self: *Builder, artifact: *LibExeObjStep) void {
|
2017-05-01 02:09:44 +00:00
|
|
|
self.getInstallStep().dependOn(&self.addInstallArtifact(artifact).step);
|
2017-04-17 10:45:44 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addInstallArtifact(self: *Builder, artifact: *LibExeObjStep) *InstallArtifactStep {
|
2017-09-18 06:50:51 +00:00
|
|
|
return InstallArtifactStep.create(self, artifact);
|
2017-05-01 01:03:23 +00:00
|
|
|
}
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
///`dest_rel_path` is relative to prefix path
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn installFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) void {
|
2019-07-04 19:32:44 +00:00
|
|
|
self.getInstallStep().dependOn(&self.addInstallFileWithDir(src_path, .Prefix, dest_rel_path).step);
|
|
|
|
}
|
|
|
|
|
2019-07-14 07:06:20 +00:00
|
|
|
pub fn installDirectory(self: *Builder, options: InstallDirectoryOptions) void {
|
|
|
|
self.getInstallStep().dependOn(&self.addInstallDirectory(options).step);
|
|
|
|
}
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
///`dest_rel_path` is relative to bin path
|
|
|
|
pub fn installBinFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) void {
|
|
|
|
self.getInstallStep().dependOn(&self.addInstallFileWithDir(src_path, .Bin, dest_rel_path).step);
|
2017-05-01 01:03:23 +00:00
|
|
|
}
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
///`dest_rel_path` is relative to lib path
|
|
|
|
pub fn installLibFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) void {
|
|
|
|
self.getInstallStep().dependOn(&self.addInstallFileWithDir(src_path, .Lib, dest_rel_path).step);
|
|
|
|
}
|
|
|
|
|
|
|
|
///`dest_rel_path` is relative to install prefix path
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addInstallFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) *InstallFileStep {
|
2019-07-04 19:32:44 +00:00
|
|
|
return self.addInstallFileWithDir(src_path, .Prefix, dest_rel_path);
|
|
|
|
}
|
|
|
|
|
|
|
|
///`dest_rel_path` is relative to bin path
|
|
|
|
pub fn addInstallBinFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) *InstallFileStep {
|
|
|
|
return self.addInstallFileWithDir(src_path, .Bin, dest_rel_path);
|
|
|
|
}
|
2017-04-17 10:45:44 +00:00
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
///`dest_rel_path` is relative to lib path
|
|
|
|
pub fn addInstallLibFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) *InstallFileStep {
|
|
|
|
return self.addInstallFileWithDir(src_path, .Lib, dest_rel_path);
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn addInstallFileWithDir(
|
|
|
|
self: *Builder,
|
|
|
|
src_path: []const u8,
|
|
|
|
install_dir: InstallDir,
|
|
|
|
dest_rel_path: []const u8,
|
|
|
|
) *InstallFileStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const install_step = self.allocator.create(InstallFileStep) catch unreachable;
|
2019-07-04 19:32:44 +00:00
|
|
|
install_step.* = InstallFileStep.init(self, src_path, install_dir, dest_rel_path);
|
2017-04-17 10:45:44 +00:00
|
|
|
return install_step;
|
|
|
|
}
|
|
|
|
|
2019-07-14 07:06:20 +00:00
|
|
|
pub fn addInstallDirectory(self: *Builder, options: InstallDirectoryOptions) *InstallDirStep {
|
|
|
|
const install_step = self.allocator.create(InstallDirStep) catch unreachable;
|
|
|
|
install_step.* = InstallDirStep.init(self, options);
|
|
|
|
return install_step;
|
|
|
|
}
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
pub fn pushInstalledFile(self: *Builder, dir: InstallDir, dest_rel_path: []const u8) void {
|
|
|
|
self.installed_files.append(InstalledFile{
|
|
|
|
.dir = dir,
|
|
|
|
.path = dest_rel_path,
|
|
|
|
}) catch unreachable;
|
2017-04-17 10:45:44 +00:00
|
|
|
}
|
|
|
|
|
2019-07-14 07:06:20 +00:00
|
|
|
fn updateFile(self: *Builder, source_path: []const u8, dest_path: []const u8) !void {
|
2017-05-01 02:09:44 +00:00
|
|
|
if (self.verbose) {
|
2019-07-14 07:06:20 +00:00
|
|
|
warn("cp {} {} ", source_path, dest_path);
|
2017-05-01 02:09:44 +00:00
|
|
|
}
|
2019-07-14 07:06:20 +00:00
|
|
|
const prev_status = try fs.updateFile(source_path, dest_path);
|
|
|
|
if (self.verbose) switch (prev_status) {
|
|
|
|
.stale => warn("# installed\n"),
|
|
|
|
.fresh => warn("# up-to-date\n"),
|
2017-04-17 10:45:44 +00:00
|
|
|
};
|
|
|
|
}
|
2017-04-19 05:13:15 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn pathFromRoot(self: *Builder, rel_path: []const u8) []u8 {
|
2019-06-09 23:24:24 +00:00
|
|
|
return fs.path.resolve(self.allocator, [_][]const u8{ self.build_root, rel_path }) catch unreachable;
|
2017-04-19 05:13:15 +00:00
|
|
|
}
|
2017-04-19 19:38:12 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn fmt(self: *Builder, comptime format: []const u8, args: ...) []u8 {
|
2018-01-09 05:07:01 +00:00
|
|
|
return fmt_lib.allocPrint(self.allocator, format, args) catch unreachable;
|
2017-04-19 19:38:12 +00:00
|
|
|
}
|
2017-10-16 05:14:28 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn findProgram(self: *Builder, names: []const []const u8, paths: []const []const u8) ![]const u8 {
|
2017-12-24 01:21:57 +00:00
|
|
|
// TODO report error for ambiguous situations
|
2018-11-13 13:08:37 +00:00
|
|
|
const exe_extension = (Target{ .Native = {} }).exeFileExt();
|
2017-12-24 01:21:57 +00:00
|
|
|
for (self.search_prefixes.toSliceConst()) |search_prefix| {
|
|
|
|
for (names) |name| {
|
2019-05-26 17:17:34 +00:00
|
|
|
if (fs.path.isAbsolute(name)) {
|
2017-12-24 01:21:57 +00:00
|
|
|
return name;
|
|
|
|
}
|
2019-06-09 23:24:24 +00:00
|
|
|
const full_path = try fs.path.join(self.allocator, [_][]const u8{ search_prefix, "bin", self.fmt("{}{}", name, exe_extension) });
|
2019-08-01 02:28:25 +00:00
|
|
|
return fs.realpathAlloc(self.allocator, full_path) catch continue;
|
2017-12-24 01:21:57 +00:00
|
|
|
}
|
|
|
|
}
|
2017-12-12 21:03:20 +00:00
|
|
|
if (self.env_map.get("PATH")) |PATH| {
|
|
|
|
for (names) |name| {
|
2019-05-26 17:17:34 +00:00
|
|
|
if (fs.path.isAbsolute(name)) {
|
2017-12-12 21:03:20 +00:00
|
|
|
return name;
|
|
|
|
}
|
2019-08-01 02:26:39 +00:00
|
|
|
var it = mem.tokenize(PATH, [_]u8{fs.path.delimiter});
|
2017-12-12 21:03:20 +00:00
|
|
|
while (it.next()) |path| {
|
2019-06-09 23:24:24 +00:00
|
|
|
const full_path = try fs.path.join(self.allocator, [_][]const u8{ path, self.fmt("{}{}", name, exe_extension) });
|
2019-08-01 02:28:25 +00:00
|
|
|
return fs.realpathAlloc(self.allocator, full_path) catch continue;
|
2017-12-12 21:03:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (names) |name| {
|
2019-05-26 17:17:34 +00:00
|
|
|
if (fs.path.isAbsolute(name)) {
|
2017-12-12 21:03:20 +00:00
|
|
|
return name;
|
|
|
|
}
|
|
|
|
for (paths) |path| {
|
2019-06-09 23:24:24 +00:00
|
|
|
const full_path = try fs.path.join(self.allocator, [_][]const u8{ path, self.fmt("{}{}", name, exe_extension) });
|
2019-08-01 02:28:25 +00:00
|
|
|
return fs.realpathAlloc(self.allocator, full_path) catch continue;
|
2017-12-12 21:03:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return error.FileNotFound;
|
|
|
|
}
|
|
|
|
|
2019-09-23 17:33:43 +00:00
|
|
|
pub fn execAllowFail(
|
|
|
|
self: *Builder,
|
|
|
|
argv: []const []const u8,
|
|
|
|
out_code: *u8,
|
|
|
|
stderr_behavior: std.ChildProcess.StdIo,
|
|
|
|
) ![]u8 {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
assert(argv.len != 0);
|
|
|
|
|
2019-10-09 19:23:50 +00:00
|
|
|
const max_output_size = 400 * 1024;
|
2019-05-26 17:17:34 +00:00
|
|
|
const child = try std.ChildProcess.init(argv, self.allocator);
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
defer child.deinit();
|
|
|
|
|
2019-05-26 17:17:34 +00:00
|
|
|
child.stdin_behavior = .Ignore;
|
|
|
|
child.stdout_behavior = .Pipe;
|
2019-09-23 17:33:43 +00:00
|
|
|
child.stderr_behavior = stderr_behavior;
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
|
|
|
|
try child.spawn();
|
|
|
|
|
|
|
|
var stdout = std.Buffer.initNull(self.allocator);
|
|
|
|
defer std.Buffer.deinit(&stdout);
|
|
|
|
|
|
|
|
var stdout_file_in_stream = child.stdout.?.inStream();
|
|
|
|
try stdout_file_in_stream.stream.readAllBuffer(&stdout, max_output_size);
|
|
|
|
|
2019-09-23 17:33:43 +00:00
|
|
|
const term = try child.wait();
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
switch (term) {
|
2019-05-26 17:17:34 +00:00
|
|
|
.Exited => |code| {
|
2017-12-12 21:03:20 +00:00
|
|
|
if (code != 0) {
|
2019-09-23 17:33:43 +00:00
|
|
|
out_code.* = @truncate(u8, code);
|
|
|
|
return error.ExitCodeFailure;
|
2017-12-12 21:03:20 +00:00
|
|
|
}
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
return stdout.toOwnedSlice();
|
2017-12-12 21:03:20 +00:00
|
|
|
},
|
2019-07-03 18:17:43 +00:00
|
|
|
.Signal, .Stopped, .Unknown => |code| {
|
2019-09-23 17:33:43 +00:00
|
|
|
out_code.* = @truncate(u8, code);
|
|
|
|
return error.ProcessTerminated;
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn exec(self: *Builder, argv: []const []const u8) ![]u8 {
|
|
|
|
assert(argv.len != 0);
|
|
|
|
|
|
|
|
if (self.verbose) {
|
|
|
|
printCmd(null, argv);
|
|
|
|
}
|
|
|
|
|
|
|
|
var code: u8 = undefined;
|
|
|
|
return self.execAllowFail(argv, &code, .Inherit) catch |err| switch (err) {
|
|
|
|
error.FileNotFound => {
|
|
|
|
warn("Unable to spawn the following command: file not found\n");
|
|
|
|
printCmd(null, argv);
|
|
|
|
std.os.exit(@truncate(u8, code));
|
|
|
|
},
|
|
|
|
error.ExitCodeFailure => {
|
|
|
|
warn("The following command exited with error code {}:\n", code);
|
|
|
|
printCmd(null, argv);
|
|
|
|
std.os.exit(@truncate(u8, code));
|
|
|
|
},
|
|
|
|
error.ProcessTerminated => {
|
2017-12-12 21:03:20 +00:00
|
|
|
warn("The following command terminated unexpectedly:\n");
|
|
|
|
printCmd(null, argv);
|
2019-07-03 18:17:43 +00:00
|
|
|
std.os.exit(@truncate(u8, code));
|
2017-12-12 21:03:20 +00:00
|
|
|
},
|
2019-09-23 17:33:43 +00:00
|
|
|
else => |e| return e,
|
|
|
|
};
|
2017-12-12 21:03:20 +00:00
|
|
|
}
|
2017-12-24 01:21:57 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addSearchPrefix(self: *Builder, search_prefix: []const u8) void {
|
2018-01-09 05:07:01 +00:00
|
|
|
self.search_prefixes.append(search_prefix) catch unreachable;
|
2017-12-24 01:21:57 +00:00
|
|
|
}
|
2019-07-04 19:32:44 +00:00
|
|
|
|
|
|
|
fn getInstallPath(self: *Builder, dir: InstallDir, dest_rel_path: []const u8) []const u8 {
|
|
|
|
const base_dir = switch (dir) {
|
2019-07-22 14:45:59 +00:00
|
|
|
.Prefix => self.install_path,
|
2019-09-03 20:19:10 +00:00
|
|
|
.Bin => self.exe_dir,
|
|
|
|
.Lib => self.lib_dir,
|
2019-07-04 19:32:44 +00:00
|
|
|
};
|
|
|
|
return fs.path.resolve(
|
|
|
|
self.allocator,
|
|
|
|
[_][]const u8{ base_dir, dest_rel_path },
|
|
|
|
) catch unreachable;
|
|
|
|
}
|
2019-09-23 17:33:43 +00:00
|
|
|
|
|
|
|
fn execPkgConfigList(self: *Builder, out_code: *u8) ![]const PkgConfigPkg {
|
|
|
|
const stdout = try self.execAllowFail([_][]const u8{ "pkg-config", "--list-all" }, out_code, .Ignore);
|
|
|
|
var list = ArrayList(PkgConfigPkg).init(self.allocator);
|
|
|
|
var line_it = mem.tokenize(stdout, "\r\n");
|
|
|
|
while (line_it.next()) |line| {
|
|
|
|
if (mem.trim(u8, line, " \t").len == 0) continue;
|
|
|
|
var tok_it = mem.tokenize(line, " \t");
|
|
|
|
try list.append(PkgConfigPkg{
|
|
|
|
.name = tok_it.next() orelse return error.PkgConfigInvalidOutput,
|
|
|
|
.desc = tok_it.rest(),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
return list.toSliceConst();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn getPkgConfigList(self: *Builder) ![]const PkgConfigPkg {
|
|
|
|
if (self.pkg_config_pkg_list) |res| {
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
var code: u8 = undefined;
|
|
|
|
if (self.execPkgConfigList(&code)) |list| {
|
|
|
|
self.pkg_config_pkg_list = list;
|
|
|
|
return list;
|
|
|
|
} else |err| {
|
|
|
|
const result = switch (err) {
|
|
|
|
error.ProcessTerminated => error.PkgConfigCrashed,
|
|
|
|
error.ExitCodeFailure => error.PkgConfigFailed,
|
|
|
|
error.FileNotFound => error.PkgConfigNotInstalled,
|
2019-11-10 19:58:24 +00:00
|
|
|
error.InvalidName => error.PkgConfigNotInstalled,
|
2019-09-23 17:33:43 +00:00
|
|
|
error.PkgConfigInvalidOutput => error.PkgConfigInvalidOutput,
|
|
|
|
else => return err,
|
|
|
|
};
|
|
|
|
self.pkg_config_pkg_list = result;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
2017-04-13 21:21:00 +00:00
|
|
|
};
|
2017-04-06 09:34:04 +00:00
|
|
|
|
2019-08-01 02:26:39 +00:00
|
|
|
test "builder.findProgram compiles" {
|
2019-11-25 22:25:06 +00:00
|
|
|
const builder = try Builder.create(std.heap.page_allocator, "zig", "zig-cache", "zig-cache");
|
2019-08-01 02:26:39 +00:00
|
|
|
_ = builder.findProgram([_][]const u8{}, [_][]const u8{}) catch null;
|
|
|
|
}
|
|
|
|
|
move types from builtin to std
* All the data types from `@import("builtin")` are moved to
`@import("std").builtin`. The target-related types are moved
to `std.Target`. This allows the data types to have methods, such as
`std.Target.current.isDarwin()`.
* `std.os.windows.subsystem` is moved to
`std.Target.current.subsystem`.
* Remove the concept of the panic package from the compiler
implementation. Instead, `std.builtin.panic` is always the panic
function. It checks for `@hasDecl(@import("root"), "panic")`,
or else provides a default implementation.
This is an important step for multibuilds (#3028). Without this change,
the types inside the builtin namespace look like different types, when
trying to merge builds with different target settings. With this change,
Zig can figure out that, e.g., `std.builtin.Os` (the enum type) from one
compilation and `std.builtin.Os` from another compilation are the same
type, even if the target OS value differs.
2019-10-23 22:43:24 +00:00
|
|
|
/// Deprecated. Use `builtin.Version`.
|
|
|
|
pub const Version = builtin.Version;
|
2017-09-23 21:59:30 +00:00
|
|
|
|
move types from builtin to std
* All the data types from `@import("builtin")` are moved to
`@import("std").builtin`. The target-related types are moved
to `std.Target`. This allows the data types to have methods, such as
`std.Target.current.isDarwin()`.
* `std.os.windows.subsystem` is moved to
`std.Target.current.subsystem`.
* Remove the concept of the panic package from the compiler
implementation. Instead, `std.builtin.panic` is always the panic
function. It checks for `@hasDecl(@import("root"), "panic")`,
or else provides a default implementation.
This is an important step for multibuilds (#3028). Without this change,
the types inside the builtin namespace look like different types, when
trying to merge builds with different target settings. With this change,
Zig can figure out that, e.g., `std.builtin.Os` (the enum type) from one
compilation and `std.builtin.Os` from another compilation are the same
type, even if the target OS value differs.
2019-10-23 22:43:24 +00:00
|
|
|
/// Deprecated. Use `std.Target.Cross`.
|
|
|
|
pub const CrossTarget = std.Target.Cross;
|
2019-07-09 17:31:42 +00:00
|
|
|
|
move types from builtin to std
* All the data types from `@import("builtin")` are moved to
`@import("std").builtin`. The target-related types are moved
to `std.Target`. This allows the data types to have methods, such as
`std.Target.current.isDarwin()`.
* `std.os.windows.subsystem` is moved to
`std.Target.current.subsystem`.
* Remove the concept of the panic package from the compiler
implementation. Instead, `std.builtin.panic` is always the panic
function. It checks for `@hasDecl(@import("root"), "panic")`,
or else provides a default implementation.
This is an important step for multibuilds (#3028). Without this change,
the types inside the builtin namespace look like different types, when
trying to merge builds with different target settings. With this change,
Zig can figure out that, e.g., `std.builtin.Os` (the enum type) from one
compilation and `std.builtin.Os` from another compilation are the same
type, even if the target OS value differs.
2019-10-23 22:43:24 +00:00
|
|
|
/// Deprecated. Use `std.Target`.
|
|
|
|
pub const Target = std.Target;
|
2017-04-03 08:58:19 +00:00
|
|
|
|
2018-12-05 13:10:09 +00:00
|
|
|
const Pkg = struct {
|
|
|
|
name: []const u8,
|
|
|
|
path: []const u8,
|
|
|
|
};
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
const CSourceFile = struct {
|
|
|
|
source_path: []const u8,
|
|
|
|
args: []const []const u8,
|
|
|
|
};
|
|
|
|
|
2019-03-11 19:22:05 +00:00
|
|
|
fn isLibCLibrary(name: []const u8) bool {
|
2019-06-09 23:24:24 +00:00
|
|
|
const libc_libraries = [_][]const u8{ "c", "m", "dl", "rt", "pthread" };
|
2019-03-11 19:22:05 +00:00
|
|
|
for (libc_libraries) |libc_lib_name| {
|
|
|
|
if (mem.eql(u8, name, libc_lib_name))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const LibExeObjStep = struct {
|
2017-04-13 21:21:00 +00:00
|
|
|
step: Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
builder: *Builder,
|
2017-03-31 09:48:15 +00:00
|
|
|
name: []const u8,
|
2017-04-03 08:58:19 +00:00
|
|
|
target: Target,
|
2019-07-07 21:55:25 +00:00
|
|
|
linker_script: ?[]const u8 = null,
|
|
|
|
version_script: ?[]const u8 = null,
|
2017-09-18 06:50:51 +00:00
|
|
|
out_filename: []const u8,
|
2019-03-13 23:33:19 +00:00
|
|
|
is_dynamic: bool,
|
2017-04-21 05:56:12 +00:00
|
|
|
version: Version,
|
2017-09-18 06:50:51 +00:00
|
|
|
build_mode: builtin.Mode,
|
|
|
|
kind: Kind,
|
2017-05-01 02:09:44 +00:00
|
|
|
major_only_filename: []const u8,
|
|
|
|
name_only_filename: []const u8,
|
2017-09-18 06:50:51 +00:00
|
|
|
strip: bool,
|
2017-12-12 04:34:59 +00:00
|
|
|
lib_paths: ArrayList([]const u8),
|
2019-09-02 15:32:22 +00:00
|
|
|
framework_dirs: ArrayList([]const u8),
|
2017-09-23 21:59:30 +00:00
|
|
|
frameworks: BufSet,
|
2018-01-05 04:43:46 +00:00
|
|
|
verbose_link: bool,
|
2019-02-25 16:37:54 +00:00
|
|
|
verbose_cc: bool,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
disable_gen_h: bool,
|
2019-05-09 00:49:07 +00:00
|
|
|
bundle_compiler_rt: bool,
|
2019-05-09 02:43:11 +00:00
|
|
|
disable_stack_probing: bool,
|
2018-09-06 20:29:35 +00:00
|
|
|
c_std: Builder.CStd,
|
stage1 is now a hybrid of C++ and Zig
This modifies the build process of Zig to put all of the source files
into libcompiler.a, except main.cpp and userland.cpp.
Next, the build process links main.cpp, userland.cpp, and libcompiler.a
into zig1. userland.cpp is a shim for functions that will later be
replaced with self-hosted implementations.
Next, the build process uses zig1 to build src-self-hosted/stage1.zig
into libuserland.a, which does not depend on any of the things that
are shimmed in userland.cpp, such as translate-c.
Finally, the build process re-links main.cpp and libcompiler.a, except
with libuserland.a instead of userland.cpp. Now the shims are replaced
with .zig code. This provides all of the Zig standard library to the
stage1 C++ compiler, and enables us to move certain things to userland,
such as translate-c.
As a proof of concept I have made the `zig zen` command use text defined
in userland. I added `zig translate-c-2` which is a work-in-progress
reimplementation of translate-c in userland, which currently calls
`std.debug.panic("unimplemented")` and you can see the stack trace makes
it all the way back into the C++ main() function (Thanks LemonBoy for
improving that!).
This could potentially let us move other things into userland, such as
hashing algorithms, the entire cache system, .d file parsing, pretty
much anything that libuserland.a itself doesn't need to depend on.
This can also let us have `zig fmt` in stage1 without the overhead
of child process execution, and without the initial compilation delay
before it gets cached.
See #1964
2019-04-16 20:47:47 +00:00
|
|
|
override_lib_dir: ?[]const u8,
|
2019-03-02 15:38:27 +00:00
|
|
|
main_pkg_path: ?[]const u8,
|
2019-02-25 16:37:54 +00:00
|
|
|
exec_cmd_args: ?[]const ?[]const u8,
|
|
|
|
name_prefix: []const u8,
|
|
|
|
filter: ?[]const u8,
|
2019-04-05 18:54:37 +00:00
|
|
|
single_threaded: bool,
|
2017-09-18 06:50:51 +00:00
|
|
|
|
|
|
|
root_src: ?[]const u8,
|
|
|
|
out_h_filename: []const u8,
|
2019-02-25 18:34:25 +00:00
|
|
|
out_lib_filename: []const u8,
|
2019-07-08 22:48:03 +00:00
|
|
|
out_pdb_filename: []const u8,
|
2017-05-04 18:05:06 +00:00
|
|
|
packages: ArrayList(Pkg),
|
2018-07-08 04:00:05 +00:00
|
|
|
build_options_contents: std.Buffer,
|
2018-11-02 04:07:43 +00:00
|
|
|
system_linker_hack: bool,
|
2017-05-01 20:35:10 +00:00
|
|
|
|
2017-09-18 06:50:51 +00:00
|
|
|
object_src: []const u8,
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
link_objects: ArrayList(LinkObject),
|
|
|
|
include_dirs: ArrayList(IncludeDir),
|
2019-09-23 17:33:43 +00:00
|
|
|
c_macros: ArrayList([]const u8),
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
output_dir: ?[]const u8,
|
2019-03-11 19:22:05 +00:00
|
|
|
need_system_paths: bool,
|
2019-09-22 03:55:56 +00:00
|
|
|
is_linking_libc: bool = false,
|
2019-10-10 19:58:47 +00:00
|
|
|
vcpkg_bin_path: ?[]const u8 = null,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
installed_path: ?[]const u8,
|
|
|
|
install_step: ?*InstallArtifactStep,
|
|
|
|
|
2019-07-07 21:24:49 +00:00
|
|
|
libc_file: ?[]const u8 = null,
|
|
|
|
target_glibc: ?Version = null,
|
2019-07-07 15:31:07 +00:00
|
|
|
|
2019-07-19 00:03:38 +00:00
|
|
|
valgrind_support: ?bool = null,
|
|
|
|
|
2019-09-22 03:55:56 +00:00
|
|
|
/// Uses system Wine installation to run cross compiled Windows build artifacts.
|
|
|
|
enable_wine: bool = false,
|
|
|
|
|
|
|
|
/// Uses system QEMU installation to run cross compiled foreign architecture build artifacts.
|
|
|
|
enable_qemu: bool = false,
|
|
|
|
|
2019-11-20 06:56:34 +00:00
|
|
|
/// Uses system Wasmtime installation to run cross compiled wasm/wasi build artifacts.
|
|
|
|
enable_wasmtime: bool = false,
|
|
|
|
|
2019-09-22 03:55:56 +00:00
|
|
|
/// After following the steps in https://github.com/ziglang/zig/wiki/Updating-libc#glibc,
|
|
|
|
/// this will be the directory $glibc-build-dir/install/glibcs
|
|
|
|
/// Given the example of the aarch64 target, this is the directory
|
|
|
|
/// that contains the path `aarch64-linux-gnu/lib/ld-linux-aarch64.so.1`.
|
|
|
|
glibc_multi_install_dir: ?[]const u8 = null,
|
|
|
|
|
|
|
|
dynamic_linker: ?[]const u8 = null,
|
|
|
|
|
2019-10-07 21:22:28 +00:00
|
|
|
/// Position Independent Code
|
|
|
|
force_pic: ?bool = null,
|
|
|
|
|
2019-10-18 18:11:28 +00:00
|
|
|
subsystem: ?builtin.SubSystem = null,
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const LinkObject = union(enum) {
|
|
|
|
StaticPath: []const u8,
|
|
|
|
OtherStep: *LibExeObjStep,
|
|
|
|
SystemLib: []const u8,
|
|
|
|
AssemblyFile: []const u8,
|
|
|
|
CSourceFile: *CSourceFile,
|
|
|
|
};
|
|
|
|
|
|
|
|
const IncludeDir = union(enum) {
|
|
|
|
RawPath: []const u8,
|
2019-11-05 19:32:17 +00:00
|
|
|
RawPathSystem: []const u8,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
OtherStep: *LibExeObjStep,
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const Kind = enum {
|
2017-04-21 05:56:12 +00:00
|
|
|
Exe,
|
|
|
|
Lib,
|
2017-04-26 23:17:05 +00:00
|
|
|
Obj,
|
2019-02-25 16:37:54 +00:00
|
|
|
Test,
|
2017-04-21 05:56:12 +00:00
|
|
|
};
|
|
|
|
|
2018-10-15 22:23:47 +00:00
|
|
|
pub fn createSharedLibrary(builder: *Builder, name: []const u8, root_src: ?[]const u8, ver: Version) *LibExeObjStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const self = builder.allocator.create(LibExeObjStep) catch unreachable;
|
2019-03-13 23:33:19 +00:00
|
|
|
self.* = initExtraArgs(builder, name, root_src, Kind.Lib, true, ver);
|
2017-04-26 23:17:05 +00:00
|
|
|
return self;
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn createStaticLibrary(builder: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const self = builder.allocator.create(LibExeObjStep) catch unreachable;
|
2019-03-13 23:33:19 +00:00
|
|
|
self.* = initExtraArgs(builder, name, root_src, Kind.Lib, false, builder.version(0, 0, 0));
|
2017-04-26 23:17:05 +00:00
|
|
|
return self;
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
pub fn createObject(builder: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const self = builder.allocator.create(LibExeObjStep) catch unreachable;
|
|
|
|
self.* = initExtraArgs(builder, name, root_src, Kind.Obj, false, builder.version(0, 0, 0));
|
2017-04-26 23:17:05 +00:00
|
|
|
return self;
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
2017-04-04 05:52:20 +00:00
|
|
|
|
2019-03-13 23:33:19 +00:00
|
|
|
pub fn createExecutable(builder: *Builder, name: []const u8, root_src: ?[]const u8, is_dynamic: bool) *LibExeObjStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const self = builder.allocator.create(LibExeObjStep) catch unreachable;
|
2019-03-13 23:33:19 +00:00
|
|
|
self.* = initExtraArgs(builder, name, root_src, Kind.Exe, is_dynamic, builder.version(0, 0, 0));
|
2017-04-26 23:17:05 +00:00
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
pub fn createTest(builder: *Builder, name: []const u8, root_src: []const u8) *LibExeObjStep {
|
2019-02-03 21:13:28 +00:00
|
|
|
const self = builder.allocator.create(LibExeObjStep) catch unreachable;
|
2019-02-25 16:37:54 +00:00
|
|
|
self.* = initExtraArgs(builder, name, root_src, Kind.Test, false, builder.version(0, 0, 0));
|
2017-09-18 06:50:51 +00:00
|
|
|
return self;
|
|
|
|
}
|
|
|
|
|
2019-03-13 23:33:19 +00:00
|
|
|
fn initExtraArgs(builder: *Builder, name: []const u8, root_src: ?[]const u8, kind: Kind, is_dynamic: bool, ver: Version) LibExeObjStep {
|
2019-09-03 20:19:10 +00:00
|
|
|
if (mem.indexOf(u8, name, "/") != null or mem.indexOf(u8, name, "\\") != null) {
|
|
|
|
panic("invalid name: '{}'. It looks like a file path, but it is supposed to be the library or application name.", name);
|
|
|
|
}
|
2018-11-13 13:08:37 +00:00
|
|
|
var self = LibExeObjStep{
|
2017-09-18 06:50:51 +00:00
|
|
|
.strip = false,
|
2017-04-13 21:21:00 +00:00
|
|
|
.builder = builder,
|
2018-01-05 04:43:46 +00:00
|
|
|
.verbose_link = false,
|
2019-02-25 16:37:54 +00:00
|
|
|
.verbose_cc = false,
|
2017-05-02 21:34:21 +00:00
|
|
|
.build_mode = builtin.Mode.Debug,
|
2019-03-13 23:33:19 +00:00
|
|
|
.is_dynamic = is_dynamic,
|
2017-04-21 05:56:12 +00:00
|
|
|
.kind = kind,
|
2017-04-13 21:21:00 +00:00
|
|
|
.root_src = root_src,
|
|
|
|
.name = name,
|
2017-12-12 21:40:04 +00:00
|
|
|
.target = Target.Native,
|
2017-09-23 21:59:30 +00:00
|
|
|
.frameworks = BufSet.init(builder.allocator),
|
2017-04-13 21:21:00 +00:00
|
|
|
.step = Step.init(name, builder.allocator, make),
|
2018-10-15 22:23:47 +00:00
|
|
|
.version = ver,
|
2017-04-21 05:56:12 +00:00
|
|
|
.out_filename = undefined,
|
2017-04-30 22:56:24 +00:00
|
|
|
.out_h_filename = builder.fmt("{}.h", name),
|
2019-02-25 18:34:25 +00:00
|
|
|
.out_lib_filename = undefined,
|
2019-07-08 22:48:03 +00:00
|
|
|
.out_pdb_filename = builder.fmt("{}.pdb", name),
|
2017-05-01 02:09:44 +00:00
|
|
|
.major_only_filename = undefined,
|
|
|
|
.name_only_filename = undefined,
|
2017-05-04 18:05:06 +00:00
|
|
|
.packages = ArrayList(Pkg).init(builder.allocator),
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
.include_dirs = ArrayList(IncludeDir).init(builder.allocator),
|
|
|
|
.link_objects = ArrayList(LinkObject).init(builder.allocator),
|
2019-09-23 17:33:43 +00:00
|
|
|
.c_macros = ArrayList([]const u8).init(builder.allocator),
|
2017-12-12 04:34:59 +00:00
|
|
|
.lib_paths = ArrayList([]const u8).init(builder.allocator),
|
2019-09-02 15:32:22 +00:00
|
|
|
.framework_dirs = ArrayList([]const u8).init(builder.allocator),
|
2017-09-18 06:50:51 +00:00
|
|
|
.object_src = undefined,
|
2018-07-08 04:00:05 +00:00
|
|
|
.build_options_contents = std.Buffer.initSize(builder.allocator, 0) catch unreachable,
|
2018-09-06 20:29:35 +00:00
|
|
|
.c_std = Builder.CStd.C99,
|
2018-11-02 04:07:43 +00:00
|
|
|
.system_linker_hack = false,
|
stage1 is now a hybrid of C++ and Zig
This modifies the build process of Zig to put all of the source files
into libcompiler.a, except main.cpp and userland.cpp.
Next, the build process links main.cpp, userland.cpp, and libcompiler.a
into zig1. userland.cpp is a shim for functions that will later be
replaced with self-hosted implementations.
Next, the build process uses zig1 to build src-self-hosted/stage1.zig
into libuserland.a, which does not depend on any of the things that
are shimmed in userland.cpp, such as translate-c.
Finally, the build process re-links main.cpp and libcompiler.a, except
with libuserland.a instead of userland.cpp. Now the shims are replaced
with .zig code. This provides all of the Zig standard library to the
stage1 C++ compiler, and enables us to move certain things to userland,
such as translate-c.
As a proof of concept I have made the `zig zen` command use text defined
in userland. I added `zig translate-c-2` which is a work-in-progress
reimplementation of translate-c in userland, which currently calls
`std.debug.panic("unimplemented")` and you can see the stack trace makes
it all the way back into the C++ main() function (Thanks LemonBoy for
improving that!).
This could potentially let us move other things into userland, such as
hashing algorithms, the entire cache system, .d file parsing, pretty
much anything that libuserland.a itself doesn't need to depend on.
This can also let us have `zig fmt` in stage1 without the overhead
of child process execution, and without the initial compilation delay
before it gets cached.
See #1964
2019-04-16 20:47:47 +00:00
|
|
|
.override_lib_dir = null,
|
2019-03-02 15:38:27 +00:00
|
|
|
.main_pkg_path = null,
|
2019-02-25 16:37:54 +00:00
|
|
|
.exec_cmd_args = null,
|
|
|
|
.name_prefix = "",
|
|
|
|
.filter = null,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
.disable_gen_h = false,
|
2019-05-09 00:49:07 +00:00
|
|
|
.bundle_compiler_rt = false,
|
2019-05-09 02:43:11 +00:00
|
|
|
.disable_stack_probing = false,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
.output_dir = null,
|
2019-03-11 19:22:05 +00:00
|
|
|
.need_system_paths = false,
|
2019-04-05 18:54:37 +00:00
|
|
|
.single_threaded = false,
|
2019-07-04 19:32:44 +00:00
|
|
|
.installed_path = null,
|
|
|
|
.install_step = null,
|
2017-04-21 05:56:12 +00:00
|
|
|
};
|
|
|
|
self.computeOutFileNames();
|
|
|
|
return self;
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn computeOutFileNames(self: *LibExeObjStep) void {
|
2017-04-21 05:56:12 +00:00
|
|
|
switch (self.kind) {
|
2019-05-26 17:17:34 +00:00
|
|
|
.Obj => {
|
2017-04-26 23:17:05 +00:00
|
|
|
self.out_filename = self.builder.fmt("{}{}", self.name, self.target.oFileExt());
|
|
|
|
},
|
2019-05-26 17:17:34 +00:00
|
|
|
.Exe => {
|
2017-04-21 05:56:12 +00:00
|
|
|
self.out_filename = self.builder.fmt("{}{}", self.name, self.target.exeFileExt());
|
|
|
|
},
|
2019-05-26 17:17:34 +00:00
|
|
|
.Test => {
|
2019-02-25 16:37:54 +00:00
|
|
|
self.out_filename = self.builder.fmt("test{}", self.target.exeFileExt());
|
|
|
|
},
|
2019-05-26 17:17:34 +00:00
|
|
|
.Lib => {
|
2019-03-13 23:33:19 +00:00
|
|
|
if (!self.is_dynamic) {
|
2019-07-12 19:10:32 +00:00
|
|
|
self.out_filename = self.builder.fmt(
|
|
|
|
"{}{}{}",
|
|
|
|
self.target.libPrefix(),
|
|
|
|
self.name,
|
|
|
|
self.target.staticLibSuffix(),
|
|
|
|
);
|
2019-02-25 18:34:25 +00:00
|
|
|
self.out_lib_filename = self.out_filename;
|
2017-04-21 05:56:12 +00:00
|
|
|
} else {
|
2019-07-12 19:10:32 +00:00
|
|
|
if (self.target.isDarwin()) {
|
|
|
|
self.out_filename = self.builder.fmt("lib{}.{d}.{d}.{d}.dylib", self.name, self.version.major, self.version.minor, self.version.patch);
|
|
|
|
self.major_only_filename = self.builder.fmt("lib{}.{d}.dylib", self.name, self.version.major);
|
|
|
|
self.name_only_filename = self.builder.fmt("lib{}.dylib", self.name);
|
|
|
|
self.out_lib_filename = self.out_filename;
|
|
|
|
} else if (self.target.isWindows()) {
|
|
|
|
self.out_filename = self.builder.fmt("{}.dll", self.name);
|
|
|
|
self.out_lib_filename = self.builder.fmt("{}.lib", self.name);
|
|
|
|
} else {
|
|
|
|
self.out_filename = self.builder.fmt("lib{}.so.{d}.{d}.{d}", self.name, self.version.major, self.version.minor, self.version.patch);
|
|
|
|
self.major_only_filename = self.builder.fmt("lib{}.so.{d}", self.name, self.version.major);
|
|
|
|
self.name_only_filename = self.builder.fmt("lib{}.so", self.name);
|
|
|
|
self.out_lib_filename = self.out_filename;
|
2017-08-27 21:16:42 +00:00
|
|
|
}
|
2017-04-21 05:56:12 +00:00
|
|
|
}
|
|
|
|
},
|
|
|
|
}
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
2017-04-03 08:58:19 +00:00
|
|
|
|
2019-07-09 17:31:42 +00:00
|
|
|
/// Deprecated. Use `setTheTarget`.
|
2019-02-26 20:51:32 +00:00
|
|
|
pub fn setTarget(
|
|
|
|
self: *LibExeObjStep,
|
|
|
|
target_arch: builtin.Arch,
|
|
|
|
target_os: builtin.Os,
|
|
|
|
target_abi: builtin.Abi,
|
|
|
|
) void {
|
2019-07-09 17:31:42 +00:00
|
|
|
return self.setTheTarget(Target{
|
2018-11-13 13:08:37 +00:00
|
|
|
.Cross = CrossTarget{
|
2018-05-26 22:16:39 +00:00
|
|
|
.arch = target_arch,
|
|
|
|
.os = target_os,
|
2019-02-26 20:51:32 +00:00
|
|
|
.abi = target_abi,
|
2018-05-26 22:16:39 +00:00
|
|
|
},
|
2019-07-09 17:31:42 +00:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn setTheTarget(self: *LibExeObjStep, target: Target) void {
|
|
|
|
self.target = target;
|
2017-04-26 23:17:05 +00:00
|
|
|
self.computeOutFileNames();
|
2017-04-03 08:58:19 +00:00
|
|
|
}
|
|
|
|
|
2019-07-07 21:24:49 +00:00
|
|
|
pub fn setTargetGLibC(self: *LibExeObjStep, major: u32, minor: u32, patch: u32) void {
|
|
|
|
self.target_glibc = Version{
|
|
|
|
.major = major,
|
|
|
|
.minor = minor,
|
|
|
|
.patch = patch,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
pub fn setOutputDir(self: *LibExeObjStep, dir: []const u8) void {
|
2019-07-15 05:41:06 +00:00
|
|
|
self.output_dir = self.builder.dupePath(dir);
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
}
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
pub fn install(self: *LibExeObjStep) void {
|
|
|
|
self.builder.installArtifact(self);
|
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
/// Creates a `RunStep` with an executable built with `addExecutable`.
|
|
|
|
/// Add command line arguments with `addArg`.
|
|
|
|
pub fn run(exe: *LibExeObjStep) *RunStep {
|
|
|
|
assert(exe.kind == Kind.Exe);
|
2019-07-04 19:32:44 +00:00
|
|
|
|
2019-03-19 21:08:50 +00:00
|
|
|
// It doesn't have to be native. We catch that if you actually try to run it.
|
|
|
|
// Consider that this is declarative; the run step may not be run unless a user
|
|
|
|
// option is supplied.
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const run_step = RunStep.create(exe.builder, exe.builder.fmt("run {}", exe.step.name));
|
|
|
|
run_step.addArtifactArg(exe);
|
2019-10-10 19:58:47 +00:00
|
|
|
|
|
|
|
if (exe.vcpkg_bin_path) |path| {
|
|
|
|
run_step.addPathDir(path);
|
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
return run_step;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn setLinkerScriptPath(self: *LibExeObjStep, path: []const u8) void {
|
2017-04-28 14:46:01 +00:00
|
|
|
self.linker_script = path;
|
2017-04-03 08:58:19 +00:00
|
|
|
}
|
2017-04-04 05:52:20 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn linkFramework(self: *LibExeObjStep, framework_name: []const u8) void {
|
2017-09-23 21:59:30 +00:00
|
|
|
assert(self.target.isDarwin());
|
2018-01-09 05:07:01 +00:00
|
|
|
self.frameworks.put(framework_name) catch unreachable;
|
2017-09-23 21:59:30 +00:00
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
/// Returns whether the library, executable, or object depends on a particular system library.
|
|
|
|
pub fn dependsOnSystemLibrary(self: LibExeObjStep, name: []const u8) bool {
|
2019-09-23 17:33:43 +00:00
|
|
|
if (isLibCLibrary(name)) {
|
|
|
|
return self.is_linking_libc;
|
|
|
|
}
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
for (self.link_objects.toSliceConst()) |link_object| {
|
|
|
|
switch (link_object) {
|
|
|
|
LinkObject.SystemLib => |n| if (mem.eql(u8, n, name)) return true,
|
|
|
|
else => continue,
|
|
|
|
}
|
2019-02-25 19:27:03 +00:00
|
|
|
}
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
return false;
|
|
|
|
}
|
2019-02-25 19:27:03 +00:00
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
pub fn linkLibrary(self: *LibExeObjStep, lib: *LibExeObjStep) void {
|
|
|
|
assert(lib.kind == Kind.Lib);
|
|
|
|
self.linkLibraryOrObject(lib);
|
|
|
|
}
|
2017-09-23 21:59:30 +00:00
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
pub fn isDynamicLibrary(self: *LibExeObjStep) bool {
|
2019-03-13 23:33:19 +00:00
|
|
|
return self.kind == Kind.Lib and self.is_dynamic;
|
2017-09-18 06:50:51 +00:00
|
|
|
}
|
|
|
|
|
2019-07-10 23:40:46 +00:00
|
|
|
pub fn producesPdbFile(self: *LibExeObjStep) bool {
|
2019-07-26 13:42:50 +00:00
|
|
|
if (!self.target.isWindows() and !self.target.isUefi()) return false;
|
2019-07-10 23:40:46 +00:00
|
|
|
if (self.strip) return false;
|
|
|
|
return self.isDynamicLibrary() or self.kind == .Exe;
|
|
|
|
}
|
|
|
|
|
2019-09-23 17:33:43 +00:00
|
|
|
pub fn linkLibC(self: *LibExeObjStep) void {
|
|
|
|
if (!self.is_linking_libc) {
|
|
|
|
self.is_linking_libc = true;
|
|
|
|
self.link_objects.append(LinkObject{ .SystemLib = "c" }) catch unreachable;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// name_and_value looks like [name]=[value]. If the value is omitted, it is set to 1.
|
|
|
|
pub fn defineCMacro(self: *LibExeObjStep, name_and_value: []const u8) void {
|
|
|
|
self.c_macros.append(self.builder.dupe(name_and_value)) catch unreachable;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// This one has no integration with anything, it just puts -lname on the command line.
|
|
|
|
/// Prefer to use `linkSystemLibrary` instead.
|
|
|
|
pub fn linkSystemLibraryName(self: *LibExeObjStep, name: []const u8) void {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
self.link_objects.append(LinkObject{ .SystemLib = self.builder.dupe(name) }) catch unreachable;
|
2019-09-23 17:33:43 +00:00
|
|
|
self.need_system_paths = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// This links against a system library, exclusively using pkg-config to find the library.
|
|
|
|
/// Prefer to use `linkSystemLibrary` instead.
|
|
|
|
pub fn linkSystemLibraryPkgConfigOnly(self: *LibExeObjStep, lib_name: []const u8) !void {
|
|
|
|
const pkg_name = match: {
|
|
|
|
// First we have to map the library name to pkg config name. Unfortunately,
|
|
|
|
// there are several examples where this is not straightforward:
|
|
|
|
// -lSDL2 -> pkg-config sdl2
|
|
|
|
// -lgdk-3 -> pkg-config gdk-3.0
|
|
|
|
// -latk-1.0 -> pkg-config atk
|
|
|
|
const pkgs = try self.builder.getPkgConfigList();
|
|
|
|
|
|
|
|
// Exact match means instant winner.
|
|
|
|
for (pkgs) |pkg| {
|
|
|
|
if (mem.eql(u8, pkg.name, lib_name)) {
|
|
|
|
break :match pkg.name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Next we'll try ignoring case.
|
|
|
|
for (pkgs) |pkg| {
|
|
|
|
if (std.ascii.eqlIgnoreCase(pkg.name, lib_name)) {
|
|
|
|
break :match pkg.name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now try appending ".0".
|
|
|
|
for (pkgs) |pkg| {
|
|
|
|
if (std.ascii.indexOfIgnoreCase(pkg.name, lib_name)) |pos| {
|
|
|
|
if (pos != 0) continue;
|
|
|
|
if (mem.eql(u8, pkg.name[lib_name.len..], ".0")) {
|
|
|
|
break :match pkg.name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Trimming "-1.0".
|
|
|
|
if (mem.endsWith(u8, lib_name, "-1.0")) {
|
|
|
|
const trimmed_lib_name = lib_name[0 .. lib_name.len - "-1.0".len];
|
|
|
|
for (pkgs) |pkg| {
|
|
|
|
if (std.ascii.eqlIgnoreCase(pkg.name, trimmed_lib_name)) {
|
|
|
|
break :match pkg.name;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return error.PackageNotFound;
|
|
|
|
};
|
|
|
|
|
|
|
|
var code: u8 = undefined;
|
|
|
|
const stdout = if (self.builder.execAllowFail([_][]const u8{
|
|
|
|
"pkg-config",
|
|
|
|
pkg_name,
|
|
|
|
"--cflags",
|
|
|
|
"--libs",
|
|
|
|
}, &code, .Ignore)) |stdout| stdout else |err| switch (err) {
|
|
|
|
error.ProcessTerminated => return error.PkgConfigCrashed,
|
|
|
|
error.ExitCodeFailure => return error.PkgConfigFailed,
|
|
|
|
error.FileNotFound => return error.PkgConfigNotInstalled,
|
|
|
|
else => return err,
|
|
|
|
};
|
|
|
|
var it = mem.tokenize(stdout, " \r\n\t");
|
|
|
|
while (it.next()) |tok| {
|
|
|
|
if (mem.eql(u8, tok, "-I")) {
|
|
|
|
const dir = it.next() orelse return error.PkgConfigInvalidOutput;
|
|
|
|
self.addIncludeDir(dir);
|
|
|
|
} else if (mem.startsWith(u8, tok, "-I")) {
|
|
|
|
self.addIncludeDir(tok["-I".len..]);
|
|
|
|
} else if (mem.eql(u8, tok, "-L")) {
|
|
|
|
const dir = it.next() orelse return error.PkgConfigInvalidOutput;
|
|
|
|
self.addLibPath(dir);
|
|
|
|
} else if (mem.startsWith(u8, tok, "-L")) {
|
|
|
|
self.addLibPath(tok["-L".len..]);
|
|
|
|
} else if (mem.eql(u8, tok, "-l")) {
|
|
|
|
const lib = it.next() orelse return error.PkgConfigInvalidOutput;
|
|
|
|
self.linkSystemLibraryName(lib);
|
|
|
|
} else if (mem.startsWith(u8, tok, "-l")) {
|
|
|
|
self.linkSystemLibraryName(tok["-l".len..]);
|
|
|
|
} else if (mem.eql(u8, tok, "-D")) {
|
|
|
|
const macro = it.next() orelse return error.PkgConfigInvalidOutput;
|
|
|
|
self.defineCMacro(macro);
|
|
|
|
} else if (mem.startsWith(u8, tok, "-D")) {
|
|
|
|
self.defineCMacro(tok["-D".len..]);
|
|
|
|
} else if (mem.eql(u8, tok, "-pthread")) {
|
|
|
|
self.linkLibC();
|
|
|
|
} else if (self.builder.verbose) {
|
|
|
|
warn("Ignoring pkg-config flag '{}'\n", tok);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn linkSystemLibrary(self: *LibExeObjStep, name: []const u8) void {
|
2019-09-22 03:55:56 +00:00
|
|
|
if (isLibCLibrary(name)) {
|
2019-09-23 17:33:43 +00:00
|
|
|
self.linkLibC();
|
|
|
|
return;
|
2019-03-11 19:22:05 +00:00
|
|
|
}
|
2019-09-23 17:33:43 +00:00
|
|
|
if (self.linkSystemLibraryPkgConfigOnly(name)) |_| {
|
|
|
|
// pkg-config worked, so nothing further needed to do.
|
|
|
|
return;
|
|
|
|
} else |err| switch (err) {
|
|
|
|
error.PkgConfigInvalidOutput,
|
|
|
|
error.PkgConfigCrashed,
|
|
|
|
error.PkgConfigFailed,
|
|
|
|
error.PkgConfigNotInstalled,
|
|
|
|
error.PackageNotFound,
|
|
|
|
=> {},
|
|
|
|
|
|
|
|
else => unreachable,
|
|
|
|
}
|
|
|
|
|
|
|
|
self.linkSystemLibraryName(name);
|
2017-04-04 05:52:20 +00:00
|
|
|
}
|
2017-04-06 09:34:04 +00:00
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
pub fn setNamePrefix(self: *LibExeObjStep, text: []const u8) void {
|
|
|
|
assert(self.kind == Kind.Test);
|
|
|
|
self.name_prefix = text;
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn setFilter(self: *LibExeObjStep, text: ?[]const u8) void {
|
|
|
|
assert(self.kind == Kind.Test);
|
|
|
|
self.filter = text;
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn addCSourceFile(self: *LibExeObjStep, file: []const u8, args: []const []const u8) void {
|
|
|
|
const c_source_file = self.builder.allocator.create(CSourceFile) catch unreachable;
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const args_copy = self.builder.allocator.alloc([]u8, args.len) catch unreachable;
|
|
|
|
for (args) |arg, i| {
|
|
|
|
args_copy[i] = self.builder.dupe(arg);
|
|
|
|
}
|
2019-02-25 16:37:54 +00:00
|
|
|
c_source_file.* = CSourceFile{
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
.source_path = self.builder.dupe(file),
|
|
|
|
.args = args_copy,
|
2019-02-25 16:37:54 +00:00
|
|
|
};
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
self.link_objects.append(LinkObject{ .CSourceFile = c_source_file }) catch unreachable;
|
2017-09-18 06:50:51 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn setVerboseLink(self: *LibExeObjStep, value: bool) void {
|
2018-01-05 04:43:46 +00:00
|
|
|
self.verbose_link = value;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
pub fn setVerboseCC(self: *LibExeObjStep, value: bool) void {
|
|
|
|
self.verbose_cc = value;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn setBuildMode(self: *LibExeObjStep, mode: builtin.Mode) void {
|
2017-05-02 21:34:21 +00:00
|
|
|
self.build_mode = mode;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2019-09-26 03:57:47 +00:00
|
|
|
pub fn overrideZigLibDir(self: *LibExeObjStep, dir_path: []const u8) void {
|
|
|
|
self.override_lib_dir = self.builder.dupe(dir_path);
|
2019-02-25 16:37:54 +00:00
|
|
|
}
|
|
|
|
|
2019-03-02 15:38:27 +00:00
|
|
|
pub fn setMainPkgPath(self: *LibExeObjStep, dir_path: []const u8) void {
|
|
|
|
self.main_pkg_path = dir_path;
|
|
|
|
}
|
2019-04-05 18:54:37 +00:00
|
|
|
|
2019-04-03 22:21:55 +00:00
|
|
|
pub fn setDisableGenH(self: *LibExeObjStep, value: bool) void {
|
|
|
|
self.disable_gen_h = value;
|
|
|
|
}
|
2019-03-02 15:38:27 +00:00
|
|
|
|
2019-07-07 15:31:07 +00:00
|
|
|
pub fn setLibCFile(self: *LibExeObjStep, libc_file: ?[]const u8) void {
|
|
|
|
self.libc_file = libc_file;
|
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
/// Unless setOutputDir was called, this function must be called only in
|
|
|
|
/// the make step, from a step that has declared a dependency on this one.
|
|
|
|
/// To run an executable built with zig build, use `run`, or create an install step and invoke it.
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn getOutputPath(self: *LibExeObjStep) []const u8 {
|
2019-05-26 17:17:34 +00:00
|
|
|
return fs.path.join(
|
2019-02-07 05:42:41 +00:00
|
|
|
self.builder.allocator,
|
2019-06-09 23:24:24 +00:00
|
|
|
[_][]const u8{ self.output_dir.?, self.out_filename },
|
2019-02-07 05:42:41 +00:00
|
|
|
) catch unreachable;
|
2017-04-30 22:56:24 +00:00
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
/// Unless setOutputDir was called, this function must be called only in
|
|
|
|
/// the make step, from a step that has declared a dependency on this one.
|
2019-02-25 18:34:25 +00:00
|
|
|
pub fn getOutputLibPath(self: *LibExeObjStep) []const u8 {
|
|
|
|
assert(self.kind == Kind.Lib);
|
2019-05-26 17:17:34 +00:00
|
|
|
return fs.path.join(
|
2019-02-25 18:34:25 +00:00
|
|
|
self.builder.allocator,
|
2019-06-09 23:24:24 +00:00
|
|
|
[_][]const u8{ self.output_dir.?, self.out_lib_filename },
|
2019-02-25 18:34:25 +00:00
|
|
|
) catch unreachable;
|
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
/// Unless setOutputDir was called, this function must be called only in
|
|
|
|
/// the make step, from a step that has declared a dependency on this one.
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn getOutputHPath(self: *LibExeObjStep) []const u8 {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
assert(self.kind != Kind.Exe);
|
|
|
|
assert(!self.disable_gen_h);
|
2019-05-26 17:17:34 +00:00
|
|
|
return fs.path.join(
|
2019-02-07 05:42:41 +00:00
|
|
|
self.builder.allocator,
|
2019-06-09 23:24:24 +00:00
|
|
|
[_][]const u8{ self.output_dir.?, self.out_h_filename },
|
2019-02-07 05:42:41 +00:00
|
|
|
) catch unreachable;
|
2017-04-30 22:56:24 +00:00
|
|
|
}
|
|
|
|
|
2019-07-08 22:48:03 +00:00
|
|
|
/// Unless setOutputDir was called, this function must be called only in
|
|
|
|
/// the make step, from a step that has declared a dependency on this one.
|
|
|
|
pub fn getOutputPdbPath(self: *LibExeObjStep) []const u8 {
|
2019-07-26 13:42:50 +00:00
|
|
|
assert(self.target.isWindows() or self.target.isUefi());
|
2019-07-08 22:48:03 +00:00
|
|
|
return fs.path.join(
|
|
|
|
self.builder.allocator,
|
|
|
|
[_][]const u8{ self.output_dir.?, self.out_pdb_filename },
|
|
|
|
) catch unreachable;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addAssemblyFile(self: *LibExeObjStep, path: []const u8) void {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
self.link_objects.append(LinkObject{ .AssemblyFile = self.builder.dupe(path) }) catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addObjectFile(self: *LibExeObjStep, path: []const u8) void {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
self.link_objects.append(LinkObject{ .StaticPath = self.builder.dupe(path) }) catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addObject(self: *LibExeObjStep, obj: *LibExeObjStep) void {
|
2017-04-26 23:17:05 +00:00
|
|
|
assert(obj.kind == Kind.Obj);
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
self.linkLibraryOrObject(obj);
|
2017-09-18 06:50:51 +00:00
|
|
|
}
|
|
|
|
|
2018-07-08 04:00:05 +00:00
|
|
|
pub fn addBuildOption(self: *LibExeObjStep, comptime T: type, name: []const u8, value: T) void {
|
|
|
|
const out = &std.io.BufferOutStream.init(&self.build_options_contents).stream;
|
|
|
|
out.print("pub const {} = {};\n", name, value) catch unreachable;
|
|
|
|
}
|
|
|
|
|
2019-11-05 19:32:17 +00:00
|
|
|
pub fn addSystemIncludeDir(self: *LibExeObjStep, path: []const u8) void {
|
|
|
|
self.include_dirs.append(IncludeDir{ .RawPathSystem = self.builder.dupe(path) }) catch unreachable;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addIncludeDir(self: *LibExeObjStep, path: []const u8) void {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
self.include_dirs.append(IncludeDir{ .RawPath = self.builder.dupe(path) }) catch unreachable;
|
2017-04-26 16:56:10 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addLibPath(self: *LibExeObjStep, path: []const u8) void {
|
2018-01-09 05:07:01 +00:00
|
|
|
self.lib_paths.append(path) catch unreachable;
|
2017-12-12 04:34:59 +00:00
|
|
|
}
|
|
|
|
|
2019-09-02 15:32:22 +00:00
|
|
|
pub fn addFrameworkDir(self: *LibExeObjStep, dir_path: []const u8) void {
|
|
|
|
self.framework_dirs.append(dir_path) catch unreachable;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn addPackagePath(self: *LibExeObjStep, name: []const u8, pkg_index_path: []const u8) void {
|
2018-11-13 13:08:37 +00:00
|
|
|
self.packages.append(Pkg{
|
2017-05-01 20:35:10 +00:00
|
|
|
.name = name,
|
|
|
|
.path = pkg_index_path,
|
2018-01-09 05:07:01 +00:00
|
|
|
}) catch unreachable;
|
2017-05-01 20:35:10 +00:00
|
|
|
}
|
|
|
|
|
2019-10-10 19:58:47 +00:00
|
|
|
/// If Vcpkg was found on the system, it will be added to include and lib
|
|
|
|
/// paths for the specified target.
|
|
|
|
pub fn addVcpkgPaths(self: *LibExeObjStep, linkage: VcpkgLinkage) !void {
|
|
|
|
// Ideally in the Unattempted case we would call the function recursively
|
|
|
|
// after findVcpkgRoot and have only one switch statement, but the compiler
|
|
|
|
// cannot resolve the error set.
|
|
|
|
switch (self.builder.vcpkg_root) {
|
|
|
|
.Unattempted => {
|
|
|
|
self.builder.vcpkg_root = if (try findVcpkgRoot(self.builder.allocator)) |root|
|
|
|
|
VcpkgRoot{ .Found = root }
|
|
|
|
else
|
|
|
|
.NotFound;
|
|
|
|
},
|
|
|
|
.NotFound => return error.VcpkgNotFound,
|
|
|
|
.Found => {},
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (self.builder.vcpkg_root) {
|
|
|
|
.Unattempted => unreachable,
|
|
|
|
.NotFound => return error.VcpkgNotFound,
|
|
|
|
.Found => |root| {
|
|
|
|
const allocator = self.builder.allocator;
|
|
|
|
const triplet = try Target.vcpkgTriplet(allocator, self.target, linkage);
|
|
|
|
defer self.builder.allocator.free(triplet);
|
|
|
|
|
|
|
|
const include_path = try fs.path.join(allocator, [_][]const u8{ root, "installed", triplet, "include" });
|
|
|
|
errdefer allocator.free(include_path);
|
|
|
|
try self.include_dirs.append(IncludeDir{ .RawPath = include_path });
|
|
|
|
|
|
|
|
const lib_path = try fs.path.join(allocator, [_][]const u8{ root, "installed", triplet, "lib" });
|
|
|
|
try self.lib_paths.append(lib_path);
|
|
|
|
|
|
|
|
self.vcpkg_bin_path = try fs.path.join(allocator, [_][]const u8{ root, "installed", triplet, "bin" });
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
pub fn setExecCmd(self: *LibExeObjStep, args: []const ?[]const u8) void {
|
|
|
|
assert(self.kind == Kind.Test);
|
|
|
|
self.exec_cmd_args = args;
|
2017-09-18 06:50:51 +00:00
|
|
|
}
|
|
|
|
|
2018-11-02 04:07:43 +00:00
|
|
|
pub fn enableSystemLinkerHack(self: *LibExeObjStep) void {
|
|
|
|
self.system_linker_hack = true;
|
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
fn linkLibraryOrObject(self: *LibExeObjStep, other: *LibExeObjStep) void {
|
|
|
|
self.step.dependOn(&other.step);
|
|
|
|
self.link_objects.append(LinkObject{ .OtherStep = other }) catch unreachable;
|
|
|
|
self.include_dirs.append(IncludeDir{ .OtherStep = other }) catch unreachable;
|
|
|
|
|
2019-07-12 21:25:25 +00:00
|
|
|
// Inherit dependency on system libraries
|
|
|
|
for (other.link_objects.toSliceConst()) |link_object| {
|
|
|
|
switch (link_object) {
|
|
|
|
.SystemLib => |name| self.linkSystemLibrary(name),
|
|
|
|
else => continue,
|
|
|
|
}
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Inherit dependencies on darwin frameworks
|
|
|
|
if (self.target.isDarwin() and !other.isDynamicLibrary()) {
|
|
|
|
var it = other.frameworks.iterator();
|
|
|
|
while (it.next()) |entry| {
|
|
|
|
self.frameworks.put(entry.key) catch unreachable;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *Step) !void {
|
2017-04-26 23:17:05 +00:00
|
|
|
const self = @fieldParentPtr(LibExeObjStep, "step", step);
|
2017-04-19 18:00:12 +00:00
|
|
|
const builder = self.builder;
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
if (self.root_src == null and self.link_objects.len == 0) {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("{}: linker needs 1 or more objects to link\n", self.step.name);
|
2017-04-19 18:00:12 +00:00
|
|
|
return error.NeedAnObject;
|
|
|
|
}
|
|
|
|
|
2017-05-04 18:05:06 +00:00
|
|
|
var zig_args = ArrayList([]const u8).init(builder.allocator);
|
2017-04-19 18:00:12 +00:00
|
|
|
defer zig_args.deinit();
|
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append(builder.zig_exe) catch unreachable;
|
2017-09-26 05:01:49 +00:00
|
|
|
|
2017-04-26 23:17:05 +00:00
|
|
|
const cmd = switch (self.kind) {
|
2017-09-16 05:00:59 +00:00
|
|
|
Kind.Lib => "build-lib",
|
|
|
|
Kind.Exe => "build-exe",
|
|
|
|
Kind.Obj => "build-obj",
|
2019-02-25 16:37:54 +00:00
|
|
|
Kind.Test => "test",
|
2017-04-19 18:00:12 +00:00
|
|
|
};
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append(cmd) catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2017-05-03 21:23:11 +00:00
|
|
|
if (self.root_src) |root_src| {
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append(builder.pathFromRoot(root_src)) catch unreachable;
|
2017-04-26 23:17:05 +00:00
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
for (self.link_objects.toSlice()) |link_object| {
|
|
|
|
switch (link_object) {
|
|
|
|
LinkObject.StaticPath => |static_path| {
|
|
|
|
try zig_args.append("--object");
|
|
|
|
try zig_args.append(builder.pathFromRoot(static_path));
|
|
|
|
},
|
|
|
|
|
|
|
|
LinkObject.OtherStep => |other| switch (other.kind) {
|
|
|
|
LibExeObjStep.Kind.Exe => unreachable,
|
|
|
|
LibExeObjStep.Kind.Test => unreachable,
|
|
|
|
LibExeObjStep.Kind.Obj => {
|
|
|
|
try zig_args.append("--object");
|
|
|
|
try zig_args.append(other.getOutputPath());
|
|
|
|
},
|
|
|
|
LibExeObjStep.Kind.Lib => {
|
2019-03-13 23:33:19 +00:00
|
|
|
if (!other.is_dynamic or self.target.isWindows()) {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
try zig_args.append("--object");
|
2019-03-09 05:42:14 +00:00
|
|
|
try zig_args.append(other.getOutputLibPath());
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
} else {
|
|
|
|
const full_path_lib = other.getOutputPath();
|
|
|
|
try zig_args.append("--library");
|
|
|
|
try zig_args.append(full_path_lib);
|
|
|
|
|
2019-05-26 17:17:34 +00:00
|
|
|
if (fs.path.dirname(full_path_lib)) |dirname| {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
try zig_args.append("-rpath");
|
|
|
|
try zig_args.append(dirname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
LinkObject.SystemLib => |name| {
|
|
|
|
try zig_args.append("--library");
|
|
|
|
try zig_args.append(name);
|
|
|
|
},
|
|
|
|
LinkObject.AssemblyFile => |asm_file| {
|
2019-05-11 19:06:31 +00:00
|
|
|
try zig_args.append("--c-source");
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
try zig_args.append(builder.pathFromRoot(asm_file));
|
|
|
|
},
|
|
|
|
LinkObject.CSourceFile => |c_source_file| {
|
|
|
|
try zig_args.append("--c-source");
|
|
|
|
for (c_source_file.args) |arg| {
|
|
|
|
try zig_args.append(arg);
|
|
|
|
}
|
|
|
|
try zig_args.append(self.builder.pathFromRoot(c_source_file.source_path));
|
|
|
|
},
|
2019-02-25 16:37:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-07-08 04:00:05 +00:00
|
|
|
if (self.build_options_contents.len() > 0) {
|
2019-05-26 17:17:34 +00:00
|
|
|
const build_options_file = try fs.path.join(
|
2019-02-07 05:42:41 +00:00
|
|
|
builder.allocator,
|
2019-06-09 23:24:24 +00:00
|
|
|
[_][]const u8{ builder.cache_root, builder.fmt("{}_build_options.zig", self.name) },
|
2019-02-07 05:42:41 +00:00
|
|
|
);
|
2018-08-21 20:07:28 +00:00
|
|
|
try std.io.writeFile(build_options_file, self.build_options_contents.toSliceConst());
|
2018-07-08 04:00:05 +00:00
|
|
|
try zig_args.append("--pkg-begin");
|
|
|
|
try zig_args.append("build_options");
|
|
|
|
try zig_args.append(builder.pathFromRoot(build_options_file));
|
|
|
|
try zig_args.append("--pkg-end");
|
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
if (self.filter) |filter| {
|
|
|
|
try zig_args.append("--test-filter");
|
|
|
|
try zig_args.append(filter);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (self.name_prefix.len != 0) {
|
|
|
|
try zig_args.append("--test-name-prefix");
|
|
|
|
try zig_args.append(self.name_prefix);
|
|
|
|
}
|
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
if (builder.verbose_tokenize) zig_args.append("--verbose-tokenize") catch unreachable;
|
|
|
|
if (builder.verbose_ast) zig_args.append("--verbose-ast") catch unreachable;
|
|
|
|
if (builder.verbose_cimport) zig_args.append("--verbose-cimport") catch unreachable;
|
|
|
|
if (builder.verbose_ir) zig_args.append("--verbose-ir") catch unreachable;
|
|
|
|
if (builder.verbose_llvm_ir) zig_args.append("--verbose-llvm-ir") catch unreachable;
|
|
|
|
if (builder.verbose_link or self.verbose_link) zig_args.append("--verbose-link") catch unreachable;
|
2019-02-25 16:37:54 +00:00
|
|
|
if (builder.verbose_cc or self.verbose_cc) zig_args.append("--verbose-cc") catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2017-09-18 06:50:51 +00:00
|
|
|
if (self.strip) {
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--strip") catch unreachable;
|
2017-09-18 06:50:51 +00:00
|
|
|
}
|
|
|
|
|
2019-04-05 18:54:37 +00:00
|
|
|
if (self.single_threaded) {
|
|
|
|
try zig_args.append("--single-threaded");
|
|
|
|
}
|
|
|
|
|
2019-07-07 15:31:07 +00:00
|
|
|
if (self.libc_file) |libc_file| {
|
|
|
|
try zig_args.append("--libc");
|
|
|
|
try zig_args.append(builder.pathFromRoot(libc_file));
|
|
|
|
}
|
|
|
|
|
2017-05-02 21:34:21 +00:00
|
|
|
switch (self.build_mode) {
|
|
|
|
builtin.Mode.Debug => {},
|
2018-01-09 05:07:01 +00:00
|
|
|
builtin.Mode.ReleaseSafe => zig_args.append("--release-safe") catch unreachable,
|
|
|
|
builtin.Mode.ReleaseFast => zig_args.append("--release-fast") catch unreachable,
|
2018-04-16 00:26:10 +00:00
|
|
|
builtin.Mode.ReleaseSmall => zig_args.append("--release-small") catch unreachable,
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
try zig_args.append("--cache-dir");
|
|
|
|
try zig_args.append(builder.pathFromRoot(builder.cache_root));
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--name") catch unreachable;
|
|
|
|
zig_args.append(self.name) catch unreachable;
|
2017-04-19 18:00:12 +00:00
|
|
|
|
2019-03-13 23:33:19 +00:00
|
|
|
if (self.kind == Kind.Lib and self.is_dynamic) {
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--ver-major") catch unreachable;
|
|
|
|
zig_args.append(builder.fmt("{}", self.version.major)) catch unreachable;
|
2017-04-26 23:17:05 +00:00
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--ver-minor") catch unreachable;
|
|
|
|
zig_args.append(builder.fmt("{}", self.version.minor)) catch unreachable;
|
2017-04-26 23:17:05 +00:00
|
|
|
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--ver-patch") catch unreachable;
|
|
|
|
zig_args.append(builder.fmt("{}", self.version.patch)) catch unreachable;
|
2017-04-26 23:17:05 +00:00
|
|
|
}
|
2019-03-13 23:33:19 +00:00
|
|
|
if (self.is_dynamic) {
|
|
|
|
try zig_args.append("-dynamic");
|
2018-12-01 06:21:59 +00:00
|
|
|
}
|
2019-04-03 22:21:55 +00:00
|
|
|
if (self.disable_gen_h) {
|
|
|
|
try zig_args.append("--disable-gen-h");
|
|
|
|
}
|
2019-05-09 00:49:07 +00:00
|
|
|
if (self.bundle_compiler_rt) {
|
|
|
|
try zig_args.append("--bundle-compiler-rt");
|
|
|
|
}
|
2019-05-09 02:43:11 +00:00
|
|
|
if (self.disable_stack_probing) {
|
2019-07-26 13:01:49 +00:00
|
|
|
try zig_args.append("-fno-stack-check");
|
2019-05-09 02:43:11 +00:00
|
|
|
}
|
2017-04-26 23:17:05 +00:00
|
|
|
|
2017-04-19 18:00:12 +00:00
|
|
|
switch (self.target) {
|
move types from builtin to std
* All the data types from `@import("builtin")` are moved to
`@import("std").builtin`. The target-related types are moved
to `std.Target`. This allows the data types to have methods, such as
`std.Target.current.isDarwin()`.
* `std.os.windows.subsystem` is moved to
`std.Target.current.subsystem`.
* Remove the concept of the panic package from the compiler
implementation. Instead, `std.builtin.panic` is always the panic
function. It checks for `@hasDecl(@import("root"), "panic")`,
or else provides a default implementation.
This is an important step for multibuilds (#3028). Without this change,
the types inside the builtin namespace look like different types, when
trying to merge builds with different target settings. With this change,
Zig can figure out that, e.g., `std.builtin.Os` (the enum type) from one
compilation and `std.builtin.Os` from another compilation are the same
type, even if the target OS value differs.
2019-10-23 22:43:24 +00:00
|
|
|
.Native => {},
|
|
|
|
.Cross => {
|
2019-02-26 20:51:32 +00:00
|
|
|
try zig_args.append("-target");
|
2019-07-09 17:31:42 +00:00
|
|
|
try zig_args.append(self.target.zigTriple(builder.allocator) catch unreachable);
|
2017-04-19 18:00:12 +00:00
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2019-07-07 21:24:49 +00:00
|
|
|
if (self.target_glibc) |ver| {
|
|
|
|
try zig_args.append("-target-glibc");
|
|
|
|
try zig_args.append(builder.fmt("{}.{}.{}", ver.major, ver.minor, ver.patch));
|
|
|
|
}
|
|
|
|
|
2017-05-03 21:23:11 +00:00
|
|
|
if (self.linker_script) |linker_script| {
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--linker-script") catch unreachable;
|
2019-07-07 21:55:25 +00:00
|
|
|
zig_args.append(builder.pathFromRoot(linker_script)) catch unreachable;
|
|
|
|
}
|
|
|
|
|
2019-09-22 03:55:56 +00:00
|
|
|
if (self.dynamic_linker) |dynamic_linker| {
|
|
|
|
try zig_args.append("--dynamic-linker");
|
|
|
|
try zig_args.append(dynamic_linker);
|
|
|
|
}
|
|
|
|
|
2019-07-07 21:55:25 +00:00
|
|
|
if (self.version_script) |version_script| {
|
|
|
|
try zig_args.append("--version-script");
|
|
|
|
try zig_args.append(builder.pathFromRoot(version_script));
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2019-02-25 16:37:54 +00:00
|
|
|
if (self.exec_cmd_args) |exec_cmd_args| {
|
|
|
|
for (exec_cmd_args) |cmd_arg| {
|
|
|
|
if (cmd_arg) |arg| {
|
|
|
|
try zig_args.append("--test-cmd");
|
|
|
|
try zig_args.append(arg);
|
|
|
|
} else {
|
|
|
|
try zig_args.append("--test-cmd-bin");
|
|
|
|
}
|
|
|
|
}
|
2019-09-22 03:55:56 +00:00
|
|
|
} else switch (self.target.getExternalExecutor()) {
|
|
|
|
.native, .unavailable => {},
|
|
|
|
.qemu => |bin_name| if (self.enable_qemu) qemu: {
|
|
|
|
const need_cross_glibc = self.target.isGnu() and self.target.isLinux() and self.is_linking_libc;
|
|
|
|
const glibc_dir_arg = if (need_cross_glibc)
|
|
|
|
self.glibc_multi_install_dir orelse break :qemu
|
|
|
|
else
|
|
|
|
null;
|
|
|
|
try zig_args.append("--test-cmd");
|
|
|
|
try zig_args.append(bin_name);
|
|
|
|
if (glibc_dir_arg) |dir| {
|
|
|
|
const full_dir = try fs.path.join(builder.allocator, [_][]const u8{
|
|
|
|
dir,
|
|
|
|
try self.target.linuxTriple(builder.allocator),
|
|
|
|
});
|
|
|
|
|
|
|
|
try zig_args.append("--test-cmd");
|
|
|
|
try zig_args.append("-L");
|
|
|
|
try zig_args.append("--test-cmd");
|
|
|
|
try zig_args.append(full_dir);
|
|
|
|
}
|
|
|
|
try zig_args.append("--test-cmd-bin");
|
|
|
|
},
|
|
|
|
.wine => |bin_name| if (self.enable_wine) {
|
|
|
|
try zig_args.append("--test-cmd");
|
|
|
|
try zig_args.append(bin_name);
|
|
|
|
try zig_args.append("--test-cmd-bin");
|
|
|
|
},
|
2019-11-20 06:56:34 +00:00
|
|
|
.wasmtime => |bin_name| if (self.enable_wasmtime) {
|
|
|
|
try zig_args.append("--test-cmd");
|
|
|
|
try zig_args.append(bin_name);
|
|
|
|
try zig_args.append("--test-cmd-bin");
|
|
|
|
},
|
2017-09-18 06:50:51 +00:00
|
|
|
}
|
2017-05-01 20:35:10 +00:00
|
|
|
for (self.packages.toSliceConst()) |pkg| {
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("--pkg-begin") catch unreachable;
|
|
|
|
zig_args.append(pkg.name) catch unreachable;
|
|
|
|
zig_args.append(builder.pathFromRoot(pkg.path)) catch unreachable;
|
|
|
|
zig_args.append("--pkg-end") catch unreachable;
|
2017-05-01 20:35:10 +00:00
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
for (self.include_dirs.toSliceConst()) |include_dir| {
|
|
|
|
switch (include_dir) {
|
2019-11-05 19:32:17 +00:00
|
|
|
.RawPath => |include_path| {
|
|
|
|
try zig_args.append("-I");
|
|
|
|
try zig_args.append(self.builder.pathFromRoot(include_path));
|
|
|
|
},
|
|
|
|
.RawPathSystem => |include_path| {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
try zig_args.append("-isystem");
|
|
|
|
try zig_args.append(self.builder.pathFromRoot(include_path));
|
|
|
|
},
|
2019-11-05 19:32:17 +00:00
|
|
|
.OtherStep => |other| {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const h_path = other.getOutputHPath();
|
|
|
|
try zig_args.append("-isystem");
|
2019-05-26 17:17:34 +00:00
|
|
|
try zig_args.append(fs.path.dirname(h_path).?);
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
},
|
|
|
|
}
|
2017-12-12 04:34:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
for (self.lib_paths.toSliceConst()) |lib_path| {
|
2019-09-02 15:32:22 +00:00
|
|
|
try zig_args.append("-L");
|
|
|
|
try zig_args.append(lib_path);
|
2017-12-12 04:34:59 +00:00
|
|
|
}
|
|
|
|
|
2019-03-11 19:22:05 +00:00
|
|
|
if (self.need_system_paths and self.target == Target.Native) {
|
|
|
|
for (builder.native_system_include_dirs.toSliceConst()) |include_path| {
|
|
|
|
zig_args.append("-isystem") catch unreachable;
|
|
|
|
zig_args.append(builder.pathFromRoot(include_path)) catch unreachable;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (builder.native_system_rpaths.toSliceConst()) |rpath| {
|
|
|
|
zig_args.append("-rpath") catch unreachable;
|
|
|
|
zig_args.append(rpath) catch unreachable;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (builder.native_system_lib_paths.toSliceConst()) |lib_path| {
|
|
|
|
zig_args.append("--library-path") catch unreachable;
|
|
|
|
zig_args.append(lib_path) catch unreachable;
|
|
|
|
}
|
2017-04-19 18:00:12 +00:00
|
|
|
}
|
|
|
|
|
2019-09-23 17:33:43 +00:00
|
|
|
for (self.c_macros.toSliceConst()) |c_macro| {
|
|
|
|
try zig_args.append("-D");
|
|
|
|
try zig_args.append(c_macro);
|
|
|
|
}
|
|
|
|
|
2017-09-23 21:59:30 +00:00
|
|
|
if (self.target.isDarwin()) {
|
2019-09-02 15:32:22 +00:00
|
|
|
for (self.framework_dirs.toSliceConst()) |dir| {
|
|
|
|
try zig_args.append("-F");
|
|
|
|
try zig_args.append(dir);
|
|
|
|
}
|
|
|
|
|
2017-09-23 21:59:30 +00:00
|
|
|
var it = self.frameworks.iterator();
|
|
|
|
while (it.next()) |entry| {
|
2018-01-09 05:07:01 +00:00
|
|
|
zig_args.append("-framework") catch unreachable;
|
|
|
|
zig_args.append(entry.key) catch unreachable;
|
2017-09-23 21:59:30 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-02 04:07:43 +00:00
|
|
|
if (self.system_linker_hack) {
|
|
|
|
try zig_args.append("--system-linker-hack");
|
|
|
|
}
|
2018-07-25 01:28:54 +00:00
|
|
|
|
2019-07-19 00:03:38 +00:00
|
|
|
if (self.valgrind_support) |valgrind_support| {
|
|
|
|
if (valgrind_support) {
|
|
|
|
try zig_args.append("--enable-valgrind");
|
|
|
|
} else {
|
|
|
|
try zig_args.append("--disable-valgrind");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
stage1 is now a hybrid of C++ and Zig
This modifies the build process of Zig to put all of the source files
into libcompiler.a, except main.cpp and userland.cpp.
Next, the build process links main.cpp, userland.cpp, and libcompiler.a
into zig1. userland.cpp is a shim for functions that will later be
replaced with self-hosted implementations.
Next, the build process uses zig1 to build src-self-hosted/stage1.zig
into libuserland.a, which does not depend on any of the things that
are shimmed in userland.cpp, such as translate-c.
Finally, the build process re-links main.cpp and libcompiler.a, except
with libuserland.a instead of userland.cpp. Now the shims are replaced
with .zig code. This provides all of the Zig standard library to the
stage1 C++ compiler, and enables us to move certain things to userland,
such as translate-c.
As a proof of concept I have made the `zig zen` command use text defined
in userland. I added `zig translate-c-2` which is a work-in-progress
reimplementation of translate-c in userland, which currently calls
`std.debug.panic("unimplemented")` and you can see the stack trace makes
it all the way back into the C++ main() function (Thanks LemonBoy for
improving that!).
This could potentially let us move other things into userland, such as
hashing algorithms, the entire cache system, .d file parsing, pretty
much anything that libuserland.a itself doesn't need to depend on.
This can also let us have `zig fmt` in stage1 without the overhead
of child process execution, and without the initial compilation delay
before it gets cached.
See #1964
2019-04-16 20:47:47 +00:00
|
|
|
if (self.override_lib_dir) |dir| {
|
|
|
|
try zig_args.append("--override-lib-dir");
|
|
|
|
try zig_args.append(builder.pathFromRoot(dir));
|
|
|
|
} else if (self.builder.override_lib_dir) |dir| {
|
|
|
|
try zig_args.append("--override-lib-dir");
|
|
|
|
try zig_args.append(builder.pathFromRoot(dir));
|
2019-02-06 19:32:20 +00:00
|
|
|
}
|
2018-07-25 01:28:54 +00:00
|
|
|
|
2019-03-02 15:38:27 +00:00
|
|
|
if (self.main_pkg_path) |dir| {
|
|
|
|
try zig_args.append("--main-pkg-path");
|
|
|
|
try zig_args.append(builder.pathFromRoot(dir));
|
|
|
|
}
|
|
|
|
|
2019-10-07 21:22:28 +00:00
|
|
|
if (self.force_pic) |pic| {
|
|
|
|
if (pic) {
|
|
|
|
try zig_args.append("-fPIC");
|
|
|
|
} else {
|
|
|
|
try zig_args.append("-fno-PIC");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-18 18:11:28 +00:00
|
|
|
if (self.subsystem) |subsystem| {
|
|
|
|
try zig_args.append("--subsystem");
|
|
|
|
try zig_args.append(switch (subsystem) {
|
|
|
|
.Console => "console",
|
|
|
|
.Windows => "windows",
|
|
|
|
.Posix => "posix",
|
|
|
|
.Native => "native",
|
|
|
|
.EfiApplication => "efi_application",
|
|
|
|
.EfiBootServiceDriver => "efi_boot_service_driver",
|
|
|
|
.EfiRom => "efi_rom",
|
|
|
|
.EfiRuntimeDriver => "efi_runtime_driver",
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2019-07-14 07:06:20 +00:00
|
|
|
if (self.kind == Kind.Test) {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
try builder.spawnChild(zig_args.toSliceConst());
|
|
|
|
} else {
|
|
|
|
try zig_args.append("--cache");
|
|
|
|
try zig_args.append("on");
|
|
|
|
|
|
|
|
const output_path_nl = try builder.exec(zig_args.toSliceConst());
|
|
|
|
const output_path = mem.trimRight(u8, output_path_nl, "\r\n");
|
2019-07-14 07:06:20 +00:00
|
|
|
|
|
|
|
if (self.output_dir) |output_dir| {
|
|
|
|
const full_dest = try fs.path.join(builder.allocator, [_][]const u8{
|
|
|
|
output_dir,
|
|
|
|
fs.path.basename(output_path),
|
|
|
|
});
|
|
|
|
try builder.updateFile(output_path, full_dest);
|
|
|
|
} else {
|
|
|
|
self.output_dir = fs.path.dirname(output_path).?;
|
|
|
|
}
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
}
|
2019-02-25 16:37:54 +00:00
|
|
|
|
2019-03-13 23:33:19 +00:00
|
|
|
if (self.kind == Kind.Lib and self.is_dynamic and self.target.wantSharedLibSymLinks()) {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
try doAtomicSymLinks(builder.allocator, self.getOutputPath(), self.major_only_filename, self.name_only_filename);
|
2019-02-25 16:37:54 +00:00
|
|
|
}
|
2017-09-18 06:50:51 +00:00
|
|
|
}
|
2017-04-13 21:21:00 +00:00
|
|
|
};
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
pub const RunStep = struct {
|
2017-04-13 21:21:00 +00:00
|
|
|
step: Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
builder: *Builder,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
|
|
|
|
/// See also addArg and addArgs to modifying this directly
|
|
|
|
argv: ArrayList(Arg),
|
|
|
|
|
|
|
|
/// Set this to modify the current working directory
|
2017-04-30 22:56:24 +00:00
|
|
|
cwd: ?[]const u8,
|
2017-04-13 21:21:00 +00:00
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
/// Override this field to modify the environment, or use setEnvironmentVariable
|
2019-03-09 05:42:14 +00:00
|
|
|
env_map: ?*BufMap,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
|
|
|
|
pub const Arg = union(enum) {
|
|
|
|
Artifact: *LibExeObjStep,
|
|
|
|
Bytes: []u8,
|
|
|
|
};
|
|
|
|
|
|
|
|
pub fn create(builder: *Builder, name: []const u8) *RunStep {
|
|
|
|
const self = builder.allocator.create(RunStep) catch unreachable;
|
|
|
|
self.* = RunStep{
|
2017-04-17 07:20:56 +00:00
|
|
|
.builder = builder,
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
.step = Step.init(name, builder.allocator, make),
|
|
|
|
.argv = ArrayList(Arg).init(builder.allocator),
|
|
|
|
.cwd = null,
|
|
|
|
.env_map = null,
|
2019-02-03 21:13:28 +00:00
|
|
|
};
|
2017-04-30 22:56:24 +00:00
|
|
|
return self;
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
|
|
|
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
pub fn addArtifactArg(self: *RunStep, artifact: *LibExeObjStep) void {
|
|
|
|
self.argv.append(Arg{ .Artifact = artifact }) catch unreachable;
|
|
|
|
self.step.dependOn(&artifact.step);
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn addArg(self: *RunStep, arg: []const u8) void {
|
|
|
|
self.argv.append(Arg{ .Bytes = self.builder.dupe(arg) }) catch unreachable;
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn addArgs(self: *RunStep, args: []const []const u8) void {
|
|
|
|
for (args) |arg| {
|
|
|
|
self.addArg(arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-11 15:56:08 +00:00
|
|
|
pub fn clearEnvironment(self: *RunStep) void {
|
|
|
|
const new_env_map = self.builder.allocator.create(BufMap) catch unreachable;
|
|
|
|
new_env_map.* = BufMap.init(self.builder.allocator);
|
|
|
|
self.env_map = new_env_map;
|
|
|
|
}
|
|
|
|
|
2019-03-09 05:42:14 +00:00
|
|
|
pub fn addPathDir(self: *RunStep, search_path: []const u8) void {
|
|
|
|
const env_map = self.getEnvMap();
|
2019-11-27 22:47:44 +00:00
|
|
|
|
|
|
|
var key: []const u8 = undefined;
|
|
|
|
var prev_path: ?[]const u8 = undefined;
|
|
|
|
if (builtin.os == .windows) {
|
|
|
|
key = "Path";
|
|
|
|
prev_path = env_map.get(key);
|
|
|
|
if (prev_path == null) {
|
|
|
|
key = "PATH";
|
|
|
|
prev_path = env_map.get(key);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
key = "PATH";
|
|
|
|
prev_path = env_map.get(key);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prev_path) |pp| {
|
|
|
|
const new_path = self.builder.fmt("{}" ++ [1]u8{fs.path.delimiter} ++ "{}", pp, search_path);
|
|
|
|
env_map.set(key, new_path) catch unreachable;
|
|
|
|
} else {
|
|
|
|
env_map.set(key, search_path) catch unreachable;
|
|
|
|
}
|
2019-03-09 05:42:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn getEnvMap(self: *RunStep) *BufMap {
|
|
|
|
return self.env_map orelse {
|
|
|
|
const env_map = self.builder.allocator.create(BufMap) catch unreachable;
|
2019-05-26 17:17:34 +00:00
|
|
|
env_map.* = process.getEnvMap(self.builder.allocator) catch unreachable;
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
self.env_map = env_map;
|
2019-03-09 05:42:14 +00:00
|
|
|
return env_map;
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
};
|
2019-03-09 05:42:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn setEnvironmentVariable(self: *RunStep, key: []const u8, value: []const u8) void {
|
|
|
|
const env_map = self.getEnvMap();
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
env_map.set(key, value) catch unreachable;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *Step) !void {
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
const self = @fieldParentPtr(RunStep, "step", step);
|
2017-04-13 21:21:00 +00:00
|
|
|
|
2017-11-07 08:22:27 +00:00
|
|
|
const cwd = if (self.cwd) |cwd| self.builder.pathFromRoot(cwd) else self.builder.build_root;
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
|
|
|
|
var argv = ArrayList([]const u8).init(self.builder.allocator);
|
|
|
|
for (self.argv.toSlice()) |arg| {
|
|
|
|
switch (arg) {
|
|
|
|
Arg.Bytes => |bytes| try argv.append(bytes),
|
2019-03-09 05:42:14 +00:00
|
|
|
Arg.Artifact => |artifact| {
|
|
|
|
if (artifact.target.isWindows()) {
|
|
|
|
// On Windows we don't have rpaths so we have to add .dll search paths to PATH
|
|
|
|
self.addPathForDynLibs(artifact);
|
|
|
|
}
|
2019-07-04 19:32:44 +00:00
|
|
|
const executable_path = artifact.installed_path orelse artifact.getOutputPath();
|
|
|
|
try argv.append(executable_path);
|
2019-03-09 05:42:14 +00:00
|
|
|
},
|
breaking changes to zig build API and improved caching
* in Zig build scripts, getOutputPath() is no longer a valid function
to call, unless setOutputDir() was used, or within a custom make()
function. Instead there is more convenient API to use which takes
advantage of the caching system. Search this commit diff for
`exe.run()` for an example.
* Zig build by default enables caching. All build artifacts will go
into zig-cache. If you want to access build artifacts in a convenient
location, it is recommended to add an `install` step. Otherwise
you can use the `run()` API mentioned above to execute programs
directly from their location in the cache. Closes #330.
`addSystemCommand` is available for programs not built with Zig
build.
* Please note that Zig does no cache evicting yet. You may have to
manually delete zig-cache directories periodically to keep disk
usage down. It's planned for this to be a simple Least Recently
Used eviction system eventually.
* `--output`, `--output-lib`, and `--output-h` are removed. Instead,
use `--output-dir` which defaults to the current working directory.
Or take advantage of `--cache on`, which will print the main output
path to stdout, and the other artifacts will be in the same directory
with predictable file names. `--disable-gen-h` is available when
one wants to prevent .h file generation.
* `@cImport` is always independently cached now. Closes #2015.
It always writes the generated Zig code to disk which makes debug
info and compile errors better. No more "TODO: remember C source
location to display here"
* Fix .d file parsing. (Fixes the MacOS CI failure)
* Zig no longer creates "temporary files" other than inside a
zig-cache directory.
This breaks the CLI API that Godbolt uses. The suggested new invocation
can be found in this commit diff, in the changes to `test/cli.zig`.
2019-03-09 03:53:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return self.builder.spawnChildEnvMap(cwd, self.env_map orelse self.builder.env_map, argv.toSliceConst());
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
2019-03-09 05:42:14 +00:00
|
|
|
|
|
|
|
fn addPathForDynLibs(self: *RunStep, artifact: *LibExeObjStep) void {
|
|
|
|
for (artifact.link_objects.toSliceConst()) |link_object| {
|
|
|
|
switch (link_object) {
|
|
|
|
LibExeObjStep.LinkObject.OtherStep => |other| {
|
|
|
|
if (other.target.isWindows() and other.isDynamicLibrary()) {
|
2019-05-26 17:17:34 +00:00
|
|
|
self.addPathDir(fs.path.dirname(other.getOutputPath()).?);
|
2019-03-09 05:42:14 +00:00
|
|
|
self.addPathForDynLibs(other);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
else => {},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-04-13 21:21:00 +00:00
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
const InstallArtifactStep = struct {
|
2017-09-18 06:50:51 +00:00
|
|
|
step: Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
builder: *Builder,
|
|
|
|
artifact: *LibExeObjStep,
|
2019-07-04 19:32:44 +00:00
|
|
|
dest_dir: InstallDir,
|
2019-07-08 22:48:03 +00:00
|
|
|
pdb_dir: ?InstallDir,
|
2017-09-18 06:50:51 +00:00
|
|
|
|
2018-09-13 20:34:33 +00:00
|
|
|
const Self = @This();
|
2017-09-18 06:50:51 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn create(builder: *Builder, artifact: *LibExeObjStep) *Self {
|
2019-07-04 19:32:44 +00:00
|
|
|
if (artifact.install_step) |s| return s;
|
|
|
|
|
2019-02-03 21:13:28 +00:00
|
|
|
const self = builder.allocator.create(Self) catch unreachable;
|
|
|
|
self.* = Self{
|
2017-09-18 06:50:51 +00:00
|
|
|
.builder = builder,
|
|
|
|
.step = Step.init(builder.fmt("install {}", artifact.step.name), builder.allocator, make),
|
|
|
|
.artifact = artifact,
|
2019-07-04 19:32:44 +00:00
|
|
|
.dest_dir = switch (artifact.kind) {
|
|
|
|
.Obj => unreachable,
|
|
|
|
.Test => unreachable,
|
|
|
|
.Exe => InstallDir.Bin,
|
|
|
|
.Lib => InstallDir.Lib,
|
|
|
|
},
|
2019-07-10 23:40:46 +00:00
|
|
|
.pdb_dir = if (artifact.producesPdbFile()) blk: {
|
2019-07-08 22:48:03 +00:00
|
|
|
if (artifact.kind == .Exe) {
|
|
|
|
break :blk InstallDir.Bin;
|
|
|
|
} else {
|
|
|
|
break :blk InstallDir.Lib;
|
|
|
|
}
|
|
|
|
} else null,
|
2019-02-07 05:42:41 +00:00
|
|
|
};
|
2017-09-18 06:50:51 +00:00
|
|
|
self.step.dependOn(&artifact.step);
|
2019-07-04 19:32:44 +00:00
|
|
|
artifact.install_step = self;
|
|
|
|
|
|
|
|
builder.pushInstalledFile(self.dest_dir, artifact.out_filename);
|
|
|
|
if (self.artifact.isDynamicLibrary()) {
|
|
|
|
builder.pushInstalledFile(.Lib, artifact.major_only_filename);
|
|
|
|
builder.pushInstalledFile(.Lib, artifact.name_only_filename);
|
2017-04-17 10:45:44 +00:00
|
|
|
}
|
2019-07-08 22:48:03 +00:00
|
|
|
if (self.pdb_dir) |pdb_dir| {
|
|
|
|
builder.pushInstalledFile(pdb_dir, artifact.out_pdb_filename);
|
|
|
|
}
|
2017-09-18 06:50:51 +00:00
|
|
|
return self;
|
|
|
|
}
|
2017-04-17 10:45:44 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *Step) !void {
|
2017-09-18 06:50:51 +00:00
|
|
|
const self = @fieldParentPtr(Self, "step", step);
|
|
|
|
const builder = self.builder;
|
2017-04-17 10:45:44 +00:00
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
const full_dest_path = builder.getInstallPath(self.dest_dir, self.artifact.out_filename);
|
2019-07-14 07:06:20 +00:00
|
|
|
try builder.updateFile(self.artifact.getOutputPath(), full_dest_path);
|
2019-11-26 20:37:38 +00:00
|
|
|
if (self.artifact.isDynamicLibrary() and self.artifact.target.wantSharedLibSymLinks()) {
|
2019-07-04 19:32:44 +00:00
|
|
|
try doAtomicSymLinks(builder.allocator, full_dest_path, self.artifact.major_only_filename, self.artifact.name_only_filename);
|
2017-04-17 10:45:44 +00:00
|
|
|
}
|
2019-07-08 22:48:03 +00:00
|
|
|
if (self.pdb_dir) |pdb_dir| {
|
|
|
|
const full_pdb_path = builder.getInstallPath(pdb_dir, self.artifact.out_pdb_filename);
|
2019-07-14 07:06:20 +00:00
|
|
|
try builder.updateFile(self.artifact.getOutputPdbPath(), full_pdb_path);
|
2019-07-08 22:48:03 +00:00
|
|
|
}
|
2019-07-04 19:32:44 +00:00
|
|
|
self.artifact.installed_path = full_dest_path;
|
2017-04-17 10:45:44 +00:00
|
|
|
}
|
2017-09-18 06:50:51 +00:00
|
|
|
};
|
2017-04-17 10:45:44 +00:00
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const InstallFileStep = struct {
|
2017-04-17 10:45:44 +00:00
|
|
|
step: Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
builder: *Builder,
|
2017-04-17 10:45:44 +00:00
|
|
|
src_path: []const u8,
|
2019-07-04 19:32:44 +00:00
|
|
|
dir: InstallDir,
|
|
|
|
dest_rel_path: []const u8,
|
|
|
|
|
|
|
|
pub fn init(
|
|
|
|
builder: *Builder,
|
|
|
|
src_path: []const u8,
|
|
|
|
dir: InstallDir,
|
|
|
|
dest_rel_path: []const u8,
|
|
|
|
) InstallFileStep {
|
|
|
|
builder.pushInstalledFile(dir, dest_rel_path);
|
2018-11-13 13:08:37 +00:00
|
|
|
return InstallFileStep{
|
2017-04-17 10:45:44 +00:00
|
|
|
.builder = builder,
|
2017-04-19 19:38:12 +00:00
|
|
|
.step = Step.init(builder.fmt("install {}", src_path), builder.allocator, make),
|
2017-04-17 10:45:44 +00:00
|
|
|
.src_path = src_path,
|
2019-07-04 19:32:44 +00:00
|
|
|
.dir = dir,
|
|
|
|
.dest_rel_path = dest_rel_path,
|
2017-04-17 10:45:44 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *Step) !void {
|
2017-04-18 06:28:05 +00:00
|
|
|
const self = @fieldParentPtr(InstallFileStep, "step", step);
|
2019-07-04 19:32:44 +00:00
|
|
|
const full_dest_path = self.builder.getInstallPath(self.dir, self.dest_rel_path);
|
2019-07-14 07:06:20 +00:00
|
|
|
const full_src_path = self.builder.pathFromRoot(self.src_path);
|
|
|
|
try self.builder.updateFile(full_src_path, full_dest_path);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
pub const InstallDirectoryOptions = struct {
|
|
|
|
source_dir: []const u8,
|
|
|
|
install_dir: InstallDir,
|
|
|
|
install_subdir: []const u8,
|
|
|
|
exclude_extensions: ?[]const []const u8 = null,
|
|
|
|
};
|
|
|
|
|
|
|
|
pub const InstallDirStep = struct {
|
|
|
|
step: Step,
|
|
|
|
builder: *Builder,
|
|
|
|
options: InstallDirectoryOptions,
|
|
|
|
|
|
|
|
pub fn init(
|
|
|
|
builder: *Builder,
|
|
|
|
options: InstallDirectoryOptions,
|
|
|
|
) InstallDirStep {
|
|
|
|
builder.pushInstalledFile(options.install_dir, options.install_subdir);
|
|
|
|
return InstallDirStep{
|
|
|
|
.builder = builder,
|
|
|
|
.step = Step.init(builder.fmt("install {}/", options.source_dir), builder.allocator, make),
|
|
|
|
.options = options,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
fn make(step: *Step) !void {
|
|
|
|
const self = @fieldParentPtr(InstallDirStep, "step", step);
|
|
|
|
const dest_prefix = self.builder.getInstallPath(self.options.install_dir, self.options.install_subdir);
|
|
|
|
const full_src_dir = self.builder.pathFromRoot(self.options.source_dir);
|
|
|
|
var it = try fs.walkPath(self.builder.allocator, full_src_dir);
|
|
|
|
next_entry: while (try it.next()) |entry| {
|
|
|
|
if (self.options.exclude_extensions) |ext_list| for (ext_list) |ext| {
|
|
|
|
if (mem.endsWith(u8, entry.path, ext)) {
|
|
|
|
continue :next_entry;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
const rel_path = entry.path[full_src_dir.len + 1 ..];
|
|
|
|
const dest_path = try fs.path.join(self.builder.allocator, [_][]const u8{ dest_prefix, rel_path });
|
|
|
|
switch (entry.kind) {
|
|
|
|
.Directory => try fs.makePath(self.builder.allocator, dest_path),
|
|
|
|
.File => try self.builder.updateFile(entry.path, dest_path),
|
|
|
|
else => continue,
|
|
|
|
}
|
|
|
|
}
|
2017-04-17 10:45:44 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const WriteFileStep = struct {
|
2017-04-19 05:13:15 +00:00
|
|
|
step: Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
builder: *Builder,
|
2017-04-19 05:13:15 +00:00
|
|
|
file_path: []const u8,
|
|
|
|
data: []const u8,
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn init(builder: *Builder, file_path: []const u8, data: []const u8) WriteFileStep {
|
2018-11-13 13:08:37 +00:00
|
|
|
return WriteFileStep{
|
2017-04-19 05:13:15 +00:00
|
|
|
.builder = builder,
|
2017-04-19 19:38:12 +00:00
|
|
|
.step = Step.init(builder.fmt("writefile {}", file_path), builder.allocator, make),
|
2017-04-19 05:13:15 +00:00
|
|
|
.file_path = file_path,
|
|
|
|
.data = data,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *Step) !void {
|
2017-04-19 05:13:15 +00:00
|
|
|
const self = @fieldParentPtr(WriteFileStep, "step", step);
|
|
|
|
const full_path = self.builder.pathFromRoot(self.file_path);
|
2019-05-26 17:17:34 +00:00
|
|
|
const full_path_dir = fs.path.dirname(full_path) orelse ".";
|
|
|
|
fs.makePath(self.builder.allocator, full_path_dir) catch |err| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("unable to make path {}: {}\n", full_path_dir, @errorName(err));
|
2017-04-20 06:26:36 +00:00
|
|
|
return err;
|
2017-04-19 05:13:15 +00:00
|
|
|
};
|
2018-08-21 20:07:28 +00:00
|
|
|
io.writeFile(full_path, self.data) catch |err| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("unable to write {}: {}\n", full_path, @errorName(err));
|
2017-04-20 06:26:36 +00:00
|
|
|
return err;
|
2017-04-19 05:13:15 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const LogStep = struct {
|
2017-04-19 05:13:15 +00:00
|
|
|
step: Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
builder: *Builder,
|
2017-04-19 05:13:15 +00:00
|
|
|
data: []const u8,
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn init(builder: *Builder, data: []const u8) LogStep {
|
2018-11-13 13:08:37 +00:00
|
|
|
return LogStep{
|
2017-04-19 05:13:15 +00:00
|
|
|
.builder = builder,
|
2017-04-19 19:38:12 +00:00
|
|
|
.step = Step.init(builder.fmt("log {}", data), builder.allocator, make),
|
2017-04-19 05:13:15 +00:00
|
|
|
.data = data,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
fn make(step: *Step) anyerror!void {
|
2017-04-19 05:13:15 +00:00
|
|
|
const self = @fieldParentPtr(LogStep, "step", step);
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("{}", self.data);
|
2017-04-19 05:13:15 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const RemoveDirStep = struct {
|
2017-04-20 06:26:36 +00:00
|
|
|
step: Step,
|
2018-05-31 14:56:59 +00:00
|
|
|
builder: *Builder,
|
2017-04-20 06:26:36 +00:00
|
|
|
dir_path: []const u8,
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn init(builder: *Builder, dir_path: []const u8) RemoveDirStep {
|
2018-11-13 13:08:37 +00:00
|
|
|
return RemoveDirStep{
|
2017-04-20 06:26:36 +00:00
|
|
|
.builder = builder,
|
|
|
|
.step = Step.init(builder.fmt("RemoveDir {}", dir_path), builder.allocator, make),
|
|
|
|
.dir_path = dir_path,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn make(step: *Step) !void {
|
2017-04-20 06:26:36 +00:00
|
|
|
const self = @fieldParentPtr(RemoveDirStep, "step", step);
|
|
|
|
|
|
|
|
const full_path = self.builder.pathFromRoot(self.dir_path);
|
2019-09-19 06:56:45 +00:00
|
|
|
fs.deleteTree(full_path) catch |err| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Unable to remove {}: {}\n", full_path, @errorName(err));
|
2017-04-20 06:26:36 +00:00
|
|
|
return err;
|
|
|
|
};
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub const Step = struct {
|
2017-04-13 21:21:00 +00:00
|
|
|
name: []const u8,
|
2018-11-13 13:08:37 +00:00
|
|
|
makeFn: fn (self: *Step) anyerror!void,
|
2018-05-31 14:56:59 +00:00
|
|
|
dependencies: ArrayList(*Step),
|
2017-04-13 21:21:00 +00:00
|
|
|
loop_flag: bool,
|
|
|
|
done_flag: bool,
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
pub fn init(name: []const u8, allocator: *Allocator, makeFn: fn (*Step) anyerror!void) Step {
|
|
|
|
return Step{
|
2017-04-13 21:21:00 +00:00
|
|
|
.name = name,
|
|
|
|
.makeFn = makeFn,
|
2018-05-31 14:56:59 +00:00
|
|
|
.dependencies = ArrayList(*Step).init(allocator),
|
2017-04-13 21:21:00 +00:00
|
|
|
.loop_flag = false,
|
|
|
|
.done_flag = false,
|
2017-12-22 05:50:30 +00:00
|
|
|
};
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn initNoOp(name: []const u8, allocator: *Allocator) Step {
|
2017-12-22 05:50:30 +00:00
|
|
|
return init(name, allocator, makeNoOp);
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn make(self: *Step) !void {
|
2018-05-10 04:29:49 +00:00
|
|
|
if (self.done_flag) return;
|
2017-04-13 21:21:00 +00:00
|
|
|
|
2018-01-07 21:51:46 +00:00
|
|
|
try self.makeFn(self);
|
2017-04-13 21:21:00 +00:00
|
|
|
self.done_flag = true;
|
|
|
|
}
|
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
pub fn dependOn(self: *Step, other: *Step) void {
|
2018-01-09 05:07:01 +00:00
|
|
|
self.dependencies.append(other) catch unreachable;
|
2017-04-13 21:21:00 +00:00
|
|
|
}
|
|
|
|
|
2018-11-13 13:08:37 +00:00
|
|
|
fn makeNoOp(self: *Step) anyerror!void {}
|
2017-04-13 21:21:00 +00:00
|
|
|
};
|
2017-04-30 22:56:24 +00:00
|
|
|
|
2018-05-31 14:56:59 +00:00
|
|
|
fn doAtomicSymLinks(allocator: *Allocator, output_path: []const u8, filename_major_only: []const u8, filename_name_only: []const u8) !void {
|
2019-05-26 17:17:34 +00:00
|
|
|
const out_dir = fs.path.dirname(output_path) orelse ".";
|
|
|
|
const out_basename = fs.path.basename(output_path);
|
2017-04-30 22:56:24 +00:00
|
|
|
// sym link for libfoo.so.1 to libfoo.so.1.2.3
|
2019-05-26 17:17:34 +00:00
|
|
|
const major_only_path = fs.path.join(
|
2019-02-07 05:42:41 +00:00
|
|
|
allocator,
|
2019-06-09 23:24:24 +00:00
|
|
|
[_][]const u8{ out_dir, filename_major_only },
|
2019-02-07 05:42:41 +00:00
|
|
|
) catch unreachable;
|
2019-05-26 17:17:34 +00:00
|
|
|
fs.atomicSymLink(allocator, out_basename, major_only_path) catch |err| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Unable to symlink {} -> {}\n", major_only_path, out_basename);
|
2017-04-30 22:56:24 +00:00
|
|
|
return err;
|
|
|
|
};
|
|
|
|
// sym link for libfoo.so to libfoo.so.1
|
2019-05-26 17:17:34 +00:00
|
|
|
const name_only_path = fs.path.join(
|
2019-02-07 05:42:41 +00:00
|
|
|
allocator,
|
2019-06-09 23:24:24 +00:00
|
|
|
[_][]const u8{ out_dir, filename_name_only },
|
2019-02-07 05:42:41 +00:00
|
|
|
) catch unreachable;
|
2019-05-26 17:17:34 +00:00
|
|
|
fs.atomicSymLink(allocator, filename_major_only, name_only_path) catch |err| {
|
2017-10-31 08:47:55 +00:00
|
|
|
warn("Unable to symlink {} -> {}\n", name_only_path, filename_major_only);
|
2017-04-30 22:56:24 +00:00
|
|
|
return err;
|
|
|
|
};
|
|
|
|
}
|
2019-07-04 19:32:44 +00:00
|
|
|
|
2019-10-10 19:58:47 +00:00
|
|
|
/// Returned slice must be freed by the caller.
|
|
|
|
fn findVcpkgRoot(allocator: *Allocator) !?[]const u8 {
|
|
|
|
const appdata_path = try fs.getAppDataDir(allocator, "vcpkg");
|
|
|
|
defer allocator.free(appdata_path);
|
|
|
|
|
|
|
|
const path_file = try fs.path.join(allocator, [_][]const u8{ appdata_path, "vcpkg.path.txt" });
|
|
|
|
defer allocator.free(path_file);
|
|
|
|
|
|
|
|
const file = fs.File.openRead(path_file) catch return null;
|
|
|
|
defer file.close();
|
|
|
|
|
|
|
|
const size = @intCast(usize, try file.getEndPos());
|
|
|
|
const vcpkg_path = try allocator.alloc(u8, size);
|
|
|
|
const size_read = try file.read(vcpkg_path);
|
|
|
|
std.debug.assert(size == size_read);
|
|
|
|
|
|
|
|
return vcpkg_path;
|
|
|
|
}
|
|
|
|
|
|
|
|
const VcpkgRoot = union(VcpkgRootStatus) {
|
|
|
|
Unattempted: void,
|
|
|
|
NotFound: void,
|
|
|
|
Found: []const u8,
|
|
|
|
};
|
|
|
|
|
|
|
|
const VcpkgRootStatus = enum {
|
|
|
|
Unattempted,
|
|
|
|
NotFound,
|
|
|
|
Found,
|
|
|
|
};
|
|
|
|
|
|
|
|
pub const VcpkgLinkage = enum {
|
|
|
|
Static,
|
|
|
|
Dynamic,
|
|
|
|
};
|
|
|
|
|
2019-07-04 19:32:44 +00:00
|
|
|
pub const InstallDir = enum {
|
|
|
|
Prefix,
|
|
|
|
Lib,
|
|
|
|
Bin,
|
|
|
|
};
|
|
|
|
|
|
|
|
pub const InstalledFile = struct {
|
|
|
|
dir: InstallDir,
|
|
|
|
path: []const u8,
|
|
|
|
};
|