wrap_symbols.cc修改为放到custom_cxx里

puerts · Aug 13, 2024 · 5502117 · 5502117
1 parent 8be7a56
commit 5502117
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 14 deletions.
diff --git a/android_armv7.sh b/android_armv7.sh
@@ -79,7 +79,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +73,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +73,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +36,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +71,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +71,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +35,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +35,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +35,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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,7 +35,8 @@ CXX_SETTING="use_custom_libcxx=false"
 
 if [ "$NEW_WRAP" == "with_new_wrap" ]; then 
   echo "=====[ wrap new delete ]====="
-  node $GITHUB_WORKSPACE/node-script/do-gitpatch.js -p $GITHUB_WORKSPACE/patches/wrap_new_delete_v$VERSION.patch
+  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/windows_32.cmd b/windows_32.cmd
@@ -51,7 +51,8 @@ set "CXX_SETTING=is_clang=false use_custom_libcxx=false"
 
 if "%NEW_WRAP%"=="with_new_wrap" (
     echo =====[ wrap new delete ]=====
-    node %~dp0\node-script\do-gitpatch.js -p %GITHUB_WORKSPACE%\patches\wrap_new_delete_v%VERSION%.patch
+    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,7 +56,8 @@ set "CXX_SETTING=is_clang=false use_custom_libcxx=false"
 
 if "%NEW_WRAP%"=="with_new_wrap" (
     echo =====[ wrap new delete ]=====
-    node %~dp0\node-script\do-gitpatch.js -p %GITHUB_WORKSPACE%\patches\wrap_new_delete_v%VERSION%.patch
+    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,7 +51,8 @@ set "CXX_SETTING=is_clang=false use_custom_libcxx=false"
 
 if "%NEW_WRAP%"=="with_new_wrap" (
     echo =====[ wrap new delete ]=====
-    node %~dp0\node-script\do-gitpatch.js -p %GITHUB_WORKSPACE%\patches\wrap_new_delete_v%VERSION%.patch
+    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
@@ -57,7 +57,7 @@ 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.+\,)/g, '$1\n    \"//third_party/libc++/src/src/wrap_symbols.cc\",'));
+    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"
 )