From bea139a80e086e0abe630bb64e60ed3a5575a7e8 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Tue, 21 Feb 2012 05:06:49 +0000
Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E5=BF=98=E3=82=8C=20?=
 =?UTF-8?q?=E4=B8=8A=E7=94=BB=E9=9D=A2=E8=A1=A8=E7=A4=BA=E3=81=AE=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=ABMICRO=E3=81=8C?=
 =?UTF-8?q?=E6=8A=9C=E3=81=91=E3=81=A6=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20UnfixedKey=E7=94=A8=E3=83=93=E3=83=AB?=
 =?UTF-8?q?=E3=83=89=E3=82=82=E3=83=84=E3=83=BC=E3=83=AB=E3=81=AE=E3=81=BF?=
 =?UTF-8?q?=E3=81=A7=E7=B5=82=E4=BA=86=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
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@649 385bec56-5757-e545-9c3a-d8741f4650f1
---
 branches/1stNUP_for_2ndNUP/sources/build.sh   | 69 +++++++++++++++++++
 .../sources/common/BuildSwitch.om             | 29 ++++++++
 .../sources/common/DrawSystemState.cpp        |  4 +-
 3 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100755 branches/1stNUP_for_2ndNUP/sources/build.sh
 create mode 100644 branches/1stNUP_for_2ndNUP/sources/common/BuildSwitch.om

diff --git a/branches/1stNUP_for_2ndNUP/sources/build.sh b/branches/1stNUP_for_2ndNUP/sources/build.sh
new file mode 100755
index 0000000..2d04d5a
--- /dev/null
+++ b/branches/1stNUP_for_2ndNUP/sources/build.sh
@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+# バージョン取得
+function getVersion
+{
+    VERSION_MAJOR=$(cat common/version.h |grep VERSION_MAJOR|awk -F' ' '{print $3}'|sed 's/"//g')
+    VERSION_MINOR=$(cat common/version.h |grep VERSION_MINOR|awk -F' ' '{print $3}'|sed 's/"//g')
+    VERSION_MICRO=$(cat common/version.h |grep VERSION_MICRO|awk -F' ' '{print $3}'|sed 's/"//g')
+    VERSION_STR="VERSION_MAJOR=$VERSION_MAJOR VERSION_MINOR=$VERSION_MINOR VERSION_MICRO=$VERSION_MICRO"
+}
+
+# フラグ判定
+for arg in $@
+do
+    if [ "$arg" = 'RELEASE' ]; then
+	releaseBuild=true
+    fi
+
+    if [ "$arg" = 'UNFIXEDKEY' ]; then
+	unfixedKeyBuild=true
+    fi
+done
+
+if [ $releaseBuild ] ; then
+    getVersion
+    BUILD_TYPE=release,development
+    OPTION="PROD_BUILD=true $VERSION_STR"
+elif [ $unfixedKeyBuild ] ; then
+    getVersion
+    BUILD_TYPE=release,development
+    OPTION="UNFIXEDKEY_BUILD=true $VERSION_STR"
+else
+    BUILD_TYPE=development    
+fi
+
+# IncrediBuildが使えるか
+which xgConsole > /dev/null 2>&1
+if [ "$?" -eq 0 ]; then
+    useIncrediBuild=true
+    PARALLEL=-j16
+else
+    PARALLEL=-j8
+fi
+
+#################### 通常ビルド ####################
+# ツールのビルド
+toolBuildExec="omake BUILD=$BUILD_TYPE FILTER=CTR-TS.*fast $OPTION"
+if [ $useIncrediBuild ] ; then
+    xgConsole /command="$toolBuildExec $PARALLEL" /profile="profile.xml"
+else
+    $toolBuildExec $PARALLEL
+fi
+
+#リリース用ビルドはツールのみ
+if [ $releaseBuild ] || [ $unfixedKeyBuild ] ; then
+    exit
+fi
+
+echo hogehoge
+
+# CTR自動テストのビルド
+testBuildExec="omake dotests-emumem BUILD=development FILTER=CTR-TS*.fast SKIP_RUN=true"
+cd tests
+if [ $useIncrediBuild ] ; then
+    xgConsole /command="$testBuildExec $PARALLEL" /profile="../profile.xml"    
+else
+    $testBuildExec $PARALLEL
+fi
+cd ../
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/BuildSwitch.om b/branches/1stNUP_for_2ndNUP/sources/common/BuildSwitch.om
new file mode 100644
index 0000000..efc66fd
--- /dev/null
+++ b/branches/1stNUP_for_2ndNUP/sources/common/BuildSwitch.om
@@ -0,0 +1,29 @@
+#!/usr/bin/env omake
+#----------------------------------------------------------------------------
+# Project:  Horizon
+# File:     OMakefile
+#
+# Copyright (C)2009 Nintendo Co., Ltd.  All rights reserved.
+#
+# These coded instructions, statements, and computer programs contain
+# proprietary information of Nintendo of America Inc. and/or Nintendo
+# Company Ltd., and are protected by Federal copyright law.  They may
+# not be disclosed to third parties or copied or duplicated in any form,
+# in whole or in part, without the prior written consent of Nintendo.
+#
+# $Rev: 216 $
+#----------------------------------------------------------------------------
+if $(defined TARGET_PROGRAM)
+    if $(defined PROD_BUILD)
+        CCFLAGS += -DUSE_PROD_KEY
+        TARGET_NAME = $(TARGET_PROGRAM)
+        TARGET_PROGRAM = $(TARGET_PROGRAM)_prod_$(VERSION_MAJOR)-$(VERSION_MINOR)-$(VERSION_MICRO)
+        export
+    elseif $(defined UNFIXEDKEY_BUILD)
+        TARGET_NAME = $(TARGET_PROGRAM)
+        TARGET_PROGRAM = $(TARGET_PROGRAM)_dev_$(VERSION_MAJOR)-$(VERSION_MINOR)-$(VERSION_MICRO)
+        export
+    else
+        TARGET_NAME = $(TARGET_PROGRAM)
+        export
+    export
diff --git a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp
index 8256841..62d0a6a 100644
--- a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp
+++ b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp
@@ -169,8 +169,8 @@ void DrawSystemState
     renderSystem.SetFontSize(fontwidth);
 
     // 繝�繝ｼ繝ｫ蜷阪�√ワ繧､繝ｩ繧､繝�
-    renderSystem.DrawText(0, line++ * fontheight, "%s %s-%s", toolName, CONSOLE_REPAIR_VERSION_MAJOR,
-            CONSOLE_REPAIR_VERSION_MINOR);
+    renderSystem.DrawText(0, line++ * fontheight, "%s %s-%s-%s", toolName, CONSOLE_REPAIR_VERSION_MAJOR,
+            CONSOLE_REPAIR_VERSION_MINOR, CONSOLE_REPAIR_VERSION_MICRO);
     renderSystem.SetColor(titleColor.r, titleColor.g, titleColor.b);
     renderSystem.FillRectangle(0, (line - 1) * fontheight, 400, fontheight);
     renderSystem.SetColor(1.f, 1.f, 1.f);