[Ttssh2-commit] [4614] アーカイブ版リリース用の調整

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2011年 9月 3日 (土) 21:56:34 JST


Revision: 4614
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4614
Author:   maya
Date:     2011-09-03 21:56:34 +0900 (Sat, 03 Sep 2011)

Log Message:
-----------
アーカイブ版リリース用の調整

Modified Paths:
--------------
    trunk/installer/makearchive.bat
    trunk/installer/teraterm.iss

Added Paths:
-----------
    trunk/installer/issversion.pl


-------------- next part --------------
Added: trunk/installer/issversion.pl
===================================================================
--- trunk/installer/issversion.pl	                        (rev 0)
+++ trunk/installer/issversion.pl	2011-09-03 12:56:34 UTC (rev 4614)
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+
+open ISS, 'teraterm.iss';
+while(<ISS>){
+	if (/^#define AppVer "([0-9\.]+)"$/) {
+		print $1;
+		last;
+	}
+}
+close ISS;

Modified: trunk/installer/makearchive.bat
===================================================================
--- trunk/installer/makearchive.bat	2011-09-03 05:22:04 UTC (rev 4613)
+++ trunk/installer/makearchive.bat	2011-09-03 12:56:34 UTC (rev 4614)
@@ -1,32 +1,39 @@
 @echo off
-rem œŽg—p—á
-rem ’ʏí‚̃rƒ‹ƒh
-rem   makearchive.bat
-rem ƒŠƒrƒ‹ƒh
-rem   makearchive.bat rebuild
-rem ƒfƒoƒbƒOî•ñŠÜ‚Þ
-rem   makearchive.bat debug
-rem ƒvƒ‰ƒOƒCƒ“ŠÜ‚Þ
-rem   makearchive.bat plugins
 
 SET debug=no
 SET plugins=no
+SET rebuild=
+SET release=
 
 if "%1"=="/?" goto help
 @echo on
 if "%1"=="debug" SET debug=yes
 if "%1"=="plugins" SET plugins=yes
+if "%1"=="rebuild" SET rebuild=rebuild
+if "%1"=="release" SET release=yes
 
 CALL makechm.bat
-CALL build.bat %1
+CALL build.bat %rebuild%
 
+rem  change folder name
+if not "%release%"=="yes" goto snapshot
+set ver=
+for /f "delims=" %%i in ('perl issversion.pl') do @set ver=%%i
+set dst=Output\teraterm-%ver%
+goto create
+
+:snapshot
 rem  for XP or later
 set today=snapshot-%date:~0,4%%date:~5,2%%date:~8,2%
-
-for %%a in (%today%, %today%_2, %today%_3, %today%_4, %today%_5) do (
-set dst=%%a
-if not exist %%a goto create
+ @ for /l %%i in (1,1,10) do @(
+if %%i==1 (
+set dst=%today%
+if not exist %today% goto create
+) else (
+set dst=%today%_%%i
+if not exist %today%_%%i goto create
 )
+)
 
 :create
 del /s /q %dst%\*.*
@@ -43,6 +50,7 @@
 copy /y ..\TTProxy\Release\TTXProxy.dll %dst%
 copy /y ..\TTXKanjiMenu\Release\ttxkanjimenu.dll %dst%
 if "%plugins%"=="yes" copy /y ..\TTXSamples\Release\*.dll %dst%
+if "%release%"=="yes" copy /y ..\TTXSamples\Release\*.dll %dst%
 
 rem Debug file
 if "%debug%"=="yes" copy /y ..\teraterm\release\*.pdb %dst%
@@ -58,6 +66,15 @@
 if exist TTXResizeWin.dll ren TTXResizeWin.dll _TTXResizeWin.dll
 popd
 )
+if "%release%"=="yes" (
+pushd %dst%
+if exist TTXOutputBuffering.dll ren TTXOutputBuffering.dll _TTXOutputBuffering.dll
+if exist TTXFixedWinSize.dll ren TTXFixedWinSize.dll _TTXFixedWinSize.dll
+if exist TTXResizeWin.dll ren TTXResizeWin.dll _TTXResizeWin.dll
+if exist TTXShowCommandLine.dll ren TTXShowCommandLine.dll _TTXShowCommandLine.dll
+if exist TTXtest.dll ren TTXtest.dll _TTXtest.dll
+popd
+)
 
 copy /y ..\doc\ja\teratermj.chm %dst%
 copy /y ..\doc\en\teraterm.chm %dst%
@@ -82,7 +99,8 @@
 echo   %0 rebuild  ƒŠƒrƒ‹ƒh
 echo   %0 debug    ƒfƒoƒbƒOî•ñŠÜ‚Þƒrƒ‹ƒh
 echo   %0 plugins  ƒvƒ‰ƒOƒCƒ“î•ñŠÜ‚Þƒrƒ‹ƒh
+echo   %0 release  ’ʏí‚̃rƒ‹ƒh + ƒvƒ‰ƒOƒCƒ“‚ðŠÜ‚Þ + ƒtƒHƒ‹ƒ_–¼‚ª“ÁŽê
+echo      ƒA[ƒJƒCƒu”ŃŠƒŠ[ƒXì¬—p
 echo.
-echo ƒŠƒŠ[ƒX•¨Œ‚ðì¬‚·‚éê‡‚Í"rebuild"‚ðŽg—p‚µ‚Ä‚­‚¾‚³‚¢B
 exit /b
 

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2011-09-03 05:22:04 UTC (rev 4613)
+++ trunk/installer/teraterm.iss	2011-09-03 12:56:34 UTC (rev 4614)
@@ -795,5 +795,8 @@
 
 [InnoIDE_PreCompile]
 Name: makechm.bat
+Name: build.bat
 ;Name: build.bat; Parameters: rebuild
-Name: build.bat
+
+[InnoIDE_PostCompile]
+;Name: makearchive.bat; Parameters: release



Ttssh2-commit メーリングリストの案内
Back to archive index