svnno****@sourc*****
svnno****@sourc*****
2017年 3月 22日 (水) 18:20:04 JST
Revision: 6650 http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6650 Author: doda Date: 2017-03-22 18:20:03 +0900 (Wed, 22 Mar 2017) Log Message: ----------- zlib のライセンスもヘルプファイルに含めるようにした Modified Paths: -------------- trunk/doc/convtext.bat trunk/doc/en/html/index.html trunk/doc/en/teraterm.hhc trunk/doc/en/teraterm.hhp trunk/doc/ja/html/index.html trunk/doc/ja/teraterm.hhc trunk/doc/ja/teraterm.hhp trunk/teraterm/common/helpid.h Added Paths: ----------- trunk/installer/copy-zliblicense.pl -------------- next part -------------- Modified: trunk/doc/convtext.bat =================================================================== --- trunk/doc/convtext.bat 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/doc/convtext.bat 2017-03-22 09:20:03 UTC (rev 6650) @@ -1,4 +1,5 @@ set TOSJIS=perl ..\installer\2sjis.pl +set ZLIBCP=perl ..\installer\copy-zliblicense.pl set REF_E=en\html\reference set REF_J=ja\html\reference %TOSJIS% -i ..\libs\oniguruma\COPYING -o %REF_E%\Oniguruma-LICENSE.txt -l unix @@ -13,3 +14,5 @@ %TOSJIS% -i ..\libs\SFMT\LICENSE.txt -o %REF_J%\SFMT-LICENSE.txt -l unix %TOSJIS% -i ..\cygterm\COPYING -o %REF_E%\CygTerm+-LICENSE.txt -l unix %TOSJIS% -i ..\cygterm\COPYING -o %REF_J%\CygTerm+-LICENSE.txt -l unix +%ZLIBCP% -i ..\libs\zlib\README -o %REF_E%\zlib-LICENSE.txt -l unix +%ZLIBCP% -i ..\libs\zlib\README -o %REF_J%\zlib-LICENSE.txt -l unix Modified: trunk/doc/en/html/index.html =================================================================== --- trunk/doc/en/html/index.html 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/doc/en/html/index.html 2017-03-22 09:20:03 UTC (rev 6650) @@ -138,6 +138,7 @@ <LI><A HREF="reference/RE.txt">RE</A> <LI><A HREF="reference/OpenSSL-LICENSE.txt">License of OpenSSL</A></LI> <LI><A HREF="reference/OpenSSH-LICENSE.txt">License of OpenSSH</A></LI> + <LI><A HREF="reference/zlib-LICENSE.txt">License of zlib</A></LI> <LI><A HREF="reference/PuTTY-LICENSE.txt">License of PuTTY</A></LI> <LI><A HREF="reference/Oniguruma-LICENSE.txt">License of Oniguruma</A></LI> <LI><A HREF="reference/SFMT-LICENSE.txt">License of SFMT</A></LI> Modified: trunk/doc/en/teraterm.hhc =================================================================== --- trunk/doc/en/teraterm.hhc 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/doc/en/teraterm.hhc 2017-03-22 09:20:03 UTC (rev 6650) @@ -551,6 +551,11 @@ <param name="ImageNumber" value="11"> </OBJECT> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="License of zlib"> + <param name="Local" value="html\reference\zlib-LICENSE.txt"> + <param name="ImageNumber" value="11"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="License of PuTTY"> <param name="Local" value="html\reference\PuTTY-LICENSE.txt"> <param name="ImageNumber" value="11"> Modified: trunk/doc/en/teraterm.hhp =================================================================== --- trunk/doc/en/teraterm.hhp 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/doc/en/teraterm.hhp 2017-03-22 09:20:03 UTC (rev 6650) @@ -145,6 +145,7 @@ HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt HlpRefSFMT=html\reference\SFMT-LICENSE.txt HlpRefCygterm=html\reference\CygTerm+-LICENSE.txt +HlpRefZlib=html\reference\zlib-LICENSE.txt HlpMacro=html\macro\index.html HlpMacroExec=html\macro\howtorun.html HlpMacroCommandline=html\macro\commandline.html Modified: trunk/doc/ja/html/index.html =================================================================== --- trunk/doc/ja/html/index.html 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/doc/ja/html/index.html 2017-03-22 09:20:03 UTC (rev 6650) @@ -138,6 +138,7 @@ <LI><A HREF="reference/RE.txt">RE</A></LI> <LI><A HREF="reference/OpenSSL-LICENSE.txt">OpenSSL \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI> <LI><A HREF="reference/OpenSSH-LICENSE.txt">OpenSSH \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI> + <LI><A HREF="reference/zlib-LICENSE.txt">zlib \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI> <LI><A HREF="reference/PuTTY-LICENSE.txt">PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI> <LI><A HREF="reference/Oniguruma-LICENSE.txt">\x8BS\x8E\xD4 \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI> <LI><A HREF="reference/SFMT-LICENSE.txt">SFMT \x83\x89\x83C\x83Z\x83\x93\x83X</A></LI> Modified: trunk/doc/ja/teraterm.hhc =================================================================== --- trunk/doc/ja/teraterm.hhc 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/doc/ja/teraterm.hhc 2017-03-22 09:20:03 UTC (rev 6650) @@ -560,6 +560,11 @@ <param name="ImageNumber" value="11"> </OBJECT> <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="zlib \x83\x89\x83C\x83Z\x83\x93\x83X"> + <param name="Local" value="html\reference\zlib-LICENSE.txt"> + <param name="ImageNumber" value="11"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> <param name="Name" value="PuTTY \x83\x89\x83C\x83Z\x83\x93\x83X"> <param name="Local" value="html\reference\PuTTY-LICENSE.txt"> <param name="ImageNumber" value="11"> Modified: trunk/doc/ja/teraterm.hhp =================================================================== --- trunk/doc/ja/teraterm.hhp 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/doc/ja/teraterm.hhp 2017-03-22 09:20:03 UTC (rev 6650) @@ -155,6 +155,7 @@ HlpRefOniguruma=html\reference\Oniguruma-LICENSE.txt HlpRefSFMT=html\reference\SFMT-LICENSE.txt HlpRefCygterm=html\reference\CygTerm+-LICENSE.txt +HlpRefZlib=html\reference\zlib-LICENSE.txt HlpMacro=html\macro\index.html HlpMacroExec=html\macro\howtorun.html HlpMacroCommandline=html\macro\commandline.html Added: trunk/installer/copy-zliblicense.pl =================================================================== --- trunk/installer/copy-zliblicense.pl (rev 0) +++ trunk/installer/copy-zliblicense.pl 2017-03-22 09:20:03 UTC (rev 6650) @@ -0,0 +1,37 @@ +#!/usr/bin/perl -w + +require 5.8.0; +use strict; +use Encode; +use utf8; +use Getopt::Long qw(:config posix_default no_ignore_case gnu_compat); + +my($in, $out, $coding, $lf, $result); + +# default setting +$lf = "crlf"; + +$result = GetOptions('in|i=s' => \$in, + 'out|o=s' => \$out, + 'lf|l=s' => \$lf); + +if (!(defined($in) && defined($out))) { + die "Usage: $0 --in file --out file [ --lf line_format ]\n"; +} + +open (IN, "<:$lf", $in); +while (<IN>) { + last if $_ =~ /Copyright notice:/; +} + +open (OUT, '>:crlf', $out); +print OUT $_; + +while (<IN>) { + print OUT $_; +} +close OUT; +close IN; + +my(@filestat) = stat $in; +utime $filestat[8], $filestat[9], $out; Modified: trunk/teraterm/common/helpid.h =================================================================== --- trunk/teraterm/common/helpid.h 2017-03-22 09:20:00 UTC (rev 6649) +++ trunk/teraterm/common/helpid.h 2017-03-22 09:20:03 UTC (rev 6650) @@ -153,6 +153,7 @@ #define HlpRefOniguruma 80008 #define HlpRefSFMT 80009 #define HlpRefCygterm 80010 +#define HlpRefZlib 80011 #define HlpMacro 90000 #define HlpMacroExec 90001