librewolf-bot/linux
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

use newer rust + cargo again

Browse source
This commit is contained in:
ohfp 2021-08-11 11:52:43 +02:00
parent f78a1c2a36
commit 56b66d16f3
No known key found for this signature in database
GPG key ID: 2954CC8585E27A3F
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/1_Install_Dependencies.sh
View file

@ -38,8 +38,6 @@ _DEPENDENCIES="wget git xvfb \
python \ python \
libffi-dev \ libffi-dev \
nodejs-mozilla \ nodejs-mozilla \
cargo \
rustc \
nasm-mozilla" nasm-mozilla"
# cargo \ # cargo \
@ -67,7 +65,7 @@ else
apt-get -y install clang-10 libclang-10-dev apt-get -y install clang-10 libclang-10-dev
fi fi
# we need a more recent rust we need a more recent rust
# curl https://sh.rustup.rs -o rustup.sh curl https://sh.rustup.rs -o rustup.sh
# bash rustup.sh -y bash rustup.sh -y
# source /root/.cargo/env source /root/.cargo/env

6
scripts/4_Build_Binary_Tarball.sh
View file

@ -16,7 +16,8 @@ export DEB_BUILD_HARDENING_FORMAT=1
export DEB_BUILD_HARDENING_PIE=1 export DEB_BUILD_HARDENING_PIE=1
# export PATH=/usr/lib/nasm-mozilla/bin:$PATH # export PATH=/usr/lib/nasm-mozilla/bin:$PATH
# source /root/.cargo/env # add cargo binary to path
source /root/.cargo/env
# we do change / unset some of them later, but setting them as set by Arch # we do change / unset some of them later, but setting them as set by Arch
# might make it easier to maintain changes in build scripts on both sides # might make it easier to maintain changes in build scripts on both sides
@ -62,9 +63,6 @@ cd $srcdir;
rm -f mozconfig rm -f mozconfig
# add cargo binary to path
# source /root/.cargo/env
# install cbindgen # install cbindgen
cargo install --version 0.19.0 cbindgen cargo install --version 0.19.0 cbindgen

2
scripts/5_Configure_Binary_Tarball.sh
View file

@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
_SCRIPT_FOLDER=$(realpath $(dirname $0)); _SCRIPT_FOLDER=$(realpath $(dirname $0));
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
_SETTINGS_TAG=${SETTINGS_TAG:-'1.3'} _SETTINGS_TAG=${SETTINGS_TAG:-'1.5'}
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
# Extracts the binary tarball # Extracts the binary tarball