各リージョン毎のシステムメニューバージョンファイルを生成できるよう変更。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2138 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/systemMenu_RED/sysmenuVersion/Makefile

@@ -22,63 +22,13 @@
 
 # 現在、製品版の証明書を含んだものは生成しない
 
-override TARGET_PLATFORM  := TWL
-override TWL_ARCHGEN    := LIMITED
 
-TARGET_FIRM     = SYSTEMMENU
-TWL_NANDAPP     = TRUE
+override TARGET_PLATFORM := TWL
+
+SUBMAKES				=	 Makefile.A Makefile.J Makefile.E Makefile.P Makefile.U
+
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-include ./commondefs.sysmenuVersion
-
-DST_DIR			=	$(SYSMENU_VERSION_TARGET)
-REGION        ?=  A
-
-# タイムスタンプ
-VER_TIMESTAMP   = 08073100
-
-# システムメニューバージョン
-MAJOR_VERSION   = 0
-MINOR_VERSION   = 1
-STR_VERSION     = $(MAJOR_VERSION).$(MINOR_VERSION)$(REGION)
-
-# ユーザー領域サイズ(=128MB)
-USER_AREA_SIZE    = 134217728
-
-# NUPホストネーム
-NUP_HOSTNAME    = nus.t.shop.nintendowifi.net:443
-
-# EULAのURL
-EULA_URL      = https://cfh.t.app.nintendowifi.net/eula/
-
-GEN_VERSION_PARAM = $(DST_DIR) $(VER_TIMESTAMP) $(STR_VERSION) $(MAJOR_VERSION) $(MINOR_VERSION) \
-            $(USER_AREA_SIZE) $(NUP_HOSTNAME) $(EULA_URL)
-
-GEN_VERSION_FILE  = $(SYSMENU_TOOLSDIR)/bin/genVersion.plx
-
-VERSION_TAD     = HNL$(REGION).$(SYSMENU_VERSION_TARGET).tad
-
-ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),)
-  VERSION_DAT   = $(SYSMENU_VERSION_FILE)
-endif
-
-TARGETS       +=  $(VERSION_TAD)
-
-#----------------------------------------------------------------------------
-
-LDIRT_CLEAN     = $(VERSION_DAT) $(VERSION_TAD) properties
-
-#----------------------------------------------------------------------------
-
 include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 
-do-build :  $(VERSION_TAD)
-
-$(VERSION_DAT): ./Makefile ./commondefs.sysmenuVersion
-	$(GEN_VERSION_FILE) $(GEN_VERSION_PARAM)
-	mv SysmenuVersion.dat SysmenuVersion.$(SYSMENU_VERSION_TARGET).dat
-
-$(VERSION_TAD) : $(SYSMENU_VERSION_FILE)
-	$(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@
-
 #===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/Makefile.A

@@ -0,0 +1,42 @@
+#! 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
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
+include ./commondefs.sysmenuVersion.local
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+SYSMENU_VERSION_REGION		=	A
+SYSMENU_VERSION_TIMESTAMP	=	08081100
+SYSMENU_VERSION_MAJOR		=	0
+SYSMENU_VERSION_MINOR		=	0
+
+do-build :  $(TARGET_BIN)
+
+#----------------------------------------------------------------------------
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include ./modulerules.sysmenuVersion
+
+#===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/Makefile.E

@@ -0,0 +1,42 @@
+#! 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
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
+include ./commondefs.sysmenuVersion.local
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+SYSMENU_VERSION_REGION		=	E
+SYSMENU_VERSION_TIMESTAMP	=	08081100
+SYSMENU_VERSION_MAJOR		=	0
+SYSMENU_VERSION_MINOR		=	0
+
+do-build :  $(TARGET_BIN)
+
+#----------------------------------------------------------------------------
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include ./modulerules.sysmenuVersion
+
+#===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/Makefile.J

@@ -0,0 +1,42 @@
+#! 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
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
+include ./commondefs.sysmenuVersion.local
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+SYSMENU_VERSION_REGION		=	J
+SYSMENU_VERSION_TIMESTAMP	=	08081100
+SYSMENU_VERSION_MAJOR		=	0
+SYSMENU_VERSION_MINOR		=	0
+
+do-build :  $(TARGET_BIN)
+
+#----------------------------------------------------------------------------
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include ./modulerules.sysmenuVersion
+
+#===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/Makefile.P

@@ -0,0 +1,42 @@
+#! 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
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
+include ./commondefs.sysmenuVersion.local
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+SYSMENU_VERSION_REGION		=	P
+SYSMENU_VERSION_TIMESTAMP	=	08081100
+SYSMENU_VERSION_MAJOR		=	0
+SYSMENU_VERSION_MINOR		=	0
+
+do-build :  $(TARGET_BIN)
+
+#----------------------------------------------------------------------------
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include ./modulerules.sysmenuVersion
+
+#===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/Makefile.U

@@ -0,0 +1,42 @@
+#! 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
+
+include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
+include ./commondefs.sysmenuVersion.local
+
+#---------------------------------------------------------
+# リージョン固有パラメータ
+
+SYSMENU_VERSION_REGION		=	U
+SYSMENU_VERSION_TIMESTAMP	=	08081100
+SYSMENU_VERSION_MAJOR		=	0
+SYSMENU_VERSION_MINOR		=	0
+
+do-build :  $(TARGET_BIN)
+
+#----------------------------------------------------------------------------
+include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
+include ./modulerules.sysmenuVersion
+
+#===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion

@@ -16,6 +16,24 @@
 # $Author: 
 #----------------------------------------------------------------------------
 
+#---------------------------------------------------------
+# リージョン共通パラメータ
+
+# ユーザー領域サイズ(=128MB)
+USER_AREA_SIZE		=	134217728
+
+# NUPホストネーム
+NUP_HOSTNAME		=	nus.t.shop.nintendowifi.net:443
+
+# EULAのURL
+EULA_URL			=	https://cfh.t.app.nintendowifi.net/eula/
+
+# バージョン文字列
+STR_VERSION			=	$(SYSMENU_VERSION_MAJOR).$(SYSMENU_VERSION_MAJOR)$(SYSMENU_VERSION_REGION)
+
+#---------------------------------------------------------
+# 外部使用変数
+
 ifeq ($(FIRM_USE_PRODUCT_KEYS),TRUE)
 SYSMENU_VERSION_TARGET           =	prod
 else
@@ -23,6 +41,7 @@ SYSMENU_VERSION_TARGET           =	dev
 endif
 
 SYSMENU_VERSION_DIR				 =	$(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion
-SYSMENU_VERSION_FILE			 =	SysmenuVersion.$(SYSMENU_VERSION_TARGET).dat
+SYSMENU_VERSION_FILE			 =	SysmenuVersion.$(SYSMENU_VERSION_TARGET).$(SYSMENU_VERSION_REGION).dat
 SYSMENU_VERSION_MAKETAD_OPTION	+=	-s -d 0003000F484E4c41 3031 0 SYSM_VERSION -v 0 -p
 
+SYSMENU_VERSION_REGION			?=	A

build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion.local

@@ -0,0 +1,37 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     commondefs.sysmenuVersion.local
+#
+# 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: 
+#----------------------------------------------------------------------------
+
+#---------------------------------------------------------
+# “à•”Žg—p•Ï<E280A2>”
+
+GEN_VERSION_PARAM		=	$(SYSMENU_VERSION_TARGET) $(SYSMENU_VERSION_TIMESTAMP) $(STR_VERSION) $(SYSMENU_VERSION_MAJOR) $(SYSMENU_VERSION_MINOR) \
+							$(USER_AREA_SIZE) $(NUP_HOSTNAME) $(EULA_URL) $(SYSMENU_VERSION_FILE)
+
+GEN_VERSION_FILE		=	$(SYSMENU_TOOLSDIR)/bin/genVersion.plx
+
+VERSION_TITLEID_LO		=	HNL$(SYSMENU_VERSION_REGION)
+VERSION_TAD				=	$(BINDIR)/$(VERSION_TITLEID_LO).$(SYSMENU_VERSION_TARGET).tad
+
+ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),)
+  VERSION_DAT			=	$(SYSMENU_VERSION_FILE)
+endif
+
+BINDIR					=	$(SYSMENU_VERSION_TARGET).out/$(VERSION_TITLEID_LO)
+TARGET_BIN				=	$(VERSION_TAD)
+
+LDIRT_CLEAN				+=	$(VERSION_DAT) $(VERSION_TAD) $(BINDIR)/properties $(BINDIR)

build/systemMenu_RED/sysmenuVersion/modulerules.sysmenuVersion

@@ -0,0 +1,25 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     modulerules.sysmenuVersion
+#
+# 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: 
+#----------------------------------------------------------------------------
+
+$(VERSION_DAT): ./Makefile ./commondefs.sysmenuVersion
+	$(GEN_VERSION_FILE) $(GEN_VERSION_PARAM)
+
+$(VERSION_TAD) : $(SYSMENU_VERSION_FILE)
+	mkdir -p $(BINDIR)
+	$(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@
+

build/systemMenu_mastering/Makefile

@@ -140,7 +140,7 @@ endif
 #---------------------------
 # [TODO] TADからバージョンを取得して、バージョン番号でディレクトリを作成する。
 # FIRM_USE_PRODUCT_KEYS = TRUE の時のみPROD用のシステムメニューバージョンを取得します。
-$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/HNLA.$(SYSMENU_VERSION_TARGET).tad
+$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/$(SYSMENU_VERSION_TARGET).out/HNLA/HNLA.$(SYSMENU_VERSION_TARGET).tad
 ifeq ($(DO_MASTERING),TRUE)
 	mkdir -p $@
 	mkdir -p $@/V0

tools/bin/genVersion.plx

@@ -15,8 +15,8 @@
 use POSIX 'strftime';
 use File::Basename;
 
-if ($#ARGV < 7) {
-    printf STDOUT ("Usage: %s [genVersion] dir timestamp strVersion majorVersion minorVersion userAreaSize NUPHostName EULAURL\n", $0);
+if ($#ARGV < 8) {
+    printf STDOUT ("Usage: %s [genVersion] dir timestamp strVersion majorVersion minorVersion userAreaSize NUPHostName EULAURL outFile\n", $0);
     exit(-1);
 }
 
@@ -39,7 +39,7 @@ my $urlEULAFile               = "$dataDir/eula_url.bin";
 #my $rootCACert4SSLFile6       = "$dataDir/root_ca_cert4ssl6";
 
 # 出力ファイル
-my $outFile          = "SysmenuVersion.dat";
+my $outFile = $ARGV[8];
 
 # 中間ファイル
 my $archiveFile      = "archive.narc";