From e80d3e1f66449465f70b9bd9b657ffa39dfa6527 Mon Sep 17 00:00:00 2001
From: Jarred Sumner <jarred@jarredsumner.com>
Date: Fri, 15 Nov 2024 21:35:21 -0800
Subject: [PATCH] bump

---
 Dockerfile       |  8 ++++----
 Dockerfile.musl  |  4 ++--
 mac-release.bash | 16 ++++++++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 768b0c0f6e101..fb6cc6f2e206f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,8 +106,8 @@ ENV MARCH_FLAG=${MARCH_FLAG}
 
 
 RUN --mount=type=tmpfs,target=/webkitbuild \
-    export CFLAGS="${DEFAULT_CFLAGS} $CFLAGS $LTO_FLAG -ffile-prefix-map=/webkit/Source=src/bun.js/WebKit/Source  -ffile-prefix-map=/webkitbuild/=. " && \
-    export CXXFLAGS="${DEFAULT_CFLAGS} $CXXFLAGS $LTO_FLAG -fno-c++-static-destructors -ffile-prefix-map=/webkit/Source=src/bun.js/WebKit/Source -ffile-prefix-map=/webkitbuild/=. " && \
+    export CFLAGS="${DEFAULT_CFLAGS} $CFLAGS $LTO_FLAG -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source  -ffile-prefix-map=/webkitbuild/=. " && \
+    export CXXFLAGS="${DEFAULT_CFLAGS} $CXXFLAGS $LTO_FLAG -fno-c++-static-destructors -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source -ffile-prefix-map=/webkitbuild/=. " && \
     export LDFLAGS="-fuse-ld=lld $LDFLAGS " && \
     cd /webkitbuild && \
     cmake \
@@ -136,8 +136,8 @@ RUN --mount=type=tmpfs,target=/webkitbuild \
     cp $WEBKIT_OUT_DIR/*.h /output/include && \
     cp -r $WEBKIT_OUT_DIR/bin /output/bin && \
     cp $WEBKIT_OUT_DIR/*.json /output && \
-    find $WEBKIT_OUT_DIR/JavaScriptCore/DerivedSources/ -name "*.h" -exec cp {} /output/include/JavaScriptCore/ \; && \
-    find $WEBKIT_OUT_DIR/JavaScriptCore/DerivedSources/ -name "*.json" -exec cp {} /output/ \; && \
+    find $WEBKIT_OUT_DIR/JavaScriptCore/DerivedSources/ -name "*.h" -exec sh -c 'cp "$1" "/output/include/JavaScriptCore/$(basename "$1")"' sh {} \; && \
+    find $WEBKIT_OUT_DIR/JavaScriptCore/DerivedSources/ -name "*.json" -exec sh -c 'cp "$1" "/output/$(basename "$1")"' sh {} \; && \
     find $WEBKIT_OUT_DIR/JavaScriptCore/Headers/JavaScriptCore/ -name "*.h" -exec cp {} /output/include/JavaScriptCore/ \; && \
     find $WEBKIT_OUT_DIR/JavaScriptCore/PrivateHeaders/JavaScriptCore/ -name "*.h" -exec cp {} /output/include/JavaScriptCore/ \; && \
     cp -r $WEBKIT_OUT_DIR/WTF/Headers/wtf/ /output/include && \
diff --git a/Dockerfile.musl b/Dockerfile.musl
index b47fc0bc88401..8ecdf62e69aee 100644
--- a/Dockerfile.musl
+++ b/Dockerfile.musl
@@ -78,8 +78,8 @@ WORKDIR /webkit
 COPY --from=build_icu /output /icu
 
 RUN --mount=type=tmpfs,target=/webkitbuild \
-    export CFLAGS="${DEFAULT_CFLAGS} $CFLAGS $LTO_FLAG -ffile-prefix-map=/webkit/Source=src/bun.js/WebKit/Source  -ffile-prefix-map=/webkitbuild/=. " && \
-    export CXXFLAGS="${DEFAULT_CFLAGS} $CXXFLAGS $LTO_FLAG -fno-c++-static-destructors -ffile-prefix-map=/webkit/Source=src/bun.js/WebKit/Source -ffile-prefix-map=/webkitbuild/=. " && \
+    export CFLAGS="${DEFAULT_CFLAGS} $CFLAGS $LTO_FLAG -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source  -ffile-prefix-map=/webkitbuild/=. " && \
+    export CXXFLAGS="${DEFAULT_CFLAGS} $CXXFLAGS $LTO_FLAG -fno-c++-static-destructors -ffile-prefix-map=/webkit/Source=vendor/WebKit/Source -ffile-prefix-map=/webkitbuild/=. " && \
     export LDFLAGS="-fuse-ld=lld $LDFLAGS " && \
     cd /webkitbuild && \
     cmake \
diff --git a/mac-release.bash b/mac-release.bash
index 6057c4ab07443..a3a5162e0fec8 100644
--- a/mac-release.bash
+++ b/mac-release.bash
@@ -40,8 +40,8 @@ cmake \
     -DENABLE_FTL_JIT=ON \
     -DCMAKE_C_COMPILER="$CMAKE_C_COMPILER" \
     -DCMAKE_CXX_COMPILER="$CMAKE_CXX_COMPILER" \
-    -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -ffile-prefix-map=$THIS_DIR/Source=src/bun.js/WebKit/Source " \
-    -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -ffile-prefix-map=$THIS_DIR/Source=src/bun.js/WebKit/Source " \
+    -DCMAKE_C_FLAGS="$CMAKE_C_FLAGS -ffile-prefix-map=$THIS_DIR/Source=vendor/WebKit/Source " \
+    -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -ffile-prefix-map=$THIS_DIR/Source=vendor/WebKit/Source " \
     -DENABLE_MALLOC_HEAP_BREAKDOWN=$ENABLE_MALLOC_HEAP_BREAKDOWN \
     -DUSE_BUN_JSC_ADDITIONS=ON \
     -DCMAKE_AR="$AR" \
@@ -64,10 +64,14 @@ cp -r $RUNNER_TEMP/webkit-release/ICU/Headers/* $RUNNER_TEMP/bun-webkit/include
 if [ -e $RUNNER_TEMP/webkit-release/bmalloc ]; then
     cp -r $RUNNER_TEMP/webkit-release/bmalloc/Headers/bmalloc $RUNNER_TEMP/bun-webkit/include
 fi
-cp $RUNNER_TEMP/webkit-release/JavaScriptCore/Headers/JavaScriptCore/* $RUNNER_TEMP/bun-webkit/include/JavaScriptCore
-cp $RUNNER_TEMP/webkit-release/JavaScriptCore/DerivedSources/**.h $RUNNER_TEMP/bun-webkit/include/JavaScriptCore
-cp $RUNNER_TEMP/webkit-release/JavaScriptCore/DerivedSources/**.json $RUNNER_TEMP/bun-webkit
-cp $RUNNER_TEMP/webkit-release/JavaScriptCore/PrivateHeaders/JavaScriptCore/* $RUNNER_TEMP/bun-webkit/include/JavaScriptCore
+
+# Copy all the header files in the JavaScriptCore directory to the bun-webkit include/JavaScriptCore directory.
+cp -f $RUNNER_TEMP/webkit-release/JavaScriptCore/Headers/JavaScriptCore/* \
+      $RUNNER_TEMP/webkit-release/JavaScriptCore/PrivateHeaders/JavaScriptCore/* \
+      $RUNNER_TEMP/webkit-release/JavaScriptCore/DerivedSources/*.h \
+      $RUNNER_TEMP/webkit-release/JavaScriptCore/DerivedSources/*/*.h \
+      $RUNNER_TEMP/bun-webkit/include/JavaScriptCore/
+
 mkdir -p $RUNNER_TEMP/bun-webkit/Source/JavaScriptCore
 cp -r $THIS_DIR/Source/JavaScriptCore/Scripts $RUNNER_TEMP/bun-webkit/Source/JavaScriptCore
 cp $THIS_DIR/Source/JavaScriptCore/create_hash_table $RUNNER_TEMP/bun-webkit/Source/JavaScriptCore