Skip to content

Commit

Permalink
make fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
PhotoNomad0 committed Jan 19, 2023
1 parent 42bb8a2 commit 36a5189
Show file tree
Hide file tree
Showing 19 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions docs/development/Electronite/LinuxBuildNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docs/development/Electronite/MacBuildNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions docs/development/Electronite/WindowsBuildNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Thu Nov 3 15:48:39 2022
From: Bruce <[email protected]>
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
Expand Down
4 changes: 2 additions & 2 deletions docs/development/Electronite/make_new_electronite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <token>`
# `./make_new_electronite.sh v22.0.3 electronite-v22.0.3 <token>`

NEW_ELECTRON_VERSION=$1
OLD_ELECTRONITE_BRANCH=$2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/development/Electronite/meta_builds/build_all_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/development/Electronite/meta_builds/build_all_win.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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%"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/development/Electronite/meta_builds/copy_from_s3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/development/Electronite/meta_builds/copy_to_s3.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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 <key> <secret>`
rem Example `./copy_to_s3.sh v22.0.3 <key> <secret>`

SETLOCAL
set VERSION=%1
Expand Down
2 changes: 1 addition & 1 deletion docs/development/Electronite/meta_builds/copy_to_s3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 36a5189

Please sign in to comment.