Skip to content

Commit 38d43d9

Browse files
committed
fix arm build/ and rename build_appimage.sh
1 parent a4a4c76 commit 38d43d9

5 files changed

Lines changed: 7 additions & 4 deletions

File tree

infra/APPIMAGE/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
### Instructions
44
This directory contains files to generate an .AppImage of Thorium.
55

6-
You __must__ place the .deb file (generated from running `package.sh`) in this directory, and then run `./build_appimage.sh`
6+
You __must__ place the .deb file (generated from running `package.sh`) in this directory, and then run `./make_appimage.sh`
77

88
When it is done, you will have an appimage in *out*, I.E. it should be something like `//thorium/infra/APPIMAGE/out/Thorium_Browser-104.0.5107.0.glibc2.17-x86_64.AppImage`
99

infra/APPIMAGE/extract_appimage.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ try() { "$@" || die "${RED}Failed $*"; }
1818
displayHelp () {
1919
printf "\n" &&
2020
printf "${bold}${GRE}Script to extract Thorium .AppImage on Linux.${c0}\n" &&
21-
printf "${bold}${YEL}Please run build_appimage.sh in this directory before running.${c0}\n" &&
21+
printf "${bold}${YEL}Please run make_appimage.sh in this directory before running.${c0}\n" &&
2222
printf "\n"
2323
}
2424
case $1 in
2525
--help) displayHelp; exit 0;;
2626
esac
2727

2828
printf "\n" &&
29-
printf "${bold}${RED}NOTE: You must run build_appimage.sh in this directory before running.${c0}\n" &&
29+
printf "${bold}${RED}NOTE: You must run make_appimage.sh in this directory before running.${c0}\n" &&
3030
printf "${YEL}Extracting Thorium*.Appimage...\n" &&
3131
printf "${c0}\n" &&
3232

infra/set_exec.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ sudo chmod -v +x infra/portable/make_portable_win.sh &&
9999

100100
sudo chmod -v +x infra/APPIMAGE/pkg2appimage &&
101101

102-
sudo chmod -v +x infra/APPIMAGE/build_appimage.sh &&
102+
sudo chmod -v +x infra/APPIMAGE/make_appimage.sh &&
103103

104104
sudo chmod -v +x infra/APPIMAGE/extract_appimage.sh &&
105105

setup.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ esac
111111
copyRaspi () {
112112
printf "\n" &&
113113
printf "${YEL}Copying Raspberry Pi build files...${c0}\n" &&
114+
cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
114115
cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
115116
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
116117
cp -r -v arm/raspi/* ${CR_SRC_DIR}/ &&
@@ -130,6 +131,7 @@ esac
130131
copyWOA () {
131132
printf "\n" &&
132133
printf "${YEL}Copying Windows on ARM build files...${c0}\n" &&
134+
cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
133135
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
134136
# Use regular arm.gni from src, pending further testing
135137
# cp -v arm/woa_arm.gni ${CR_SRC_DIR}/build/config/arm.gni &&
@@ -192,6 +194,7 @@ esac
192194
copyAndroid () {
193195
printf "\n" &&
194196
printf "${YEL}Copying Android (ARM64 and ARM32) build files...${c0}\n" &&
197+
cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
195198
cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
196199
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
197200
printf "\n" &&

0 commit comments

Comments
 (0)