Merge pull request #72 from lightpanda-io/out_path_include_os

include OS in out path

Author: karlseguin

.github/workflows/build-release.yml

@@ -37,7 +37,7 @@ jobs:
 
       - run: zig build get-v8
       - run: zig build -Doptimize=ReleaseSafe build-v8
-      - run: mv v8/out/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
+      - run: mv v8/out/${{ env.OS }}/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
 
       - name: Upload the build
         uses: ncipollo/release-action@v1
@@ -67,7 +67,7 @@ jobs:
 
       - run: zig build get-v8
       - run: zig build -Doptimize=ReleaseSafe build-v8
-      - run: mv v8/out/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
+      - run: mv v8/out/${{ env.OS }}/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
 
       - name: Upload the build
         uses: ncipollo/release-action@v1
@@ -102,7 +102,7 @@ jobs:
 
       - run: zig build get-v8
       - run: zig build -Doptimize=ReleaseSafe build-v8
-      - run: mv v8/out/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
+      - run: mv v8/out/${{ env.OS }}/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
 
       - name: Upload the build
         uses: ncipollo/release-action@v1
@@ -132,7 +132,7 @@ jobs:
 
       - run: zig build get-v8
       - run: zig build -Doptimize=ReleaseSafe build-v8
-      - run: mv v8/out/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
+      - run: mv v8/out/${{ env.OS }}/release/obj/zig/libc_v8.a libc_v8_${{ env.V8_REVISION }}_${{ env.OS }}_${{ env.ARCH }}.a
 
       - name: Upload the build
         uses: ncipollo/release-action@v1

Dockerfile

@@ -17,7 +17,7 @@ RUN zig build
 RUN zig build get-v8
 RUN zig build -Doptimize=ReleaseSafe build-v8
 
-RUN mv v8/out/release/obj/zig/libc_v8.a /src/libc_v8.a
+RUN mv v8/out/linux/release/obj/zig/libc_v8.a /src/libc_v8.a
 
 FROM scratch as artifact
 

README.md

@@ -22,6 +22,6 @@ zig build get-v8
 zig build build-v8
 ```
 
-Once complete, you can find v8 in: `v8/out/debug/obj/zig/libc_v8.a`
+Once complete, you can find v8 in: `v8/out/LINUX_OR_MAC/debug/obj/zig/libc_v8.a`
 
-If you build with `zig build -Doptimize=ReleaseFast build-v8`, v8 will be in `v8/out/release/obj/zig/libc_v8.a`.
+If you build with `zig build -Doptimize=ReleaseFast build-v8`, v8 will be in `v8/out/LINUX_OR_MAC/release/obj/zig/libc_v8.a`.

build-tools/build_v8.sh

@@ -11,7 +11,11 @@ MODE=${2:-"debug"}
 cp ${SRC_ROOT}/binding.cpp src/
 cp ${SRC_ROOT}/inspector.h src/
 
-OUT=out/${MODE}
+OUT_OS_PATH=${OS}
+if [ "${OS}" = "mac" ]; then
+  OUT_OS_PATH="macos"
+fi
+OUT=out/${OUT_OS_PATH}/${MODE}
 
 if [[ ${MODE} == "release" ]]; then
   IS_DEBUG="false"

build.zig

@@ -121,7 +121,13 @@ pub fn build(b: *std.Build) !void {
         step.root_module.addImport("default_exports", build_opts.createModule());
 
         const release_dir = if (mode == .Debug) "debug" else "release";
-        step.addObjectFile(b.path(b.fmt("v8/out/{s}/obj/zig/libc_v8.a", .{ release_dir })));
+        const os = switch (target.result.os.tag) {
+            .linux => "linux",
+            .macos => "macos",
+            else => return error.UnsupportedPlatform,
+        };
+
+        step.addObjectFile(b.path(b.fmt("v8/out/{s}/{s}/obj/zig/libc_v8.a", .{ os, release_dir })));
         step.addIncludePath(b.path("src"));
 
         switch (target.result.os.tag) {