根据版本修改

puerts · Aug 13, 2024 · 082810d · 082810d
1 parent 5502117
commit 082810d
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 28 deletions.
diff --git a/android_armv7.sh b/android_armv7.sh
@@ -79,8 +79,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   CXX_SETTING="use_custom_libcxx=true"
 fi
 

diff --git a/android_armv8.sh b/android_armv8.sh
@@ -73,8 +73,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   CXX_SETTING="use_custom_libcxx=true"
 fi
 

diff --git a/android_x64.sh b/android_x64.sh
@@ -73,8 +73,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   CXX_SETTING="use_custom_libcxx=true"
 fi
 

diff --git a/ios.sh b/ios.sh
@@ -36,8 +36,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   brew install llvm
   export PATH="/usr/local/opt/llvm/bin:$PATH"
   CXX_SETTING="use_custom_libcxx=true"

diff --git a/linux.sh b/linux.sh
@@ -71,8 +71,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   sudo apt-get install -y llvm
   CXX_SETTING="use_custom_libcxx=true"
 fi

diff --git a/linux_arm64.sh b/linux_arm64.sh
@@ -71,8 +71,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   sudo apt-get install -y llvm
   CXX_SETTING="use_custom_libcxx=true"
 fi

diff --git a/macos.sh b/macos.sh
@@ -35,8 +35,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   brew install llvm
   export PATH="/usr/local/opt/llvm/bin:$PATH"
   CXX_SETTING="use_custom_libcxx=true"

diff --git a/macos_DLL.sh b/macos_DLL.sh
@@ -35,8 +35,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   brew install llvm
   export PATH="/usr/local/opt/llvm/bin:$PATH"
   CXX_SETTING="use_custom_libcxx=true libcxx_is_shared=false"

diff --git a/macos_arm64.sh b/macos_arm64.sh
@@ -35,8 +35,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   brew install llvm
   export PATH="/usr/local/opt/llvm/bin:$PATH"
   CXX_SETTING="use_custom_libcxx=true"

diff --git a/macos_arm64_DLL.sh b/macos_arm64_DLL.sh
@@ -35,8 +35,6 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  cp -f $GITHUB_WORKSPACE/node-script/wrap_symbols.cc "third_party/libc++/src/src"
-  node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
   brew install llvm
   export PATH="/usr/local/opt/llvm/bin:$PATH"
   CXX_SETTING="use_custom_libcxx=true libcxx_is_shared=false"

diff --git a/node-script/patchs.js b/node-script/patchs.js
@@ -65,5 +65,18 @@ function addV8CC() {
         justReplace(path.join(v8_path, 'src/api/api.h'), 'NewArray<internal::Address>(kHandleBlockSize)', 'NewArray<internal::Address>(kHandleBlockSize + 1)');
     } else {
         console.log("wrap_new is set, skip path kHandleBlockSize");
+        const replacePath = path.join(v8_path, 'buildtools/third_party/libc++/BUILD.gn');
+        if (v8_version == "9.4.146.24") {
+            justReplace(replacePath, '\"trunk/src/vector.cpp\",', '\"trunk/src/vector.cpp\",\n    \"trunk/src/wrap_symbols.cc\",');
+            fs.copyFileSync(path.join(__dirname, 'wrap_symbols.cc'), path.join(v8_path, 'buildtools/third_party/libc++/trunk/src/wrap_symbols.cc'));
+        } else if (v8_version == "10.6.194") {
+            justReplace(replacePath, '\"trunk/src/verbose_abort.cpp\",', '\"trunk/src/verbose_abort.cpp\",\n    \"trunk/src/wrap_symbols.cc\",');
+            fs.copyFileSync(path.join(__dirname, 'wrap_symbols.cc'), path.join(v8_path, 'buildtools/third_party/libc++/trunk/src/wrap_symbols.cc'));
+        } else if (v8_version == "11.8.172") {
+            justReplace(replacePath, '\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",');
+            fs.copyFileSync(path.join(__dirname, 'wrap_symbols.cc'), path.join(v8_path, 'third_party/libc++/src/src/wrap_symbols.cc'));
+        } else {
+            throw new Error(`not support version:${v8_version}`);
+        }
     }
 })();
diff --git a/windows_32.cmd b/windows_32.cmd
@@ -51,8 +51,6 @@ set "CXX_SETTING=is_clang=false use_custom_libcxx=false"
 
 if "%NEW_WRAP%"=="with_new_wrap" (
     echo =====[ wrap new delete ]=====
-    copy /Y %~dp0\node-script\wrap_symbols.cc "third_party\libc++\src\src"
-    node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
     set "CXX_SETTING=is_clang=true use_custom_libcxx=true"
 )
 

diff --git a/windows_64.cmd b/windows_64.cmd
@@ -56,8 +56,6 @@ set "CXX_SETTING=is_clang=false use_custom_libcxx=false"
 
 if "%NEW_WRAP%"=="with_new_wrap" (
     echo =====[ wrap new delete ]=====
-    copy /Y %~dp0\node-script\wrap_symbols.cc "third_party\libc++\src\src"
-    node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
     set "CXX_SETTING=is_clang=true use_custom_libcxx=true"
 )
 

diff --git a/windows_64MD.cmd b/windows_64MD.cmd
@@ -51,8 +51,6 @@ set "CXX_SETTING=is_clang=false use_custom_libcxx=false"
 
 if "%NEW_WRAP%"=="with_new_wrap" (
     echo =====[ wrap new delete ]=====
-    copy /Y %~dp0\node-script\wrap_symbols.cc "third_party\libc++\src\src"
-    node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
     set "CXX_SETTING=is_clang=true use_custom_libcxx=true"
 )
 

diff --git a/windows_64MD_DLL_94.cmd b/windows_64MD_DLL_94.cmd
@@ -56,8 +56,6 @@ set "CXX_SETTING=is_clang=false use_custom_libcxx=false"
 
 if "%NEW_WRAP%"=="with_new_wrap" (
     echo =====[ wrap new delete ]=====
-    copy /Y %~dp0\node-script\wrap_symbols.cc "third_party\libc++\src\src"
-    node -e "const fs = require('fs'); fs.writeFileSync('buildtools/third_party/libc++/BUILD.gn', fs.readFileSync('buildtools/third_party/libc++/BUILD.gn', 'utf-8').replace('\"//third_party/libc++/src/src/verbose_abort.cpp\",', '\"//third_party/libc++/src/src/verbose_abort.cpp\",\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));"
     set "CXX_SETTING=is_clang=true use_custom_libcxx=true libcxx_is_shared=false"
 )