Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build script to automatically detect number of CPUs #1226

Merged
merged 12 commits into from
Jun 7, 2018
Merged

Update build script to automatically detect number of CPUs #1226

Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
914ff76
Fix build script and generation of Eclipse CDT
kekkokk May 11, 2018
8ce3034
add release
kekkokk May 11, 2018
c9dc444
modify generateEclipseProject
kekkokk May 11, 2018
de3d7a4
revert buildProject
kekkokk May 11, 2018
013e8a5
force codec clientside
kekkokk May 16, 2018
35979a6
Added option in basicexample
kekkokk May 16, 2018
13fe8a7
fix unit test
kekkokk May 16, 2018
92749f6
lint
kekkokk May 16, 2018
b1777f7
Avoid to run cmake every time
kekkokk May 22, 2018
87d765a
Added automatic thread detection
kekkokk May 31, 2018
91940cc
revert to run cmake every time
kekkokk Jun 4, 2018
19cc2df
Merge branch 'master' into fix/build
jcague Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions scripts/installErizo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ PREFIX_DIR=$LIB_DIR/build/
NVM_CHECK="$PATHNAME"/checkNvm.sh
FAST_MAKE=''

NUM_CORES=1;
if [ "$(uname)" == "Darwin" ]; then
NUM_CORES=$(sysctl -n hw.ncpu);
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
NUM_CORES=$(grep -c ^processor /proc/cpuinfo);
fi

export ERIZO_HOME=$ROOT/erizo

Expand Down Expand Up @@ -128,8 +134,9 @@ else
execute_tests
;;
f)
FAST_MAKE='-j4'
FAST_BUILD='env JOBS=4'
FAST_MAKE="-j$NUM_CORES"
FAST_BUILD="env JOBS=$NUM_CORES"
echo "Compiling using $NUM_CORES threads"
;;
d)
DELETE_OBJECT_FILES='true'
Expand Down