From a119aa16ff8d32f9fd9efd200e4b0c050ada5b56 Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 8 Sep 2008 04:21:46 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D?=
 =?UTF-8?q?=E3=81=AB=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=8C?=
 =?UTF-8?q?=E5=85=A5=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2428 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/nandfirm/menu-launcher/Makefile | 33 ++++++++++++++-------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/build/nandfirm/menu-launcher/Makefile b/build/nandfirm/menu-launcher/Makefile
index 2fe076fc..3a1adbbc 100644
--- a/build/nandfirm/menu-launcher/Makefile
+++ b/build/nandfirm/menu-launcher/Makefile
@@ -24,8 +24,7 @@ SUBDIRS =	\
             ARM7 \
             ARM9 \
 
-TARGET_FIRM_BIN		=	menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH).nand
-TARGET_FIRM_VERSION_BIN	=	menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH)-with-version.nand
+TARGET_FIRM_BIN		=	menu_launcher-$(TWL_BUILD_TYPE)$(CODEGEN_ARCH)-$(IPL_REVISION)-$(SDK_REVISION).nand
 BINDIR			=	.
 MAKEFIRM_ARM9		=	ARM9/bin/$(TWL_BUILDTYPE_ARM9)/menu_launcher9.tef
 MAKEFIRM_ARM7		=	ARM7/bin/$(TWL_BUILDTYPE_ARM7)/menu_launcher7.tef
@@ -42,6 +41,16 @@ LDIRT_CLEAN		+=	$(wildcard *.nand) \
 
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 
+IPL_REVISION 		:=	$(shell LANG=C svn info $(call empath,$(FIRM_ROOT)) | grep 'Revision' | sed s/[^0-9]//g)
+SDK_REVISION		:=	$(shell LANG=C svn info $(call empath,$(ROOT)) | grep 'Revision' | sed s/[^0-9]//g)
+
+ifeq ($(IPL_REVISION),)
+IPL_REVISION		:=	$(shell date +%Y%m%d)
+endif
+ifeq ($(SDK_REVISION),)
+SDK_REVISION		:=	$(shell date +%H%M%S)
+endif
+
 #----------------------------------------------------------------------------
 
 do-build:	$(TARGET_BIN) $(MY_APPEND)
@@ -49,20 +58,12 @@ do-build:	$(TARGET_BIN) $(MY_APPEND)
 
 include	$(TWL_IPL_RED_ROOT)/build/buildtools/modulerules
 
-$(TARGET_FIRM_VERSION_BIN):	$(TARGET_BIN) $(MY_APPEND)
-	cat $(TARGET_BIN) $(MY_APPEND) > $@
-
-
 $(MY_APPEND)::
-	@if test -e $(FIRM_ROOT)/.svn; then \
-		LANG=C svn info $(call empath,$(FIRM_ROOT)) | grep 'Revision' | sed s/[^0-9]//g > $(MY_APPEND); \
-	else \
-		date > $(MY_APPEND); \
-	fi
-	@if test -e $(ROOT)/.svn; then \
-		LANG=C svn info $(call empath,$(ROOT)) | grep 'Revision' | sed s/[^0-9]//g >> $(MY_APPEND); \
-	else \
-		echo "" >> $(MY_APPEND); \
-	fi
+	echo $(IPL_REVISION) > $(MY_APPEND)
+	echo $(SDK_REVISION) >> $(MY_APPEND)
+
+test::
+	echo IPL_REVISION=$(IPL_REVISION)
+
 
 #===== End of Makefile =====