diff --git a/build/tests/CustomSystemUpdater/ARM9.TWL/Makefile b/build/tests/CustomSystemUpdater/ARM9.TWL/Makefile index 427f0c62..0475b677 100644 --- a/build/tests/CustomSystemUpdater/ARM9.TWL/Makefile +++ b/build/tests/CustomSystemUpdater/ARM9.TWL/Makefile @@ -117,7 +117,13 @@ INSTALL_DIR = $(SDK_NMENU_DATADIR) #---------------------------------------------------------------------------- -do-build: $(TARGETS) +.PHONY: build_time + +build_time: + echo -n "#define BUILD_TIME \"`date \"+%Y/%m/%d %H:%M:%S\"`\"" > include/build_time.h + + +do-build: build_time $(TARGETS) #include $(TWLSDK_ROOT)/build/buildtools/modulerules include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules diff --git a/build/tests/CustomSystemUpdater/ARM9.TWL/main.rsf b/build/tests/CustomSystemUpdater/ARM9.TWL/main.rsf index 6a591f17..52d00fe5 100644 --- a/build/tests/CustomSystemUpdater/ARM9.TWL/main.rsf +++ b/build/tests/CustomSystemUpdater/ARM9.TWL/main.rsf @@ -93,7 +93,7 @@ Property # # BANNER FILE: generated from Banner Spec File # - BannerFile ../banner/banner.bnr + BannerFile ../banner/banner_EUR.bnr ### ### Setting for TWL @@ -220,9 +220,9 @@ RomSpec { Offset 0x00000000 Segment ALL - HostRoot ../data/20080822_cls/euro + HostRoot ../data/20080822_test/euro Root /data - File hnap-v0.tad hnbp-v0.tad hnca-v0.tad hnda-v0.tad hnea-v0.tad hnfp-v0.tad hngp-v0.tad hnha-v0.tad hnip-v0.tad hnjp-v0.tad hnkp-v0.tad hnlp-v0.tad TWLFontTable.dat nandfirm_rcplus.nand + File hnap-v0.tad hnbp-v0.tad hnca-v0.tad hnha-v0.tad hnlp-v0.tad TWLFontTable.dat nandfirm_rcplus.nand HostRoot $(PRIVKEY_PATH) Root /key File $(HWINFO_PRIVKEY) $(HWID_PRIVKEY) diff --git a/build/tests/CustomSystemUpdater/ARM9.TWL/src/main.c b/build/tests/CustomSystemUpdater/ARM9.TWL/src/main.c index 16131f8c..d1acefac 100644 --- a/build/tests/CustomSystemUpdater/ARM9.TWL/src/main.c +++ b/build/tests/CustomSystemUpdater/ARM9.TWL/src/main.c @@ -33,6 +33,7 @@ #include "keypad.h" #include "debugger_hw_reset_control.h" #include "debugger_card_rom.h" +#include "build_time.h" #define SCRAMBLE_MASK 0x00406000 @@ -74,14 +75,7 @@ static const char* ImportTadFileList[] = "rom:/data/hnap-v0.tad", "rom:/data/hnbp-v0.tad", "rom:/data/hnca-v0.tad", - "rom:/data/hnda-v0.tad", - "rom:/data/hnea-v0.tad", - "rom:/data/hnfp-v0.tad", - "rom:/data/hngp-v0.tad", "rom:/data/hnha-v0.tad", - "rom:/data/hnip-v0.tad", - "rom:/data/hnjp-v0.tad", - "rom:/data/hnkp-v0.tad", "rom:/data/hnlp-v0.tad", }; @@ -568,8 +562,9 @@ static void DrawWaitButtonA(void) (void)CARDi_ReadRomIDCoreEx(DEBUGGER_COMMAND_LOOK_SCREEN); CARD_UnlockRom((u16)sLockId); - kamiFontPrintfMain( 5, 3, 8, " System Updater "); + kamiFontPrintfMain( 5, 3, 8, " System Updater [EUR]"); kamiFontPrintfMain( 4, 5, 8, " --- ver %s %s ---", g_strSDKSvnRevision, g_strIPLSvnRevision ); + kamiFontPrintfMain( 1, 6, 8, " Build time:%s", BUILD_TIME ); kamiFontPrintfMain( 5, 9, 3, " A Button: Start Update "); kamiFontPrintfMain( 5, 10, 3, " B Button: Cancel Update "); diff --git a/build/tests/CustomSystemUpdater/banner/banner_AUS.bnr b/build/tests/CustomSystemUpdater/banner/banner_AUS.bnr new file mode 100644 index 00000000..6107a4f1 Binary files /dev/null and b/build/tests/CustomSystemUpdater/banner/banner_AUS.bnr differ diff --git a/build/tests/CustomSystemUpdater/banner/banner_EUR.bnr b/build/tests/CustomSystemUpdater/banner/banner_EUR.bnr new file mode 100644 index 00000000..c4d8d0fc Binary files /dev/null and b/build/tests/CustomSystemUpdater/banner/banner_EUR.bnr differ diff --git a/build/tests/CustomSystemUpdater/banner/banner_JPN.bnr b/build/tests/CustomSystemUpdater/banner/banner_JPN.bnr new file mode 100644 index 00000000..4480b5e0 Binary files /dev/null and b/build/tests/CustomSystemUpdater/banner/banner_JPN.bnr differ diff --git a/build/tests/CustomSystemUpdater/banner/banner_USA.bnr b/build/tests/CustomSystemUpdater/banner/banner_USA.bnr new file mode 100644 index 00000000..110376b6 Binary files /dev/null and b/build/tests/CustomSystemUpdater/banner/banner_USA.bnr differ diff --git a/build/tests/CustomSystemUpdater/sumaker.rb b/build/tests/CustomSystemUpdater/sumaker.rb index 5832a7e1..86c5439d 100755 --- a/build/tests/CustomSystemUpdater/sumaker.rb +++ b/build/tests/CustomSystemUpdater/sumaker.rb @@ -97,6 +97,7 @@ def make_rsf(config) tadlist = tadlist.join(" ") src = File.read(config[:TemplatePath] + "/" + config[:RSF]) src = replace_data(src, "datapath", config[:DataPath]) + src = replace_data(src, "regionname", config[:Region]) write_data(config[:TargetPath] + "/" + config[:RSF], replace_data(src, "filelist", tadlist)) end @@ -114,8 +115,10 @@ def make_main(config) mod = replace_data(mod, "fontfile", config[:FontFile]) # region - region = (REGION[config[:Region]] != nil) ? REGION[config[:Region]] : REGION["JPN"] + region_name = (config[:Region] != nil) ? config[:Region] : "JPN" + region = (REGION[region_name] != nil) ? REGION[region_name] : REGION["JPN"] mod = replace_data(mod, "region", region) + mod = replace_data(mod, "regionname", region_name) write_data(config[:TargetPath] + "/" + config[:SRC], mod) end diff --git a/build/tests/CustomSystemUpdater/template/ARM9.TWL/main.rsf b/build/tests/CustomSystemUpdater/template/ARM9.TWL/main.rsf index 4121565b..1e5df836 100644 --- a/build/tests/CustomSystemUpdater/template/ARM9.TWL/main.rsf +++ b/build/tests/CustomSystemUpdater/template/ARM9.TWL/main.rsf @@ -93,7 +93,7 @@ Property # # BANNER FILE: generated from Banner Spec File # - BannerFile ../banner/banner.bnr + BannerFile ../banner/banner_%regionname%.bnr ### ### Setting for TWL diff --git a/build/tests/CustomSystemUpdater/template/ARM9.TWL/src/main.c b/build/tests/CustomSystemUpdater/template/ARM9.TWL/src/main.c index c7747919..f1cd83e6 100644 --- a/build/tests/CustomSystemUpdater/template/ARM9.TWL/src/main.c +++ b/build/tests/CustomSystemUpdater/template/ARM9.TWL/src/main.c @@ -33,6 +33,7 @@ #include "keypad.h" #include "debugger_hw_reset_control.h" #include "debugger_card_rom.h" +#include "build_time.h" #define SCRAMBLE_MASK 0x00406000 @@ -556,8 +557,9 @@ static void DrawWaitButtonA(void) (void)CARDi_ReadRomIDCoreEx(DEBUGGER_COMMAND_LOOK_SCREEN); CARD_UnlockRom((u16)sLockId); - kamiFontPrintfMain( 5, 3, 8, " System Updater "); + kamiFontPrintfMain( 5, 3, 8, " System Updater [%regionname%]"); kamiFontPrintfMain( 4, 5, 8, " --- ver %s %s ---", g_strSDKSvnRevision, g_strIPLSvnRevision ); + kamiFontPrintfMain( 1, 6, 8, "Build time:%s", BUILD_TIME ); kamiFontPrintfMain( 5, 9, 3, " A Button: Start Update "); kamiFontPrintfMain( 5, 10, 3, " B Button: Cancel Update ");