SystemUpdater用のmaketad.updaterで作成したTADがSystemUpdater/dataフォルダ内のみで生成される

ようにビルドシステムを修正。

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

build/systemMenu_RED/DSHashTable/Makefile

@@ -19,37 +19,17 @@
 TARGET_FIRM			=	SYSTEMMENU
 
 override TARGET_PLATFORM := TWL
-override TARGET_CODEGEN		:= ARM
-override TWL_ARCHGEN		:= LIMITED
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
+include ./commondefs.DSHashTable
 
-MY_TITLE		=	HNHA
+MY_DATA				=	$(DS_HASH_TABLE_DATA)
-
-MY_DATA			=	DSHashTable.bin
-
-#MY_TITLE_NAME		=	$(MY_TITLE)
-MY_TITLE_NAME		=	DSHashTable
-
 
 #----------------------------------------------------------------------------
 MY_TAD				=	$(MY_TITLE).tad
 
-MY_TITLE_ID_HI		=	0003000F
+#INSTALL_TARGETS	=	$(MY_TAD)
-MY_TITLE_ID_LO		=	$(shell perl -e 'printf "%02X%02X%02X%02X", unpack("C4", "'$(MY_TITLE)'")')
+#INSTALL_DIR		=
-MY_TITLE_ID		=	$(MY_TITLE_ID_HI)$(MY_TITLE_ID_LO)
-MY_GROUP_ID		=	3031
-
-MY_VERSION		=	$(shell perl -e 'open IN, "$(MY_DATA)"; binmode IN; seek IN, 132, 0; read IN, $$buf, 2; print unpack "S", $$buf; close IN')
-
-MY_MAJOR_VERSION        =       $(shell expr $(MY_VERSION) / 256)
-MY_MINOR_VERSION        =       $(shell expr $(MY_VERSION) % 256)
-
-INSTALL_TARGETS		=	$(MY_TAD)
-INSTALL_DIR		=	$(ROOT)/build/tools/TwlNMenu/data
-
-MAKETAD_FLAGS		=	-d $(MY_TITLE_ID) $(MY_GROUP_ID) $(MY_MAJOR_VERSION) $(MY_TITLE_NAME) \
-				-v $(MY_MINOR_VERSION) -p
 
 LDIRT_CLEAN			=	$(MY_TAD)
 
@@ -60,6 +40,6 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 do-build : $(MY_TAD)
 
 $(MY_TAD): $(MY_DATA)
-	$(MAKETAD) $(call empath,$<) $(MAKETAD_FLAGS) -o $@
+	$(MAKETAD) $(call empath,$<) $(DS_HASH_TABLE_MAKETAD_OPTION) -o $@
 
 #===== End of Makefile =====

build/systemMenu_RED/DSHashTable/commondefs.DSHashTable

@@ -0,0 +1,35 @@
+#! 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: 
+#----------------------------------------------------------------------------
+
+DS_HASH_TABLE_TITLE_NAME       =    DSHashTable
+DS_HASH_TABLE_DATA_DIR         =    $(SYSMENU_ROOT)/build/systemMenu_RED/DSHashTable
+DS_HASH_TABLE_DATA             =    $(DS_HASH_TABLE_DATA_DIR)/$(DS_HASH_TABLE_TITLE_NAME).bin
+DS_HASH_TABLE_TITLE            =    HNHA
+DS_HASH_TABLE_TITLE_ID_HI      =    0003000F
+DS_HASH_TABLE_TITLE_ID_LO      =    $(shell perl -e 'printf "%02X%02X%02X%02X", unpack("C4", "'$(DS_HASH_TABLE_TITLE)'")')
+DS_HASH_TABLE_TITLE_ID         =    $(DS_HASH_TABLE_TITLE_ID_HI)$(DS_HASH_TABLE_TITLE_ID_LO)
+
+DS_HASH_TABLE_GROUP_ID         =    3031
+
+DS_HASH_TABLE_VERSION          =    $(shell perl -e 'open IN, "$(DS_HASH_TABLE_DATA)"; binmode IN; seek IN, 132, 0; read IN, $$buf, 2; print unpack "S", $$buf; close IN')
+
+DS_HASH_TABLE_MAJOR_VERSION    =    $(shell expr $(DS_HASH_TABLE_VERSION) / 256)
+DS_HASH_TABLE_MINOR_VERSION    =    $(shell expr $(DS_HASH_TABLE_VERSION) % 256)
+
+DS_HASH_TABLE_MAKETAD_OPTION   =    -s -d $(DS_HASH_TABLE_TITLE_ID) $(DS_HASH_TABLE_GROUP_ID) $(DS_HASH_TABLE_MAJOR_VERSION) $(DS_HASH_TABLE_TITLE_NAME) \
+                                    -v $(DS_HASH_TABLE_MINOR_VERSION) -p

build/systemMenu_RED/wlanfirm/Makefile

@@ -17,31 +17,20 @@
 #----------------------------------------------------------------------------
 
 TARGET_FIRM					=	SYSTEMMENU
-
 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+
-override TWL_ARCHGEN		:= LIMITED
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
-MY_FIRM_ROOT	=	$(TWLWIRELESS_ROOT)/binfile
+include ./commondefs.wlanfirm
-
-MY_FIRM_ROOT_CYG =	$(call eupath,$(MY_FIRM_ROOT))
 
 
 MY_TITLE		=	HNCA
-MY_FIRM			=	$(MY_FIRM_ROOT_CYG)/nwm_firm.bin
-
-# FWファイルの先頭1バイトに入っているバージョン情報を取得
-MY_VERSION_MAJOR	=	$(shell perl -e "open(IN,'$(MY_FIRM)');binmode(IN);seek(IN, 160 + 0, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);")
-MY_VERSION_MINOR	=	$(shell perl -e "open(IN,'$(MY_FIRM)');binmode(IN);seek(IN, 160 + 1, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);")
-
-MAKETAD_FLAGS	+=	0003000F484E4341 3031 $(MY_VERSION_MAJOR) WIRELESS_FW -v $(MY_VERSION_MINOR) -p
 
 #----------------------------------------------------------------------------
 MY_TAD			=	$(MY_TITLE).tad
 
-INSTALL_TARGETS	=	$(MY_TAD)
+#INSTALL_TARGETS	=
-INSTALL_DIR		=	$(ROOT)/build/tools/TwlNMenu/data
+#INSTALL_DIR		=
 
 LDIRT_CLEAN		=	$(MY_TAD)
 
@@ -51,7 +40,7 @@ include $(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 
 do-build : $(MY_TAD)
 
-$(MY_TAD): $(MY_FIRM)
+$(MY_TAD): $(MY_WLANFIRM)
-	$(MAKETAD) $(call empath,$<) -s -d $(MAKETAD_FLAGS) -o $@
+	$(MAKETAD) $(call empath,$<) $(WLANFIRM_MAKETAD_OPTION) -o $@
 
 #===== End of Makefile =====

build/systemMenu_RED/wlanfirm/commondefs.wlanfirm

@@ -0,0 +1,29 @@
+#! make -f
+#----------------------------------------------------------------------------
+# Project:  TwlIPL
+# File:     commondefs.wlanfirm -
+#
+# 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: 
+#----------------------------------------------------------------------------
+
+MY_WLANFIRM_ROOT			=	$(TWLWIRELESS_ROOT)/binfile
+MY_WLANFIRM_ROOT_CYG		=	$(call eupath,$(MY_WLANFIRM_ROOT))
+
+MY_WLANFIRM					=	$(MY_WLANFIRM_ROOT_CYG)/nwm_firm.bin
+
+# FWファイルの先頭1バイトに入っているバージョン情報を取得
+MY_WLANFIRM_VERSION_MAJOR	=	$(shell perl -e "open(IN,'$(MY_WLANFIRM)');binmode(IN);seek(IN, 160 + 0, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);")
+MY_WLANFIRM_VERSION_MINOR	=	$(shell perl -e "open(IN,'$(MY_WLANFIRM)');binmode(IN);seek(IN, 160 + 1, 0);read(IN, \$$buf, 1);print unpack("C", \$$buf);close(IN);")
+
+WLANFIRM_MAKETAD_OPTION		+=	-s -d 0003000F484E4341 3031 $(MY_WLANFIRM_VERSION_MAJOR) WIRELESS_FW -v $(MY_WLANFIRM_VERSION_MINOR) -p
+

build/systemMenu_tools/SystemUpdater/Makefile

@@ -20,9 +20,6 @@ TARGET_FIRM				=	SYSTEMMENU
 
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
-# SystemUpdaterでインポートするTADは専用のmaketadでTAD化します。
-SUBDIR_FLAGS += MAKETAD=$(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe
-
 #----------------------------------------------------------------------------
 
 LAUNCHER_DIR				=	$(TWL_IPL_RED_ROOT)/build/systemMenu_RED/Launcher

build/systemMenu_tools/SystemUpdater/data/Makefile

@@ -19,7 +19,13 @@
 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
 
+# SystemUpdaterでインポートするTADは専用のmaketadでTAD化します。
+MAKETAD			:=	$(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe
+
+MAKETAD_OPTION	+=	-s
 
 #----------------------------------------------------------------------------
 
@@ -39,17 +45,20 @@ do-build :	HNAA.tad \
 			HNHA.tad \
 			menu_launcher.nand
 
-HNAA.tad: ../../../systemMenu_RED/Launcher/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNAA.tad
-	cp $< ./$@
 
-HNBA.tad: ../../../systemMenu_RED/MachineSettings/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNBA.tad
+# maketad.updaterで作られたTADが他のフォルダに残らないように、ここでTAD化処理する。
-	cp $< ./$@
+
+HNAA.tad: ../../../systemMenu_RED/Launcher/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNAA.srl
+	$(MAKETAD) $< $(MAKETAD_OPTION) -o $@
+
+HNBA.tad: ../../../systemMenu_RED/MachineSettings/ARM9/bin/ARM9-TS.LTD/$(TWL_BUILD_DIR)/HNBA.srl
+	$(MAKETAD) $< $(MAKETAD_OPTION) -o $@
 
 HNCA.tad: ../../../systemMenu_RED/wlanfirm/HNCA.tad
-	cp $< ./$@
+	$(MAKETAD) $< $(WLANFIRM_MAKETAD_OPTION) -o $@
 
 HNHA.tad: ../../../systemMenu_RED/DSHashTable/HNHA.tad
-	cp $< ./$@
+	$(MAKETAD) $< $(DS_HASH_TABLE_MAKETAD_OPTION) -o $@
 
 menu_launcher.nand: ../../../nandfirm/menu-launcher/menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand
 	cp $< ./$@