Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use 'nproc' command instead of /proc/cpuinfo (doesn't work on armv5tel) to determine # of cores (lscpu can be another option)

This commit is contained in:
Tom Reynolds 2013-05-15 04:00:36 +00:00
parent c10bb9f10e
commit a6e6ab8f53
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-codeblocks-project.sh
View File

@ -11,7 +11,7 @@ cd codeblocks
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
LANG=C
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
NUMCORES=`nproc`
# This is for regular developers and used by our installer
cmake -G"CodeBlocks - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}

2
build-eclipse-project.sh
View File

@ -11,7 +11,7 @@ cd eclipse
if [ -f 'CMakeCache.txt' ]; then rm -f 'CMakeCache.txt'; fi
LANG=C
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
NUMCORES=`nproc`
# This is for regular developers and used by our installer
cmake -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_INSTALL_PREFIX= -DWANT_STATIC_LIBS=ON -DCMAKE_ECLIPSE_MAKE_ARGUMENTS=-j$NUMCORES ${CURRENTDIR}

2
build-mg-win32.sh
View File

@ -5,7 +5,7 @@
# Originally written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2012 Mark Vejvoda under GNU GPL v3.0
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
NUMCORES=`nproc`
#PROJECT_SOURCE_DIR="$(dirname $(readlink -f $0))"
mkdir -p build-win32

2
build-mg.sh
View File

@ -5,7 +5,7 @@
# Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+
LANG=C
NUMCORES=`cat /proc/cpuinfo | grep -cE '^processor'`
NUMCORES=`nproc`
mkdir -p build
cd build

3
mk/linux/mojosetup/megaglest-installer/make.sh
View File

@ -119,8 +119,7 @@ CXX=/usr/bin/g++
OSTYPE=`uname -s`
if [ "$OSTYPE" = "Linux" ]; then
NCPU=`cat /proc/cpuinfo |grep vendor_id |wc -l`
let NCPU=$NCPU+1
NCPU=`nproc`
elif [ "$OSTYPE" = "Darwin" ]; then
NCPU=`sysctl -n hw.ncpu`
elif [ "$OSTYPE" = "SunOS" ]; then

6
source/tools/support/linux/system_report
View File

@ -29,7 +29,7 @@
#
LANG=C
VERSION='0.3.3'
VERSION='0.3.4'
MYNAME=`basename $0`
DEFAULT_REPORT_FILENAME=system_report.log
@ -284,8 +284,8 @@ echo '' >> $REPORT_LOCATION
echo '' >> $REPORT_LOCATION
echo '***** CPU **********************************************************************' >> $REPORT_LOCATION
echo '' >> $REPORT_LOCATION
echo '>>> cat /proc/cpuinfo | awk -F : '"'"'/^model name/ { print $2 }' >> $REPORT_LOCATION
cat /proc/cpuinfo | awk -F : '/^model name/ { print $2 }' >> $REPORT_LOCATION
echo '>>> cat /proc/cpuinfo' >> $REPORT_LOCATION
cat /proc/cpuinfo >> $REPORT_LOCATION
sleep 1
echo ' → Memory'