diff --git a/trunk/ConsoleDataMigration/documents/Readme.txt b/trunk/ConsoleDataMigration/documents/Readme.txt index a44b31a..f4a3404 100644 --- a/trunk/ConsoleDataMigration/documents/Readme.txt +++ b/trunk/ConsoleDataMigration/documents/Readme.txt @@ -6,12 +6,13 @@ CTR_SDK-3_3 branch r45925 ARM C/C++ Compiler, 4.1 [Build 791] for Nintendo 【ビルド時の注意】 -開発機・量産機でAES鍵を変えるため +開発機・量産機でAES鍵を変えるため、 量産機用ビルドの場合 -PROD_BUILD=true +build.sh RELEASE + +でビルドすること。 -を有効にしてomakeを実行すること。 【その他】 PC上でのgoogletestを使う場合BOM付きのUTF-8を diff --git a/trunk/ConsoleDataMigration/sources/build.sh b/trunk/ConsoleDataMigration/sources/build.sh index 1dbdc17..22dfb44 100755 --- a/trunk/ConsoleDataMigration/sources/build.sh +++ b/trunk/ConsoleDataMigration/sources/build.sh @@ -9,15 +9,27 @@ do done if [ $releaseBuild ] ; then - BUILD_TYPE=release + BUILD_TYPE=release,development OPTION="PROD_BUILD=true" else BUILD_TYPE=development fi +# IncrediBuildが使えるか +which xgConsole > /dev/null 2>&1 +if [ "$?" -eq 0 ]; then + echo "Use IncrediBuild" + useIncrediBuild=true +fi + #################### 通常ビルド #################### # ツールのビルド -omake BUILD=$BUILD_TYPE FILTER=CTR-TS.*fast -j8 $OPTION +toolBuildExec="omake BUILD=$BUILD_TYPE FILTER=CTR-TS.*fast -j8 $OPTION" +if [ $useIncrediBuild ] ; then + xgConsole /command="$toolBuildExec" /profile="profile.xml" +else + $toolBuildExec +fi #Releaseはツールのみ if [ $releaseBuild ] ; then @@ -25,11 +37,21 @@ if [ $releaseBuild ] ; then fi # CTR自動テストのビルド +testBuildExec="omake -j8 dotests-emumem BUILD=development FILTER=CTR-TS*.fast SKIP_RUN=true" cd tests -omake -j8 dotests-emumem BUILD=development FILTER=CTR-TS*.fast SKIP_RUN=true +if [ $useIncrediBuild ] ; then + xgConsole /command="$testBuildExec" /profile="../profile.xml" +else + $testBuildExec +fi cd ../ # PC上のテストのビルド cd tests/googletest/ -omake -j8 +if [ $useIncrediBuild ] ; then + xgConsole /command="omake -j8" /profile="../../profile.xml" +else + omake -j8 +fi + cd ../../ \ No newline at end of file diff --git a/trunk/ConsoleDataMigration/sources/profile.xml b/trunk/ConsoleDataMigration/sources/profile.xml new file mode 100644 index 0000000..92d2a42 --- /dev/null +++ b/trunk/ConsoleDataMigration/sources/profile.xml @@ -0,0 +1,10 @@ + + + + + + + + + +