From 36a518957718d26460438ced9c68b3284ba0e852 Mon Sep 17 00:00:00 2001 From: blm Date: Thu, 19 Jan 2023 18:42:14 -0500 Subject: [PATCH] make fixes --- docs/development/Electronite/LinuxBuildNotes.md | 4 ++-- docs/development/Electronite/MacBuildNotes.md | 4 ++-- docs/development/Electronite/WindowsBuildNotes.md | 6 +++--- .../Electronite/add_graphite_cpp_std_iterator.patch | 2 +- docs/development/Electronite/make_new_electronite.sh | 4 ++-- .../Electronite/meta_builds/build_all_goma_linux.sh | 2 +- .../Electronite/meta_builds/build_all_goma_mac.sh | 2 +- .../Electronite/meta_builds/build_all_goma_win.bat | 2 +- docs/development/Electronite/meta_builds/build_all_linux.sh | 2 +- docs/development/Electronite/meta_builds/build_all_mac.sh | 2 +- docs/development/Electronite/meta_builds/build_all_win.bat | 2 +- .../Electronite/meta_builds/build_target_goma_linux.sh | 2 +- .../Electronite/meta_builds/build_target_goma_mac.sh | 2 +- .../Electronite/meta_builds/build_target_goma_win.bat | 2 +- .../Electronite/meta_builds/build_target_linux.sh | 2 +- .../development/Electronite/meta_builds/build_target_mac.sh | 2 +- docs/development/Electronite/meta_builds/copy_from_s3.sh | 2 +- docs/development/Electronite/meta_builds/copy_to_s3.bat | 2 +- docs/development/Electronite/meta_builds/copy_to_s3.sh | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/development/Electronite/LinuxBuildNotes.md b/docs/development/Electronite/LinuxBuildNotes.md index 16b1bcc57f1c6..cb1aaa6457421 100644 --- a/docs/development/Electronite/LinuxBuildNotes.md +++ b/docs/development/Electronite/LinuxBuildNotes.md @@ -20,7 +20,7 @@ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git - get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded). Open new terminal window, cd to the build folder and then run: ``` export PATH=$(pwd)/depot_tools:$PATH -./electronite-tools-3.sh get electronite-v22.0.1-beta +./electronite-tools-3.sh get electronite-v22.0.3-beta ``` - Do build (takes a long time) @@ -50,7 +50,7 @@ sudo apt-get install binutils-aarch64-linux-gnu - get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded): ``` export PATH=$(pwd)/depot_tools:$PATH -./electronite-tools-3.sh get electronite-v22.0.1-beta +./electronite-tools-3.sh get electronite-v22.0.3-beta ``` - Build Init: to create `arm64` builds, you must have installed the arm64 dependencies mentioned in the Linux build instructions above. Then run: diff --git a/docs/development/Electronite/MacBuildNotes.md b/docs/development/Electronite/MacBuildNotes.md index 1d3fd42953085..99679b916f397 100644 --- a/docs/development/Electronite/MacBuildNotes.md +++ b/docs/development/Electronite/MacBuildNotes.md @@ -36,7 +36,7 @@ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git - get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded). Open new terminal window , cd to the build folder and then run: ``` export PATH=$(pwd)/depot_tools:$PATH -./electronite-tools-3.sh get electronite-v22.0.1-beta +./electronite-tools-3.sh get electronite-v22.0.3-beta ``` - Do build (takes a long time) @@ -61,7 +61,7 @@ Open elements tab, select body of html, do command-F to search, and search for ` - get the Electronite source code for branch (this can take many hours the first time as the git cache is loaded): ``` export PATH=$(pwd)/depot_tools:$PATH -./electronite-tools-3.sh get electronite-v22.0.1-beta +./electronite-tools-3.sh get electronite-v22.0.3-beta ``` - Do build (takes a long time) diff --git a/docs/development/Electronite/WindowsBuildNotes.md b/docs/development/Electronite/WindowsBuildNotes.md index 562b0ccc3ef9f..ef7b8ed66f921 100644 --- a/docs/development/Electronite/WindowsBuildNotes.md +++ b/docs/development/Electronite/WindowsBuildNotes.md @@ -39,7 +39,7 @@ git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git - open command prompt, cd to the build directory, and initialize build configuration: ``` set Path=%cd%\depot_tools;%Path% -.\electronite-tools-3.bat get electronite-v22.0.1-beta +.\electronite-tools-3.bat get electronite-v22.0.3-beta ``` - Do build (takes a long time) @@ -64,7 +64,7 @@ set Path=%cd%\depot_tools;%Path% - get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources ``` set Path=%cd%\depot_tools;%Path% -.\electronite-tools-3.bat get electronite-v22.0.1-beta +.\electronite-tools-3.bat get electronite-v22.0.3-beta ``` - Do build (takes a long time) @@ -81,7 +81,7 @@ set Path=%cd%\depot_tools;%Path% -- get the Electronite source code (this can take many hours the first time as the git cache is loaded), checkout the correct Electronite tag and get build sources ``` set Path=%cd%\depot_tools;%Path% -.\electronite-tools-3.bat get electronite-v22.0.1-beta +.\electronite-tools-3.bat get electronite-v22.0.3-beta ``` - Do build (takes a long time) diff --git a/docs/development/Electronite/add_graphite_cpp_std_iterator.patch b/docs/development/Electronite/add_graphite_cpp_std_iterator.patch index 972af3fbc3fe7..45532478b5202 100755 --- a/docs/development/Electronite/add_graphite_cpp_std_iterator.patch +++ b/docs/development/Electronite/add_graphite_cpp_std_iterator.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Thu Nov 3 15:48:39 2022 From: Bruce Date: Thu Nov 3 2022 15:48:39 -0700 -Subject: [PATCH] fix graphite2 sources to be compatible with latest C++ standards -- patched for v22.0.1 +Subject: [PATCH] fix graphite2 sources to be compatible with latest C++ standards -- patched for v22.0.3 diff --git a/third_party/graphite/graphite2/src/GlyphCache.cpp b/third_party/graphite/graphite2/src/GlyphCache.cpp index 282bdc18..336de3f1 100644 diff --git a/docs/development/Electronite/make_new_electronite.sh b/docs/development/Electronite/make_new_electronite.sh index 22d353ced6143..5470a81083012 100755 --- a/docs/development/Electronite/make_new_electronite.sh +++ b/docs/development/Electronite/make_new_electronite.sh @@ -7,10 +7,10 @@ set -x # Then copy files from old electronite branch ($OLD_ELECTRONITE_BRANCH) # and commit them in new electronite branch. # -# Example `./make_new_electronite.sh v22.0.3 electronite-v22.0.1` +# Example `./make_new_electronite.sh v22.0.3 electronite-v22.0.3` # # or with github token: -# `./make_new_electronite.sh v22.0.3 electronite-v22.0.1 ` +# `./make_new_electronite.sh v22.0.3 electronite-v22.0.3 ` NEW_ELECTRON_VERSION=$1 OLD_ELECTRONITE_BRANCH=$2 diff --git a/docs/development/Electronite/meta_builds/build_all_goma_linux.sh b/docs/development/Electronite/meta_builds/build_all_goma_linux.sh index 9b0ad6033035e..f776fd1a5abd3 100755 --- a/docs/development/Electronite/meta_builds/build_all_goma_linux.sh +++ b/docs/development/Electronite/meta_builds/build_all_goma_linux.sh @@ -13,7 +13,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_all_goma_linux.sh electronite-v22.0.1-beta results/linux/v22.0.1` +# Example `./build_all_goma_linux.sh electronite-v22.0.3-beta results/linux/v22.0.3` BRANCH=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/build_all_goma_mac.sh b/docs/development/Electronite/meta_builds/build_all_goma_mac.sh index d1cff946b4395..df04cfc683484 100755 --- a/docs/development/Electronite/meta_builds/build_all_goma_mac.sh +++ b/docs/development/Electronite/meta_builds/build_all_goma_mac.sh @@ -13,7 +13,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_all_goma_mac.sh electronite-v22.0.1-beta results/mac/v22.0.1` +# Example `./build_all_goma_mac.sh electronite-v22.0.3-beta results/mac/v22.0.3` BRANCH=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/build_all_goma_win.bat b/docs/development/Electronite/meta_builds/build_all_goma_win.bat index cabb97fbab60c..08511b51e5fd3 100755 --- a/docs/development/Electronite/meta_builds/build_all_goma_win.bat +++ b/docs/development/Electronite/meta_builds/build_all_goma_win.bat @@ -13,7 +13,7 @@ rem to enable goma, do `set GOMA=cache-only` before running script rem rem to troubleshoot build problems, do build logging by doing `set BUILD_EXTRAS=-vvvvv` before running rem -rem Example `build_all_goma_win.bat electronite-v22.0.1-beta results\win\v22.0.1` +rem Example `build_all_goma_win.bat electronite-v22.0.3-beta results\win\v22.0.3` echo "Building %BRANCH% to: %DEST%" diff --git a/docs/development/Electronite/meta_builds/build_all_linux.sh b/docs/development/Electronite/meta_builds/build_all_linux.sh index 95d74f5118723..d028f26bb3ee3 100755 --- a/docs/development/Electronite/meta_builds/build_all_linux.sh +++ b/docs/development/Electronite/meta_builds/build_all_linux.sh @@ -11,7 +11,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_all_linux.sh electronite-v22.0.1-beta results/linux/v22.0.1` +# Example `./build_all_linux.sh electronite-v22.0.3-beta results/linux/v22.0.3` BRANCH=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/build_all_mac.sh b/docs/development/Electronite/meta_builds/build_all_mac.sh index 23cb4992fb5b5..5c6f88e07b770 100755 --- a/docs/development/Electronite/meta_builds/build_all_mac.sh +++ b/docs/development/Electronite/meta_builds/build_all_mac.sh @@ -11,7 +11,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_all_mac.sh electronite-v22.0.1-beta results/mac/v22.0.1` +# Example `./build_all_mac.sh electronite-v22.0.3-beta results/mac/v22.0.3` BRANCH=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/build_all_win.bat b/docs/development/Electronite/meta_builds/build_all_win.bat index f640453ea851c..57da1368236d6 100755 --- a/docs/development/Electronite/meta_builds/build_all_win.bat +++ b/docs/development/Electronite/meta_builds/build_all_win.bat @@ -11,7 +11,7 @@ rem `set Path=%cd%\depot_tools;%Path%` rem rem to troubleshoot build problems, do build logging by doing `set BUILD_EXTRAS=-vvvvv` before running rem -rem Example `build_all_win.bat electronite-v22.0.1-beta results\win\v22.0.1` +rem Example `build_all_win.bat electronite-v22.0.3-beta results\win\v22.0.3` echo "Building %BRANCH% to: %DEST%" diff --git a/docs/development/Electronite/meta_builds/build_target_goma_linux.sh b/docs/development/Electronite/meta_builds/build_target_goma_linux.sh index 57ea6caee9a9b..9272a0bafbca7 100755 --- a/docs/development/Electronite/meta_builds/build_target_goma_linux.sh +++ b/docs/development/Electronite/meta_builds/build_target_goma_linux.sh @@ -12,7 +12,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_target_goma_linux.sh x64 results/linux/v22.0.1` +# Example `./build_target_goma_linux.sh x64 results/linux/v22.0.3` TARGET=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/build_target_goma_mac.sh b/docs/development/Electronite/meta_builds/build_target_goma_mac.sh index 22cd291c08104..bed30d919c153 100755 --- a/docs/development/Electronite/meta_builds/build_target_goma_mac.sh +++ b/docs/development/Electronite/meta_builds/build_target_goma_mac.sh @@ -12,7 +12,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_target_goma_mac.sh x64 results/mac/v22.0.1` +# Example `./build_target_goma_mac.sh x64 results/mac/v22.0.3` TARGET=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/build_target_goma_win.bat b/docs/development/Electronite/meta_builds/build_target_goma_win.bat index 3b9935c9a1f3e..37f26ca29d035 100755 --- a/docs/development/Electronite/meta_builds/build_target_goma_win.bat +++ b/docs/development/Electronite/meta_builds/build_target_goma_win.bat @@ -12,7 +12,7 @@ rem to enable goma, do `set GOMA=cache-only` before running script rem rem to troubleshoot build problems, do build logging by doing `set BUILD_EXTRAS=-vvvvv` before running rem -rem Example `build_target_goma_win.bat x64 results\win\v22.0.1` +rem Example `build_target_goma_win.bat x64 results\win\v22.0.3` echo "Building %TARGET% to: %DEST%" diff --git a/docs/development/Electronite/meta_builds/build_target_linux.sh b/docs/development/Electronite/meta_builds/build_target_linux.sh index a5d523065411a..fb99365c060c5 100755 --- a/docs/development/Electronite/meta_builds/build_target_linux.sh +++ b/docs/development/Electronite/meta_builds/build_target_linux.sh @@ -10,7 +10,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_target_linux.sh x64 results/linux/v22.0.1` +# Example `./build_target_linux.sh x64 results/linux/v22.0.3` TARGET=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/build_target_mac.sh b/docs/development/Electronite/meta_builds/build_target_mac.sh index f7c8996a64164..dda27836840cf 100755 --- a/docs/development/Electronite/meta_builds/build_target_mac.sh +++ b/docs/development/Electronite/meta_builds/build_target_mac.sh @@ -10,7 +10,7 @@ set -e # # to troubleshoot build problems, do build logging by doing `export BUILD_EXTRAS=-vvvvv` before running # -# Example `./build_target_mac.sh x64 results/mac/v22.0.1` +# Example `./build_target_mac.sh x64 results/mac/v22.0.3` TARGET=$1 DEST=$2 diff --git a/docs/development/Electronite/meta_builds/copy_from_s3.sh b/docs/development/Electronite/meta_builds/copy_from_s3.sh index b14adc4e6eda8..905b27edf7fc3 100755 --- a/docs/development/Electronite/meta_builds/copy_from_s3.sh +++ b/docs/development/Electronite/meta_builds/copy_from_s3.sh @@ -9,7 +9,7 @@ set -e # No obvious reason for this, but found it started working by either setting or # clearing ID `export AWS_SECRET_ACCESS_KEY=` before running script. # -# Example `./copy_from_s3.sh v22.0.1` +# Example `./copy_from_s3.sh v22.0.3` VERSION=$1 diff --git a/docs/development/Electronite/meta_builds/copy_to_s3.bat b/docs/development/Electronite/meta_builds/copy_to_s3.bat index ba14670720a14..d609c749651ae 100755 --- a/docs/development/Electronite/meta_builds/copy_to_s3.bat +++ b/docs/development/Electronite/meta_builds/copy_to_s3.bat @@ -6,7 +6,7 @@ rem Got an S3 error that AWS user did not exist when entering credentials at p rem No obvious reason for this, but found it started working by either setting or rem clearing ID `export AWS_SECRET_ACCESS_KEY=` before running script. rem -rem Example `./copy_to_s3.sh v22.0.1 ` +rem Example `./copy_to_s3.sh v22.0.3 ` SETLOCAL set VERSION=%1 diff --git a/docs/development/Electronite/meta_builds/copy_to_s3.sh b/docs/development/Electronite/meta_builds/copy_to_s3.sh index aaa70495c6aa3..3047c08b0957a 100755 --- a/docs/development/Electronite/meta_builds/copy_to_s3.sh +++ b/docs/development/Electronite/meta_builds/copy_to_s3.sh @@ -9,7 +9,7 @@ set -e # No obvious reason for this, but found it started working by either setting or # clearing ID `export AWS_SECRET_ACCESS_KEY=` before running script. # -# Example `./copy_to_s3.sh v22.0.1` +# Example `./copy_to_s3.sh v22.0.3` VERSION=$1