call things $srcdir
This commit is contained in:
parent
b409944fad
commit
f31b10b89d
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue