mirror of
https://github.com/Alex313031/thorium.git
synced 2025-01-10 03:47:44 -03:00
fix arm build/ and rename build_appimage.sh
This commit is contained in:
parent
a4a4c76cc1
commit
38d43d94ef
5 changed files with 7 additions and 4 deletions
|
@ -3,7 +3,7 @@
|
||||||
### Instructions
|
### Instructions
|
||||||
This directory contains files to generate an .AppImage of Thorium.
|
This directory contains files to generate an .AppImage of Thorium.
|
||||||
|
|
||||||
You __must__ place the .deb file (generated from running `package.sh`) in this directory, and then run `./build_appimage.sh`
|
You __must__ place the .deb file (generated from running `package.sh`) in this directory, and then run `./make_appimage.sh`
|
||||||
|
|
||||||
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`
|
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`
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ try() { "$@" || die "${RED}Failed $*"; }
|
||||||
displayHelp () {
|
displayHelp () {
|
||||||
printf "\n" &&
|
printf "\n" &&
|
||||||
printf "${bold}${GRE}Script to extract Thorium .AppImage on Linux.${c0}\n" &&
|
printf "${bold}${GRE}Script to extract Thorium .AppImage on Linux.${c0}\n" &&
|
||||||
printf "${bold}${YEL}Please run build_appimage.sh in this directory before running.${c0}\n" &&
|
printf "${bold}${YEL}Please run make_appimage.sh in this directory before running.${c0}\n" &&
|
||||||
printf "\n"
|
printf "\n"
|
||||||
}
|
}
|
||||||
case $1 in
|
case $1 in
|
||||||
|
@ -26,7 +26,7 @@ case $1 in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
printf "\n" &&
|
printf "\n" &&
|
||||||
printf "${bold}${RED}NOTE: You must run build_appimage.sh in this directory before running.${c0}\n" &&
|
printf "${bold}${RED}NOTE: You must run make_appimage.sh in this directory before running.${c0}\n" &&
|
||||||
printf "${YEL}Extracting Thorium*.Appimage...\n" &&
|
printf "${YEL}Extracting Thorium*.Appimage...\n" &&
|
||||||
printf "${c0}\n" &&
|
printf "${c0}\n" &&
|
||||||
|
|
||||||
|
|
|
@ -99,7 +99,7 @@ sudo chmod -v +x infra/portable/make_portable_win.sh &&
|
||||||
|
|
||||||
sudo chmod -v +x infra/APPIMAGE/pkg2appimage &&
|
sudo chmod -v +x infra/APPIMAGE/pkg2appimage &&
|
||||||
|
|
||||||
sudo chmod -v +x infra/APPIMAGE/build_appimage.sh &&
|
sudo chmod -v +x infra/APPIMAGE/make_appimage.sh &&
|
||||||
|
|
||||||
sudo chmod -v +x infra/APPIMAGE/extract_appimage.sh &&
|
sudo chmod -v +x infra/APPIMAGE/extract_appimage.sh &&
|
||||||
|
|
||||||
|
|
3
setup.sh
3
setup.sh
|
@ -111,6 +111,7 @@ esac
|
||||||
copyRaspi () {
|
copyRaspi () {
|
||||||
printf "\n" &&
|
printf "\n" &&
|
||||||
printf "${YEL}Copying Raspberry Pi build files...${c0}\n" &&
|
printf "${YEL}Copying Raspberry Pi build files...${c0}\n" &&
|
||||||
|
cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
|
||||||
cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
|
cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
|
||||||
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
|
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
|
||||||
cp -r -v arm/raspi/* ${CR_SRC_DIR}/ &&
|
cp -r -v arm/raspi/* ${CR_SRC_DIR}/ &&
|
||||||
|
@ -130,6 +131,7 @@ esac
|
||||||
copyWOA () {
|
copyWOA () {
|
||||||
printf "\n" &&
|
printf "\n" &&
|
||||||
printf "${YEL}Copying Windows on ARM build files...${c0}\n" &&
|
printf "${YEL}Copying Windows on ARM build files...${c0}\n" &&
|
||||||
|
cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
|
||||||
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
|
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
|
||||||
# Use regular arm.gni from src, pending further testing
|
# Use regular arm.gni from src, pending further testing
|
||||||
# cp -v arm/woa_arm.gni ${CR_SRC_DIR}/build/config/arm.gni &&
|
# cp -v arm/woa_arm.gni ${CR_SRC_DIR}/build/config/arm.gni &&
|
||||||
|
@ -192,6 +194,7 @@ esac
|
||||||
copyAndroid () {
|
copyAndroid () {
|
||||||
printf "\n" &&
|
printf "\n" &&
|
||||||
printf "${YEL}Copying Android (ARM64 and ARM32) build files...${c0}\n" &&
|
printf "${YEL}Copying Android (ARM64 and ARM32) build files...${c0}\n" &&
|
||||||
|
cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
|
||||||
cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
|
cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
|
||||||
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
|
cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
|
||||||
printf "\n" &&
|
printf "\n" &&
|
||||||
|
|
Loading…
Reference in a new issue