From e50f822f0c8778b60e5c10ef2053e7ebfd92f4c9 Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 16 Feb 2012 01:53:49 +0000 Subject: [PATCH] =?UTF-8?q?=E4=B8=A6=E5=88=97=E6=95=B0=E3=81=AE=E6=8C=87?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@638 385bec56-5757-e545-9c3a-d8741f4650f1 --- trunk/ConsoleDataMigration/sources/build.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/build.sh b/trunk/ConsoleDataMigration/sources/build.sh index 22dfb44..7bbfd8e 100755 --- a/trunk/ConsoleDataMigration/sources/build.sh +++ b/trunk/ConsoleDataMigration/sources/build.sh @@ -20,15 +20,18 @@ which xgConsole > /dev/null 2>&1 if [ "$?" -eq 0 ]; then echo "Use IncrediBuild" useIncrediBuild=true + PARALLEL=-j16 +else + PARALLEL=-j8 fi #################### 通常ビルド #################### # ツールのビルド -toolBuildExec="omake BUILD=$BUILD_TYPE FILTER=CTR-TS.*fast -j8 $OPTION" +toolBuildExec="omake BUILD=$BUILD_TYPE FILTER=CTR-TS.*fast $OPTION" if [ $useIncrediBuild ] ; then - xgConsole /command="$toolBuildExec" /profile="profile.xml" + xgConsole /command="$toolBuildExec $PARALLEL" /profile="profile.xml" else - $toolBuildExec + $toolBuildExec $PARALLEL fi #Releaseはツールのみ @@ -37,21 +40,21 @@ if [ $releaseBuild ] ; then fi # CTR自動テストのビルド -testBuildExec="omake -j8 dotests-emumem BUILD=development FILTER=CTR-TS*.fast SKIP_RUN=true" +testBuildExec="omake dotests-emumem BUILD=development FILTER=CTR-TS*.fast SKIP_RUN=true" cd tests if [ $useIncrediBuild ] ; then - xgConsole /command="$testBuildExec" /profile="../profile.xml" + xgConsole /command="$testBuildExec $PARALLEL" /profile="../profile.xml" else - $testBuildExec + $testBuildExec $PARALLEL fi cd ../ # PC上のテストのビルド cd tests/googletest/ if [ $useIncrediBuild ] ; then - xgConsole /command="omake -j8" /profile="../../profile.xml" + xgConsole /command="omake $PARALLEL" /profile="../../profile.xml" else - omake -j8 + omake $PARALLEL fi cd ../../ \ No newline at end of file