From 805de702eebfd444daf49db1760ad935222cc86f Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 27 Feb 2022 15:13:09 -0700 Subject: [PATCH] gpu-dawn: rename -Dfrom-source to -Ddawn-from-source Signed-off-by: Stephen Gutekanst --- gpu-dawn/.github/workflows/ci.yml | 10 +++++----- gpu-dawn/.github/workflows/m1_ci.yml | 4 ++-- gpu-dawn/build.zig | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gpu-dawn/.github/workflows/ci.yml b/gpu-dawn/.github/workflows/ci.yml index 26ffb771..f0acdd24 100644 --- a/gpu-dawn/.github/workflows/ci.yml +++ b/gpu-dawn/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - 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) run: | 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 run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - 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) run: | 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 # Add-Content $env:GITHUB_PATH "C:\zig-windows-x86_64-0.10.0-dev.670+e1a535360\" # - 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 x86_64-macos_debug: runs-on: macos-latest @@ -86,7 +86,7 @@ jobs: - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - 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: AGREE: true - name: upload (debug) @@ -111,7 +111,7 @@ jobs: - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - 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: AGREE: true - name: upload (release-fast) diff --git a/gpu-dawn/.github/workflows/m1_ci.yml b/gpu-dawn/.github/workflows/m1_ci.yml index 9425add5..a3502ada 100644 --- a/gpu-dawn/.github/workflows/m1_ci.yml +++ b/gpu-dawn/.github/workflows/m1_ci.yml @@ -24,7 +24,7 @@ jobs: - name: Clone mach-glfw run: rm libs/mach-glfw && git clone https://github.com/hexops/mach-glfw libs/mach-glfw - 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: AGREE: true - name: upload (debug) @@ -35,7 +35,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - 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: AGREE: true - name: upload (release-fast) diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index 5c58f4e7..52599f44 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -8,7 +8,7 @@ pub fn build(b: *Builder) void { const target = b.standardTargetOptions(.{}); 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"); @@ -219,7 +219,7 @@ pub fn linkFromBinary(b: *Builder, step: *std.build.LibExeObjStep, options: Opti }; 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("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); }