zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu-dawn: rename -Dfrom-source to -Ddawn-from-source

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-02-27 15:13:09 -07:00
parent 4860240e4e
commit 805de702ee
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gpu-dawn/.github/workflows/ci.yml vendored
View file

@ -20,7 +20,7 @@ jobs:
- name: Clone mach-glfw - name: Clone mach-glfw
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
- name: install (debug) - name: install (debug)
run: zig build install -Dfrom-source=true -Dtarget=x86_64-linux run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-linux
- name: upload (debug) - name: upload (debug)
run: | run: |
mv zig-out/lib/libdawn.a zig-out/lib/libdawn_x86_64-linux-gnu_debug.a mv zig-out/lib/libdawn.a zig-out/lib/libdawn_x86_64-linux-gnu_debug.a
@ -43,7 +43,7 @@ jobs:
- name: Clone mach-glfw - name: Clone mach-glfw
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
- name: install (release-fast) - name: install (release-fast)
run: zig build install -Dfrom-source=true -Drelease-fast=true -Dtarget=x86_64-linux run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=x86_64-linux
- name: upload (release-fast) - name: upload (release-fast)
run: | run: |
mv zig-out/lib/libdawn.a zig-out/lib/libdawn_x86_64-linux-gnu_release-fast.a mv zig-out/lib/libdawn.a zig-out/lib/libdawn_x86_64-linux-gnu_release-fast.a
@ -69,7 +69,7 @@ jobs:
# 7z x zig.zip # 7z x zig.zip
# Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.670+e1a535360\" # Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.670+e1a535360\"
# - name: install (debug) # - name: install (debug)
# run: zig build install -Dfrom-source=true -Dtarget=x86_64-windows # run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-windows
# # TODO: upload step for Windows # # TODO: upload step for Windows
x86_64-macos_debug: x86_64-macos_debug:
runs-on: macos-latest runs-on: macos-latest
@ -86,7 +86,7 @@ jobs:
- name: Clone mach-glfw - name: Clone mach-glfw
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
- name: install (debug) - name: install (debug)
run: zig build install -Dfrom-source=true -Dtarget=x86_64-macos.12 run: zig build install -Ddawn-from-source=true -Dtarget=x86_64-macos.12
env: env:
AGREE: true AGREE: true
- name: upload (debug) - name: upload (debug)
@ -111,7 +111,7 @@ jobs:
- name: Clone mach-glfw - name: Clone mach-glfw
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
- name: install (release-fast) - name: install (release-fast)
run: zig build install -Dfrom-source=true -Drelease-fast=true -Dtarget=x86_64-macos.12 run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=x86_64-macos.12
env: env:
AGREE: true AGREE: true
- name: upload (release-fast) - name: upload (release-fast)

4
gpu-dawn/.github/workflows/m1_ci.yml vendored
View file

@ -24,7 +24,7 @@ jobs:
- name: Clone mach-glfw - name: Clone mach-glfw
run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw
- name: install (debug) - name: install (debug)
run: zig build install -Dfrom-source=true -Dtarget=aarch64-macos.12 run: zig build install -Ddawn-from-source=true -Dtarget=aarch64-macos.12
env: env:
AGREE: true AGREE: true
- name: upload (debug) - name: upload (debug)
@ -35,7 +35,7 @@ jobs:
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: install (release-fast) - name: install (release-fast)
run: zig build install -Dfrom-source=true -Drelease-fast=true -Dtarget=aarch64-macos.12 run: zig build install -Ddawn-from-source=true -Drelease-fast=true -Dtarget=aarch64-macos.12
env: env:
AGREE: true AGREE: true
- name: upload (release-fast) - name: upload (release-fast)

4
gpu-dawn/build.zig
View file

@ -8,7 +8,7 @@ pub fn build(b: *Builder) void {
const target = b.standardTargetOptions(.{}); const target = b.standardTargetOptions(.{});
const options = Options{ const options = Options{
.from_source = b.option(bool, "from-source", "Build Dawn from source") orelse false, .from_source = b.option(bool, "dawn-from-source", "Build Dawn from source") orelse false,
}; };
const lib = b.addStaticLibrary("gpu", "src/main.zig"); const lib = b.addStaticLibrary("gpu", "src/main.zig");
@ -219,7 +219,7 @@ pub fn linkFromBinary(b: *Builder, step: *std.build.LibExeObjStep, options: Opti
}; };
if (!binaries_available) { if (!binaries_available) {
std.log.err("\nerror: gpu-dawn binaries for {s} not available. Please open an issue: https://github.com/hexops/mach/issues\n\n", .{zig_triple}); std.log.err("\nerror: gpu-dawn binaries for {s} not available. Please open an issue: https://github.com/hexops/mach/issues\n\n", .{zig_triple});
std.log.err("Build from source (takes 5-10 minutes) using -Dfrom-source=true or via `.from_source = true` in Options", .{}); std.log.err("Build from source (takes 5-10 minutes) using -Ddawn-from-source=true or via `.from_source = true` in Options", .{});
std.process.exit(1); std.process.exit(1);
} }