「システムメニューバージョン」タイトルのタイトルIDを正式な値"HNLA"に変更。

上記タイトルをsystemMenu_masteringとSystemUpdaterに対応。

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

build/systemMenu_RED/sysmenuVersion/Makefile

@@ -23,6 +23,7 @@
 TARGET_FIRM			=	SYSTEMMENU
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.sysmenuVersion
 
 VER_TIMESTAMP	=	08062300
 
@@ -33,16 +34,12 @@ MINOR_VERSION		=	1
 # ユーザー領域サイズ(=128MB)
 USER_AREA_SIZE		=	134217728
 
-VERSION_FILE	=	SysmenuVersion.dat
-
 GEN_VERSION_FILE	=	$(SYSMENU_TOOLSDIR)/bin/genVersion.plx
 
-VERSION_MAKETAD_OPTION		+=	-s -d 0003000F484E4c41 3031 0 SYSM_VERSION -v 0 -p
-
 VERSION_TAD			=	HNLA.tad
 
 ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),)
-	VERSION_DAT		=	$(VERSION_FILE)
+	VERSION_DAT		=	$(SYSMENU_VERSION_FILE)
 endif
 
 TARGETS				+=	$(VERSION_TAD)
@@ -60,7 +57,7 @@ do-build :  $(VERSION_TAD)
 $(VERSION_DAT):
 	$(GEN_VERSION_FILE) $(VER_TIMESTAMP) $(MAJOR_VERSION) $(MINOR_VERSION) $(USER_AREA_SIZE)
 
-$(VERSION_TAD) : $(VERSION_FILE)
-	$(MAKETAD) $(call empath,$<) $(VERSION_MAKETAD_OPTION) -o $@
+$(VERSION_TAD) : $(SYSMENU_VERSION_FILE)
+	$(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@
 
 #===== End of Makefile =====

build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion

@@ -0,0 +1,22 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     commondefs.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: 
+#----------------------------------------------------------------------------
+
+SYSMENU_VERSION_DIR				 =	$(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion
+SYSMENU_VERSION_FILE			 =	SysmenuVersion.dat
+SYSMENU_VERSION_MAKETAD_OPTION	+=	-s -d 0003000F484E4c41 3031 0 SYSM_VERSION -v 0 -p
+

build/systemMenu_mastering/Makefile

@@ -47,6 +47,7 @@ TARGETS			=	$(OUT_DIR)/HNAA \
 					$(OUT_DIR)/HNBA \
 					$(OUT_DIR)/HNCA \
 					$(OUT_DIR)/HNHA \
+					$(OUT_DIR)/HNLA \
 					$(OUT_DIR)/TWLFontTable.dat \
 					$(OUT_DIR)/menu_launcher-$(TWL_BUILD_TYPE).nand \
 					$(OUT_DIR)/$(NAND_INITIALIZER_NAME)-$(TWL_BUILD_TYPE)$(MASTER).srl
@@ -132,6 +133,19 @@ else
 	cp $< $(OUT_DIR)
 endif
 
+#---------------------------
+#システムメニューバージョン
+#---------------------------
+# [TODO] TADからバージョンを取得して、バージョン番号でディレクトリを作成する。
+$(OUT_DIR)/HNLA : $(SYSMENU_DIR)/sysmenuVersion/HNLA.tad
+ifeq ($(DO_MASTERING),TRUE)
+	mkdir -p $(OUT_DIR)/$(notdir $(basename $<))
+	mkdir -p $(OUT_DIR)/$(notdir $(basename $<))/V0
+	cp $< ./$@/V0/
+	cp $(dir $<)/properties ./$@
+else
+	cp $< $(OUT_DIR)
+endif
 
 #---------------------------
 #共有フォント

build/systemMenu_tools/SystemUpdater/data/Makefile

@@ -21,6 +21,7 @@ TARGET_FIRM				=	SYSTEMMENU
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 include $(SYSMENU_ROOT)/build/systemMenu_RED/wlanfirm/commondefs.wlanfirm
 include $(SYSMENU_ROOT)/build/systemMenu_RED/DSHashTable/commondefs.DSHashTable
+include $(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion
 
 # SystemUpdaterでインポートするTADは専用のmaketadでTAD化します。
 MAKETAD			:=	$(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe
@@ -33,6 +34,7 @@ LDIRT_CLEAN		=	HNAA.tad \
 					HNBA.tad \
 					HNCA.tad \
 					HNHA.tad \
+					HNLA.tad \
 					menu_launcher.nand
 
 #----------------------------------------------------------------------------
@@ -43,6 +45,7 @@ do-build :	HNAA.tad \
 			HNBA.tad \
 			HNCA.tad \
 			HNHA.tad \
+			HNLA.tad \
 			menu_launcher.nand
 
 
@@ -60,6 +63,9 @@ HNCA.tad: $(MY_WLANFIRM)
 HNHA.tad: $(DS_HASH_TABLE_DATA)
 	$(MAKETAD) $(call empath,$<) $(DS_HASH_TABLE_MAKETAD_OPTION) -o $@
 
+HNLA.tad: $(SYSMENU_VERSION_DIR)/$(SYSMENU_VERSION_FILE)
+	$(MAKETAD) $(call empath,$<) $(SYSMENU_VERSION_MAKETAD_OPTION) -o $@
+
 menu_launcher.nand: ../../../nandfirm/menu-launcher/menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand
 	cp $< ./$@