diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile b/build/systemMenu_RED/sysmenuVersion/Makefile index 8c8ccd5c..812c545e 100644 --- a/build/systemMenu_RED/sysmenuVersion/Makefile +++ b/build/systemMenu_RED/sysmenuVersion/Makefile @@ -25,7 +25,7 @@ override TARGET_PLATFORM := TWL -SUBMAKES = Makefile.A Makefile.J Makefile.E Makefile.P Makefile.U Makefile.C Makefile.K +SUBMAKES = Makefile.J Makefile.E Makefile.P Makefile.U Makefile.C Makefile.K Makefile.J.kst include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile.J.kst b/build/systemMenu_RED/sysmenuVersion/Makefile.J.kst new file mode 100644 index 00000000..4ffe1c0a --- /dev/null +++ b/build/systemMenu_RED/sysmenuVersion/Makefile.J.kst @@ -0,0 +1,47 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlIPL +# File: Makefile - +# +# Copyright 2007 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. +# +# $Date:: +# $Rev: +# $Author: +#---------------------------------------------------------------------------- + +override TARGET_PLATFORM := TWL + +TARGET_FIRM = SYSTEMMENU +TWL_NANDAPP = TRUE + +SYSMENU_VERSION_FILE = SysmenuVersion.$(SYSMENU_VERSION_TARGET).$(SYSMENU_VERSION_REGION).kst.dat +STR_VERSION = $(SYSMENU_VERSION_MAJOR).$(SYSMENU_VERSION_MINOR)$(SYSMENU_VERSION_STRING_REGION)_kst$(DEV_STRING) +VERSION_TAD = $(BINDIR)/$(VERSION_TITLEID_LO)_$(SYSMENU_VERSION_MAJOR)_$(SYSMENU_VERSION_MINOR)_$(SYSMENU_VERSION_TIMESTAMP).kst.$(SYSMENU_VERSION_TARGET).tad + +include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs +include ./commondefs.sysmenuVersion +include ./commondefs.sysmenuVersion.local + +#--------------------------------------------------------- +# リージョン固有パラメータ + +SYSMENU_VERSION_TIMESTAMP = 09082700 + +include ./defs.sysmenuVersion.J + +NUP_HOSTNAME := NULL + +do-build : $(TARGET_BIN) + +#---------------------------------------------------------------------------- +include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules +include ./modulerules.sysmenuVersion + +#===== End of Makefile ===== diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.J.kst.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.J.kst.dat new file mode 100644 index 00000000..36e07dec Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dev.J.kst.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.J.kst.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.J.kst.dat new file mode 100644 index 00000000..b6d7feeb Binary files /dev/null and b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.prod.J.kst.dat differ diff --git a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion index d34dab84..10fb44b7 100644 --- a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion +++ b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion @@ -32,7 +32,7 @@ EULA_URL = https://cfh.t.app.nintendowifi.net/eula/ ifndef FIRM_USE_PRODUCT_KEYS DEV_STRING = _dev endif -STR_VERSION = $(SYSMENU_VERSION_MAJOR).$(SYSMENU_VERSION_MINOR)$(SYSMENU_VERSION_STRING_REGION)$(DEV_STRING) +STR_VERSION ?= $(SYSMENU_VERSION_MAJOR).$(SYSMENU_VERSION_MINOR)$(SYSMENU_VERSION_STRING_REGION)$(DEV_STRING) #--------------------------------------------------------- # 外部使用変数 @@ -46,7 +46,7 @@ endif SYSMENU_VERSION_REGION_HEX_CODE = $(shell perl -e 'printf "%x", unpack( c ,$(SYSMENU_VERSION_REGION) )') SYSMENU_VERSION_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion -SYSMENU_VERSION_FILE = SysmenuVersion.$(SYSMENU_VERSION_TARGET).$(SYSMENU_VERSION_REGION).dat +SYSMENU_VERSION_FILE ?= SysmenuVersion.$(SYSMENU_VERSION_TARGET).$(SYSMENU_VERSION_REGION).dat SYSMENU_VERSION_MAKETAD_OPTION += -s -d 0003000F484E4C$(SYSMENU_VERSION_REGION_HEX_CODE) 3031 0 SYSM_VERSION -v $(SYSMENU_VERSION_TAD_VERSION) -p SYSMENU_VERSION_REGION ?= A diff --git a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local index 03459f33..e6d05f01 100644 --- a/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local +++ b/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local @@ -25,7 +25,7 @@ GEN_VERSION_PARAM = $(SYSMENU_VERSION_TARGET) $(SYSMENU_VERSION_TIMESTAMP) $(ST GEN_VERSION_FILE = $(SYSMENU_TOOLSDIR)/bin/genVersion.plx VERSION_TITLEID_LO = HNL$(SYSMENU_VERSION_REGION) -VERSION_TAD = $(BINDIR)/$(VERSION_TITLEID_LO)_$(SYSMENU_VERSION_MAJOR)_$(SYSMENU_VERSION_MINOR)_$(SYSMENU_VERSION_TIMESTAMP).$(SYSMENU_VERSION_TARGET).tad +VERSION_TAD ?= $(BINDIR)/$(VERSION_TITLEID_LO)_$(SYSMENU_VERSION_MAJOR)_$(SYSMENU_VERSION_MINOR)_$(SYSMENU_VERSION_TIMESTAMP).$(SYSMENU_VERSION_TARGET).tad ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) VERSION_DAT = $(SYSMENU_VERSION_FILE) diff --git a/build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.J b/build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.J index 7de0a8ea..c576fa22 100644 --- a/build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.J +++ b/build/systemMenu_RED/sysmenuVersion/defs.sysmenuVersion.J @@ -21,7 +21,7 @@ SYSMENU_VERSION_REGION = J SYSMENU_VERSION_STRING_REGION = J -SYSMENU_VERSION_TIMESTAMP = 09040300 +SYSMENU_VERSION_TIMESTAMP ?= 09040300 SYSMENU_VERSION_MAJOR = 1 SYSMENU_VERSION_MINOR = 4 SYSMENU_VERSION_TAD_VERSION = 4 diff --git a/tools/bin/genVersion.plx b/tools/bin/genVersion.plx index 30cf04e8..35e50ae3 100644 --- a/tools/bin/genVersion.plx +++ b/tools/bin/genVersion.plx @@ -51,8 +51,16 @@ sub deleteTemp { system ("rm -f $digestFile"); system ("rm -f $signFile"); system ("rm -f $archiveFile"); + system ("rm -f $versionFile"); + system ("rm -f $timeStampFile"); + system ("rm -f $userAreaSizeFile"); + system ("rm -f $nupHostFile"); + system ("rm -f $urlEULAFile"); } +# 事前のテンポラリクリア + + # 環境変数サーチ foreach ( sort keys ( %ENV ) ){ if ($_ =~ m/TWL_IPL_RED_PRIVATE_ROOT/s) { @@ -123,11 +131,13 @@ if (exists($ENV{"TWL_IPL_RED_ROOT"}) ){ printf "ERROR: NUP Host Name length less than %d.\n", $length; die; } - open NUPHOSTNAME, ">$nupHostFile" or die "File Open Error.\n"; - binmode NUPHOSTNAME; - printf "NUPHostName = $nupHostName\n"; - syswrite( NUPHOSTNAME, pack( "a$length", $nupHostName ) ); - close NUPHOSTNAME; + if( $nupHostName ne "NULL" ) { + open NUPHOSTNAME, ">$nupHostFile" or die "File Open Error.\n"; + binmode NUPHOSTNAME; + printf "NUPHostName = $nupHostName\n"; + syswrite( NUPHOSTNAME, pack( "a$length", $nupHostName ) ); + close NUPHOSTNAME; + } } # EULA_URLの出力