diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-28 23:18:19 +0100 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-28 23:18:19 +0100 |
| commit | f31b10b89d33201c454c01caa744d1e630819191 (patch) | |
| tree | b7a471d82cea61282940f5312df2b3968bd9be40 | |
| parent | de-Archify some aspects of builds and -scripts; allow to initiate separate st... (diff) | |
| download | librewolf-linux-f31b10b89d33201c454c01caa744d1e630819191.tar.gz librewolf-linux-f31b10b89d33201c454c01caa744d1e630819191.tar.bz2 librewolf-linux-f31b10b89d33201c454c01caa744d1e630819191.zip | |
call things $srcdir
| -rwxr-xr-x | binary_tarball/scripts/3_Configure_Source_Code.sh | 8 | ||||
| -rwxr-xr-x | binary_tarball/scripts/4_Build_Binary_Tarball.sh | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh index 4c26b5d..3927dec 100755 --- a/binary_tarball/scripts/3_Configure_Source_Code.sh +++ b/binary_tarball/scripts/3_Configure_Source_Code.sh @@ -2,20 +2,20 @@ printf "\n\n------------------------------ FINAL PREBUILD CONFIGURATION ---------------------------------\n"; # Setup Script Variables -SOURCE_CODE_FOLDER=$1; +srcdir=$1; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} _COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; -_MOZBUILD=$SOURCE_CODE_FOLDER/../mozbuild +_MOZBUILD=$srcdir/../mozbuild mkdir -p ${_MOZBUILD} # Copy Source Code Changes to Source Code printf "\nCopying branding and source code changes to firefox source code\n"; git clone $_COMMON_REPO common; -cp -r common/source_files/* $SOURCE_CODE_FOLDER/; +cp -r common/source_files/* $srcdir/; rm -rf common; -cd $SOURCE_CODE_FOLDER +cd $srcdir cat >../mozconfig <<END ac_add_options --enable-application=browser diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh index e8c9f5a..a7f4784 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh @@ -2,7 +2,7 @@ printf "\n\n--------------------------------------- BUILD -----------------------------------------------\n"; # Setup Script Variables -SOURCE_FOLDER=$1; +srcdir=$1; OUTPUT_TARBALL=$2; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} _SOURCE_CODE_BINARY_TARBALL_LOCATION="./obj*/dist/librewolf*.tar.bz2"; @@ -22,7 +22,7 @@ CXXFLAGS="${CXXFLAGS/-fno-plt/}" export SHELL=/bin/bash; # Changes current folder to the source code folder -cd $SOURCE_FOLDER; +cd $srcdir; # Do 3-tier PGO echo "Building instrumented browser..." @@ -110,5 +110,5 @@ mv $_SOURCE_CODE_BINARY_TARBALL_LOCATION $OUTPUT_TARBALL; # Deletes the source code printf "\nDeleting source code\n"; -rm -rf $SOURCE_FOLDER; +rm -rf $srcdir; |