From 40d890a511aecb286ff1ea7d81b9c0bc83ccb226 Mon Sep 17 00:00:00 2001 From: N2614 Date: Tue, 15 Nov 2011 02:46:20 +0000 Subject: [PATCH] =?UTF-8?q?trunk=20r512=E3=81=AE=E3=83=9E=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=80=82=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=921.5-0=E3=81=AB=E3=80=82?= 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@513 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleBackup/ConsoleBackup.cpp | 10 +++------ .../sources/ConsoleBackup/OMakefile | 9 +------- .../sources/ConsoleBackup/genversion.sh | 4 ---- .../sources/ConsoleRestore/ConsoleRestore.cpp | 10 +++------ .../sources/ConsoleRestore/OMakefile | 9 +------- .../sources/ConsoleRestore/genversion.sh | 4 ---- .../sources/common/DrawSystemState.cpp | 5 +++-- .../sources/common/DrawSystemState.h | 1 - .../sources/common/version.h | 22 +++++++++++++++++++ 9 files changed, 33 insertions(+), 41 deletions(-) delete mode 100755 branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/genversion.sh delete mode 100755 branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/genversion.sh create mode 100644 branches/1stNUP_for_2ndNUP/sources/common/version.h diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp index cd94f6c..19f93fd 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp @@ -53,11 +53,8 @@ #include "ResFont.h" #include "HardwareStateManager.h" -// svnリビジョン埋め込み用 -#include "../../generated/ConsoleBackup/version.h" -#ifndef BACKUP_VERSION_NUM -#define BACKUP_VERSION_NUM 0 -#endif +// バージョン表示用 +#include "version.h" namespace { @@ -143,7 +140,7 @@ extern "C" void nnMain(void) common::HardwareStateManager manager(s_HwUtility); // 情報出力 - COMMON_LOGGER("CTR Console Backup %s Rev.%s\n", __DATE__, BACKUP_VERSION_NUM); + COMMON_LOGGER("CTR Console Backup %s-%s\n", CONSOLE_REPAIR_VERSION_MAJOR, CONSOLE_REPAIR_VERSION_MINOR); COMMON_LOGGER("System Ver. %d.%d.%d-%d\n", s_HwUtility.GetCupMajorVersion(), s_HwUtility.GetCupMinorVersion(), @@ -234,7 +231,6 @@ extern "C" void nnMain(void) titleColor, flip, adapterState, - BACKUP_VERSION_NUM, s_HwUtility.GetCupMajorVersion(), s_HwUtility.GetCupMinorVersion(), s_HwUtility.GetCupMicroVersion(), diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile index d8e8323..dfa19be 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/OMakefile @@ -71,11 +71,4 @@ DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules -VERSION_H = $(file ../../generated/$(TARGET_PROGRAM)/version.h) - -$(VERSION_H): $(SOURCES) - section - bash genversion.sh - -RequireSetup($(VERSION_H)) -build: $(VERSION_H) $(DEFAULT_TARGETS) +build: $(DEFAULT_TARGETS) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/genversion.sh b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/genversion.sh deleted file mode 100755 index 74e3c79..0000000 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/genversion.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -f - -cd ../ -echo "#define BACKUP_VERSION_NUM \"`svn info|grep 'Last Changed Rev:'| awk -F ':' '{print $2}'|tr -d '\n'| sed 's/ //g'`\"" > ../generated/ConsoleBackup/version.h diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp index 17699d1..9236743 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp @@ -47,11 +47,8 @@ #include "ResFont.h" #include "HardwareStateManager.h" -// svnリビジョン埋め込み用 -#include "../../generated/ConsoleRestore/version.h" -#ifndef RESTORE_VERSION_NUM -#define RESOTRE_VERSION_NUM 0 -#endif +// バージョン表示用 +#include "version.h" namespace { @@ -164,7 +161,7 @@ extern "C" void nnMain(void) common::HardwareStateManager manager(s_HwUtility); // 情報出力 - COMMON_LOGGER("CTR Console Restore %s Rev.%s\n", __DATE__, RESTORE_VERSION_NUM); + COMMON_LOGGER("CTR Console Restore %s-%s\n", CONSOLE_REPAIR_VERSION_MAJOR, CONSOLE_REPAIR_VERSION_MINOR); COMMON_LOGGER("System Ver. %d.%d.%d-%d\n", s_HwUtility.GetCupMajorVersion(), s_HwUtility.GetCupMinorVersion(), s_HwUtility.GetCupMicroVersion(), @@ -275,7 +272,6 @@ extern "C" void nnMain(void) titleColor, flip, adapterState, - RESTORE_VERSION_NUM, s_HwUtility.GetCupMajorVersion(), s_HwUtility.GetCupMinorVersion(), s_HwUtility.GetCupMicroVersion(), diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile index a09ecd0..4e80b07 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/OMakefile @@ -74,11 +74,4 @@ DESCRIPTOR = $(HORIZON_ROOT)/resources/specfiles/RepairTool.desc include $(ROOT_OMAKE)/modulerules -VERSION_H = $(file ../../generated/$(TARGET_PROGRAM)/version.h) - -$(VERSION_H): $(SOURCES) - section - bash genversion.sh - -RequireSetup($(VERSION_H)) -build: $(VERSION_H) $(DEFAULT_TARGETS) +build: $(DEFAULT_TARGETS) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/genversion.sh b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/genversion.sh deleted file mode 100755 index a774086..0000000 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/genversion.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -f - -cd ../ -echo "#define RESTORE_VERSION_NUM \"`svn info|grep 'Last Changed Rev:'| awk -F ':' '{print $2}'|tr -d '\n'| sed 's/ //g'`\"" > ../generated/ConsoleRestore/version.h diff --git a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp index d47523c..8256841 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.cpp @@ -15,6 +15,7 @@ #include "DrawSystemState.h" #include "ResFont.h" +#include "version.h" #include @@ -98,7 +99,6 @@ void DrawSystemState nn::util::FloatColor titleColor, bool flip, std::string& adapterState, - const char* toolVersion, u8 cupMajorVersion, u8 cupMinorVersion, u8 cupMicroVersion, @@ -169,7 +169,8 @@ void DrawSystemState renderSystem.SetFontSize(fontwidth); // ツール名、ハイライト - renderSystem.DrawText(0, line++ * fontheight, "%s %s Rev.%s", toolName, __DATE__, toolVersion); + renderSystem.DrawText(0, line++ * fontheight, "%s %s-%s", toolName, CONSOLE_REPAIR_VERSION_MAJOR, + CONSOLE_REPAIR_VERSION_MINOR); renderSystem.SetColor(titleColor.r, titleColor.g, titleColor.b); renderSystem.FillRectangle(0, (line - 1) * fontheight, 400, fontheight); renderSystem.SetColor(1.f, 1.f, 1.f); diff --git a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h index 8ff8c47..db575fe 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h +++ b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h @@ -58,7 +58,6 @@ void DrawSystemState nn::util::FloatColor titleColor, bool flip, std::string& adapterState, - const char* toolVersion, u8 cupMajorVersion, u8 cupMinorVersion, u8 cupMicroVersion, diff --git a/branches/1stNUP_for_2ndNUP/sources/common/version.h b/branches/1stNUP_for_2ndNUP/sources/common/version.h new file mode 100644 index 0000000..58b012f --- /dev/null +++ b/branches/1stNUP_for_2ndNUP/sources/common/version.h @@ -0,0 +1,22 @@ +/*---------------------------------------------------------------------------* + Project: Horizon + File: version.h + + Copyright 2009-2011 Nintendo. 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$ + *---------------------------------------------------------------------------*/ + +#ifndef VERSION_H_ +#define VERSION_H_ + +#define CONSOLE_REPAIR_VERSION_MAJOR "1.5" +#define CONSOLE_REPAIR_VERSION_MINOR "0" + +#endif /* VERSION_H_ */