From e426a5b8ddd44ffe6d5a5c6cc3947d85c8fa969b Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 8 Jul 2008 13:35:34 +0000
Subject: [PATCH] =?UTF-8?q?sysMenuVersion=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E5=86=85=E3=81=AE=E3=83=91=E3=83=87=E3=82=A3=E3=83=B3?=
 =?UTF-8?q?=E3=82=B0=E3=82=92=E6=95=B4=E7=90=86=E3=80=82?=
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@1823 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/buildtools/commondefs.sysmenu           |   2 --
 build/systemMenu_RED/sysmenuVersion/Makefile  |   5 ++-
 .../sysmenuVersion/SysmenuVersion.dat         | Bin 6852 -> 7040 bytes
 tools/bin/genVersion.plx                      |  32 +++++++++++++-----
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu
index 49fb95a8..9bb9616e 100644
--- a/build/buildtools/commondefs.sysmenu
+++ b/build/buildtools/commondefs.sysmenu
@@ -78,8 +78,6 @@ MAKEBANNER		:= $(TWL_TOOLSDIR)/bin/makebanner.TWL.exe
 MAKESYSMENU_RSA_PRVKEY	?= $(SYSMENU_TOOLSDIR)/openssl/rsa_private.der
 MAKESYSMENU_RSA_PUBKEY	?= $(SYSMENU_TOOLSDIR)/openssl/rsa_public.der
 
-MAKETAD			?= $(ROOT)/tools/bin/makeTad.pl
-
 #----------------------------------------------------------------------------
 
 ### Global Library resettings
diff --git a/build/systemMenu_RED/sysmenuVersion/Makefile b/build/systemMenu_RED/sysmenuVersion/Makefile
index 1e2c1848..c1f7393c 100644
--- a/build/systemMenu_RED/sysmenuVersion/Makefile
+++ b/build/systemMenu_RED/sysmenuVersion/Makefile
@@ -22,6 +22,9 @@
 
 # 現在、製品版の証明書を含んだものは生成しない
 
+override TARGET_PLATFORM	:= TWL
+override TWL_ARCHGEN		:= LIMITED
+
 TARGET_FIRM			=	SYSTEMMENU
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
@@ -31,9 +34,9 @@ include ./commondefs.sysmenuVersion
 VER_TIMESTAMP		=	08062300
 
 # システムメニューバージョン
-STR_VERSION			=	0.1A
 MAJOR_VERSION		=	0
 MINOR_VERSION		=	1
+STR_VERSION			=	$(MAJOR_VERSION).$(MINOR_VERSION)
 
 # ユーザー領域サイズ(=128MB)
 USER_AREA_SIZE		=	134217728
diff --git a/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dat b/build/systemMenu_RED/sysmenuVersion/SysmenuVersion.dat
index dce5cefecaa96cfb729709453f64d011c72865a0..1790bc3163c70525f7d33d8b8aa89b02b02c636a 100644
GIT binary patch
delta 484
zcmX?N+F)KE&+=hON^AGKRUI>@Z}t1#HIrjs-Pav@@4^C8_nf-%-etC!*P*B7zwews
z_Gpie6l=Nd?guwalCNIrR#*`hd|jk;Vn$bopYWPXDXD%TGF3S)_am>Ivn^Rrze0Q6
z^%u9axIB9q<$akRIF<eAULhQ7F^AuMUgqm(?{hEOZ~dAxqm286pJR~ozyA!34AK+3
zq<j~!Ffg3sWMH@e#Q*si7#R2&7#g7X0FVaZBS3rsh-Zp0Ff0J#Oi2cY0w68{;szjI
z0K`rqer|6jetgXJ9|+uiJ>6DFZob7hi-i@$|G&AAZ6a4a&~z$;ywYO5;*9(Pz4FXV
zz2y8{D-#oAoK`4flTl{l0J{)MY*r9F!@~G~^Gnh5EG8f^pdJ(j26~3rjDd>*0FVol
AMgRZ+

delta 283
zcmZoLKVn+%o#xN5w|^s3lTiIx&m*QCxBr`5o%dTUEbivq#piT(Za%s}^RTcYH_M!u
zyd;CC^J*O&EbX(6tKVJlJTq&OIk)5VyltP?U94j~_v=>bw55NfX1vwT4d`r3vMs(m
z!9!TEadqp=NsLtu>{sGnPP-Jn@3MH+E{)RtpEnlnUA{E^`~>bZevU!T|Nb*Dx=2mz
zlJcFw!oYBhlY!v`5P#=mVE6&VYWxfg8bE9d#12600>!){3=9H5d{csf;SLZ#fa0e>
z+9|}(?Zw28kJ;RPJ>5P?Y`(`hi)C{ITOSwG|NoN{1V!2Z|NqaR%*L^KgWwsUgxDDt
Q9tH*m4g)<yM+Tr20Ci|=FaQ7m

diff --git a/tools/bin/genVersion.plx b/tools/bin/genVersion.plx
index a3cdfab2..d4262c63 100644
--- a/tools/bin/genVersion.plx
+++ b/tools/bin/genVersion.plx
@@ -73,15 +73,21 @@ if (exists($ENV{"TWL_IPL_RED_ROOT"}) ){
 	die "No TWL_IPL_RED_ROOT is found.\n";
 }
 
-# バージョンの出力
+# システムメニューバージョンの出力
 {
+	my $length = 0x20;
+	my $sysMenuVersion = $ARGV[1];
+	if( length $sysMenuVersion >= $length ) {
+		printf "ERROR: SystemMenu version length less than %d.\n", $length;
+		die;
+	}
 	open VERSION, ">$versionFile" or die "File Open Error.\n";
 	binmode VERSION;
 #	my $ver = ( ( $ARGV[ 1 ] & 0xffff ) << 16 ) | ($ARGV[ 2 ] & 0xffff);
 #	printf "version = %d.%d\n", ($ver >> 16), ($ver & 0xffff);
 #	syswrite( VERSION, pack( "L", $ver ) );
-	printf "version = %s\n", $ARGV[1];
-    syswrite( VERSION, pack( "a*x", $ARGV[1]) );
+	printf "SysMenu version = %s\n", $sysMenuVersion;
+    syswrite( VERSION, pack( "a$length", $sysMenuVersion) );
 	close VERSION;
 }
 
@@ -108,21 +114,31 @@ if (exists($ENV{"TWL_IPL_RED_ROOT"}) ){
 
 # NUP_HOSTNAMEの出力
 {
+	my $length = 0x40;
+	my $nupHostName = $ARGV[ 5 ];
+	if( length $nupHostName >= $length ) {
+		printf "ERROR: NUP Host Name length less than %d.\n", $length;
+		die;
+	}
 	open NUPHOSTNAME, ">$nupHostFile" or die "File Open Error.\n";
 	binmode NUPHOSTNAME;
-	my $nupHostName = $ARGV[ 5 ];
 	printf "NUPHostName = $nupHostName\n";
-	syswrite( NUPHOSTNAME, pack( "a*x", $nupHostName ) );
+	syswrite( NUPHOSTNAME, pack( "a$length", $nupHostName ) );
 	close NUPHOSTNAME;
 }
 
 # EULA_URLの出力
 {
+	my $length = 0x80;
+	my $urlEULA = $ARGV[ 6 ];
+	if( length $urlEULA >= $length ) {
+		printf "ERROR: EULA URL length less than %d.\n", $length;
+		die;
+	}
 	open EULAURL, ">$urlEULAFile" or die "File Open Error.\n";
 	binmode EULAURL;
-	my $urlEULA = $ARGV[ 6 ];
 	printf "EULAURL = $urlEULA\n";
-	syswrite( EULAURL, pack( "a*x", $urlEULA ) );
+	syswrite( EULAURL, pack( "a$length", $urlEULA ) );
 	close EULAURL;
 }
 
@@ -139,7 +155,7 @@ if (exists($ENV{"TWLSYSTEM_ROOT"}) ){
 
 # アーカイブ作成
 {
-    system ( "$TWLSYSTEM_ROOT/tools/bin/nnsarc.exe -c $archiveFile $dataDir -s -E .svn" );
+    system ( "$TWLSYSTEM_ROOT/tools/bin/nnsarc.exe -c $archiveFile -A 16 $dataDir -s -E .svn" );
 }
 
 # アーカイブのハッシュの出力