Tera Term

[Ttssh2-commit] [5349] Cygwin 64bit 環境に対応

svnno****@sourc***** svnno****@sourc*****
2013年 8月 15日 (木) 23:49:31 JST

• 前の記事 [Ttssh2-commit] [5348] UseNormalBGColor が on の時、OSC 11 の後の OSC 111 で各属性色の背景色がリセットされない問題を修正。
• 次の記事 [Ttssh2-commit] [5350] 英訳
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 5349
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5349
Author:   maya
Date:     2013-08-15 23:49:30 +0900 (Thu, 15 Aug 2013)
Log Message:
-----------
Cygwin 64bit 環境に対応

Modified Paths:
--------------
    trunk/cygterm/Makefile
    trunk/cygterm/README
    trunk/cygterm/README-j
    trunk/cygterm/cyglaunch.c
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/usage/cygwin.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/usage/cygwin.html
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/cygterm/Makefile
===================================================================
--- trunk/cygterm/Makefile	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/cygterm/Makefile	2013-08-15 14:49:30 UTC (rev 5349)
@@ -31,10 +31,17 @@
 
 $(LAUNCH) : $(LAUNCH_SRC) $(RES)
 	@# gcc 4.3.2? or later doesn't support "-mno-cygwin" flag.
+	@#
+	@# $(CC)                   gcc less than 4.3.2 (supports "-mno-cygwin")
+	@# gcc-3                   gcc3 (supports "-mno-cygwin")
+	@# x86_64-w64-mingw32-gcc  mingw32 gcc  host:64bit target:64bit (64bit cygwin)
+	@# i686-w64-mingw32-gcc    mingw32 gcc  host:32bit target:64bit (32bit cygwin on 64bit Windows)
+	@# i686-pc-mingw32-gcc     mingw32 gcc  host:32bit target:32bit (32bit cygwin)
 	( $(CC) $(CFLAGS) $(LDFLAGS) -mno-cygwin -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
 	( gcc-3 $(CFLAGS) $(LDFLAGS) -mno-cygwin -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
-	( i686-w64-mingw32-gcc $(CFLAGS) $(LDFLAGS) -mno-cygwin -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
-	( i686-pc-mingw32-gcc $(CFLAGS) $(LDFLAGS) -mno-cygwin -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) 
+	( x86_64-w64-mingw32-gcc $(CFLAGS) $(LDFLAGS) -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
+	( i686-w64-mingw32-gcc $(CFLAGS) $(LDFLAGS) -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
+	( i686-pc-mingw32-gcc $(CFLAGS) $(LDFLAGS) -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) 
 	strip $(LAUNCH)
 
 $(RC):

Modified: trunk/cygterm/README
===================================================================
--- trunk/cygterm/README	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/cygterm/README	2013-08-15 14:49:30 UTC (rev 5349)
@@ -3,7 +3,7 @@
 
                 Using Cygwin with a terminal emulator.
 
-                Copyright (c) 2006-2011 TeraTerm Project
+                Copyright (c) 2006-2013 TeraTerm Project
                 http://ttssh2.sourceforge.jp/
 
                 Based on CygTerm by Original developer:
@@ -266,6 +266,9 @@
                 zsh 4.3.10
 
 // C H A N G E S //
+v1.07_24 2013/08/15 (by maya)
+        * Support for 64bit Cygwin.
+
 v1.07_23 2011/04/18 (by doda)
         * Display error message when chdir() was failed.
 

Modified: trunk/cygterm/README-j
===================================================================
--- trunk/cygterm/README-j	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/cygterm/README-j	2013-08-15 14:49:30 UTC (rev 5349)
@@ -3,7 +3,7 @@
 
                 $B%?!<%_%J%k!&%(%_%e%l!<%?$G(B Cygwin $B$r;H$&!#(B
 
-                Copyright (c) 2006-2011 TeraTerm Project
+                Copyright (c) 2006-2013 TeraTerm Project
                 http://ttssh2.sourceforge.jp/
 
                 Based on CygTerm by Original developer:
@@ -278,9 +278,12 @@
                 zsh 4.3.10
 
 // $BJQ(B $B99(B $BMz(B $BNr(B //
+v1.07_24 2013/08/15 (by maya)
+        * 64bit Cygwin $B$G$bF0:n$9$k$h$&$K$7$?!#(B
+
 v1.07_23 2011/04/18 (by doda)
         * -d $B%*%W%7%g%s$G;XDj$5$l$?%G%#%l%/%H%j$X$N0\F0$,<:GT$7$?;~!"(B
-	  $B%(%i!<%a%C%;!<%8$rI=<($9$k$*$&$K$7$?!#(B
+	  $B%(%i!<%a%C%;!<%8$rI=<($9$k$h$&$K$7$?!#(B
 
 v1.07_22 2011/03/03 (by maya)
         * $B%$%s%9%H!<%i$+$i5/F0%A%'%C%/$r$9$k$?$a$N(B mutex $B$r:o=|$7$?!#(B

Modified: trunk/cygterm/cyglaunch.c
===================================================================
--- trunk/cygterm/cyglaunch.c	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/cygterm/cyglaunch.c	2013-08-15 14:49:30 UTC (rev 5349)
@@ -35,6 +35,9 @@
 	if (strstr(envptr, "cygwin\\bin") != NULL) {
 		goto found_path;
 	}
+	if (strstr(envptr, "cygwin64\\bin") != NULL) {
+		goto found_path;
+	}
 
 	_snprintf(file, MAX_PATH, "%s\\bin", CygwinDirectory);
 	if (GetFileAttributes(file) == -1) { // open error

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/doc/en/html/about/history.html	2013-08-15 14:49:30 UTC (rev 5349)
@@ -64,10 +64,11 @@
     </ul> 
   </li>
 
-  <!-- li>Misc
+  <li>Misc
     <ul>
+      <li>upgraded CygTerm+ to <a href="#cygterm_1.07_24">1.07_24</a></li>
     </ul>
-  </li -->
+  </li>
 </ul>
 
 
@@ -2914,6 +2915,11 @@
 
 <h2><a name="cygterm">CygTerm+</a></h2>
 
+<h3><a name="cygterm_1.07_24">v1.07_24 2013/08/15 (by maya)</a></h3>
+<ul class="history">
+      <li>Support for 64bit Cygwin.</li>
+</ul>
+
 <h3><a name="cygterm_1.07_23">v1.07_23 2011/04/18 (by doda)</a></h3>
 <ul class="history">
       <li>added the error message when the CygTerm can not move the directory specified by -d option.</li>

Modified: trunk/doc/en/html/usage/cygwin.html
===================================================================
--- trunk/doc/en/html/usage/cygwin.html	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/doc/en/html/usage/cygwin.html	2013-08-15 14:49:30 UTC (rev 5349)
@@ -12,13 +12,16 @@
 <h1>Cygwin connection</h1>
 
 <p>
-  Tera Term can connect to local Cygwin environment.<br>
-  <A HREF="http://www.cygwin.com/">Cygwin</A> is a Linux-like environment for Windows.<br>
-  Cygwin is open source software.<br>
-  [NOTE] Cygwin 1.5.x doesn't seem support Windows 7. Please use Cygwin 1.7.x on Windows 7.
+Tera Term can connect to local Cygwin environment.<br>
+<A HREF="http://www.cygwin.com/">Cygwin</A> is a Linux-like environment for Windows.<br>
+Cygwin is open source software.
 </p>
 
 <p>
+[NOTE] Cygwin 1.5.x doesn't seem support Windows 7. Please use Cygwin 1.7.x on Windows 7.
+</p>
+
+<p>
 This package makes it possible to connect local Cygwin by using built in Cygterm.<br>
 Select "Cygwin connection" from "File" menu or press "Alt + G " to connect to Cygwin.<br>
 Prior connecting to Cygwin, Cygwin installation path has to be entered into Tera Term ini file.<br>
@@ -29,16 +32,25 @@
 ----------------------------
 ; Cygwin install path
 CygwinDirectory = c:\cygwin
+; 64bit Cygwin
+; CygwinDirectory=c:\cygwin64
 ----------------------------
 </pre>
 
 <p>
 [NOTE]<br>
 If cygterm fails to start you might need to download its source and recompile it.<br>
-Latest source code is available at <a href="http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/ttssh2/cygterm/">ViewCVS of sourcefoge.jp</a>.
+Latest source code is included as cygterm+.tar.gz.
 </p>
 
+<!--
 <p>
+[NOTE] About 64bit Cygwin<br />
+64bit Cygwin \x82ŗ\x98\x97p\x82\xB7\x82\xE9\x82ɂ͍ăR\x83\x93\x83p\x83C\x83\x8B\x82\xAA\x95K\x97v\x82Ȃ悤\x82ł\xB7\x81B\x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB7\x82\xE9\x82ɂ\xCD Cygwin \x82\xC9 mingw64-x86_64-gcc-core \x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+</p>
+-->
+
+<p>
 Be careful not to save [Setup] [Save setup] in the situation that it was started by cygterm.exe.<br>
 Otherwise telnet port number of TCP/IP is saved but 23 you will be confused by connection failure when you normally run Tera Term to do telnet.  In that case it will be recovered by saving the setting with specifying TCP/IP Port# 23.
 </p>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/doc/ja/html/about/history.html	2013-08-15 14:49:30 UTC (rev 5349)
@@ -64,10 +64,11 @@
     </ul>
   </li>
 
-  <!-- li>\x82\xBB\x82̑\xBC
+  <li>\x82\xBB\x82̑\xBC
     <ul>
+      <li><a href="#cygterm_1.07_24">CygTerm+ 1.07_24</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
     </ul>
-  </li -->
+  </li>
 </ul>
 
 
@@ -2915,6 +2916,11 @@
 
 <h2><a name="cygterm">CygTerm+</a></h2>
 
+<h3><a name="cygterm_1.07_24">v1.07_24 2013/08/15 (by maya)</a></h3>
+<ul class="history">
+      <li>64bit Cygwin \x82ł\xE0\x93\xAE\x8D삷\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+</ul>
+
 <h3><a name="cygterm_1.07_23">v1.07_23 2011/04/18 (by doda)</a></h3>
 <ul class="history">
       <li>-d \x83I\x83v\x83V\x83\x87\x83\x93\x82Ŏw\x92肳\x82ꂽ\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82ւ̈ړ\xAE\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8E\x9E\x81A\x83G\x83\x89\x81[\x83\x81\x83b\x83Z\x81[\x83W\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>

Modified: trunk/doc/ja/html/usage/cygwin.html
===================================================================
--- trunk/doc/ja/html/usage/cygwin.html	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/doc/ja/html/usage/cygwin.html	2013-08-15 14:49:30 UTC (rev 5349)
@@ -14,11 +14,14 @@
 <p>
 \x83\x8D\x81[\x83J\x83\x8B\x82\xCC Cygwin \x8A‹\xAB\x82\xC9 Tera Term \x82\xA9\x82\xE7\x90ڑ\xB1\x82ł\xAB\x82܂\xB7\x81B<br>
 <a href="http://www.cygwin.com/">Cygwin</A> \x82́AWindows \x8F\xE3\x82\xC5 Linux \x82̂悤\x82Ȋ‹\xAB\x82\xF0\x92񋟂\xB7\x82\xE9\x83\\x83t\x83g\x83E\x83F\x83A\x82ł\xB7\x81B<br>
-Cygwin \x82́A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x83\\x83t\x83g\x83E\x83F\x83A\x82ł\xB7\x81B<br>
-\x81\xA6\x92\x8D\x88ӁF Cygwin 1.5.x \x82\xCD Windows 7 \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82ł\xB7\x81BWindows 7 \x82ł\xCD Cygwin 1.7.x \x82𗘗p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+Cygwin \x82́A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x83\\x83t\x83g\x83E\x83F\x83A\x82ł\xB7\x81B
 </p>
 
 <p>
+\x81\xA6\x92\x8D\x88ӁFCygwin 1.5.x \x82\xCD Windows 7 \x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82Ȃ\xA2\x82悤\x82ł\xB7\x81BWindows 7 \x82ł\xCD Cygwin 1.7.x \x82𗘗p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<p>
 \x83\x8D\x81[\x83J\x83\x8B\x82\xCCCygwin\x82֐ڑ\xB1\x82\xB7\x82邱\x82Ƃ\xAA\x82ł\xAB\x82܂\xB7\x81B\x93\xE0\x95\x94\x82\xC5Cygterm\x82𗘗p\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B<br>
 File\x83\x81\x83j\x83\x85\x81[\x82\xA9\x82\xE7\x81uCygwin connection\x81v\x82\xF0\x91I\x91\xF0\x82\xB7\x82\xE9\x81A\x82\xE0\x82\xB5\x82\xAD\x82\xCDAlt+G\x82\xF0\x89\x9F\x89\xBA\x82\xB7\x82\xE9\x82ƁACygwin\x82֐ڑ\xB1\x82\xB5\x82܂\xB7\x81B<br>
 \x82\xA0\x82炩\x82\xB6\x82߁Ateraterm.ini\x83t\x83@\x83C\x83\x8B\x82\xCC[Tera Term]\x83Z\x83N\x83V\x83\x87\x83\x93\x82ɁACygwin\x82̃C\x83\x93\x83X\x83g\x81[\x83\x8B\x83p\x83X\x82\xF0\x90ݒ肵\x82Ă\xA8\x82\xAD\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B<br>
@@ -29,16 +32,23 @@
 ----------------------------
 ; Cygwin install path
 CygwinDirectory = c:\cygwin
+; 64bit Cygwin
+; CygwinDirectory=c:\cygwin64
 ----------------------------
 </pre>
 
 <p>
 \x81\xA6\x92\x8D\x88ӁF<br>
 cygterm\x82\xAA\x82\xA4\x82܂\xAD\x8BN\x93\xAE\x82\xB5\x82Ȃ\xA2\x8Fꍇ\x82́Acygterm\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>
-\x8DŐV\x82̃\\x81[\x83X\x83R\x81[\x83h\x82\xCD <a href="http://cvs.sourceforge.jp/cgi-bin/viewcvs.cgi/ttssh2/cygterm/">sourceforge.jp \x82\xCC ViewCVS</a> \x82\xA9\x82\xE7\x83_\x83E\x83\x93\x83\x8D\x81[\x83h\x82ł\xAB\x82܂\xB7\x81B
+\x8DŐV\x82̃\\x81[\x83X\x83R\x81[\x83h\x82\xCD cygterm+.tar.gz \x82Ƃ\xB5\x82ē\xAF\x8D\xAB\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
 </p>
 
 <p>
+\x81\xA6\x92\x8D\x88ӁF64bit Cygwin \x82ɂ‚\xA2\x82\xC4<br />
+64bit Cygwin \x82ŗ\x98\x97p\x82\xB7\x82\xE9\x82ɂ͍ăR\x83\x93\x83p\x83C\x83\x8B\x82\xAA\x95K\x97v\x82Ȃ悤\x82ł\xB7\x81B\x83R\x83\x93\x83p\x83C\x83\x8B\x82\xB7\x82\xE9\x82ɂ\xCD Cygwin \x82\xC9 mingw64-x86_64-gcc-core \x82\xF0\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB7\x82\xE9\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+</p>
+
+<p>
 cygterm.exe \x82\xA9\x82\xE7\x8BN\x93\xAE\x82\xB3\x82ꂽ\x8F\xF3\x91ԂŐݒ\xE8\x95ۑ\xB6 [Setup][Save setup] \x82\xF0\x8Ds\x82\xED\x82Ȃ\xA2\x82悤\x92\x8D\x88ӂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81BTCP/IP\x90ݒ\xE8\x82\xCC Telnet\x83|\x81[\x83g\x94ԍ\x86\x82\xAA 23 \x88ȊO\x82ŕۑ\xB6\x82\xB3\x82\xEA\x81A\x92ʏ\xED\x82\xCC Telnet\x96ړI\x82̎\xC0\x8Ds\x8E\x9E\x82ɐڑ\xB1\x82ł\xAB\x82\xB8\x81A\x8DQ\x82Ă邱\x82ƂɂȂ\xC1\x82Ă\xB5\x82܂\xA2\x82܂\xB7\x81B<br>
 TCP/IP Port# \x82\xC9 23 \x82\xF0\x8Ew\x92肵\x82Đݒ\xE8\x95ۑ\xB6\x82\xB5\x92\xBC\x82\xB9\x82Ό\xB3\x82ɖ߂\xE8\x82܂\xB7\x81B
 </p>

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2013-08-07 06:21:54 UTC (rev 5348)
+++ trunk/teraterm/teraterm/vtwin.cpp	2013-08-15 14:49:30 UTC (rev 5349)
@@ -3700,6 +3700,9 @@
 	if (strstr(envptr, "cygwin\\bin") != NULL) {
 		goto found_path;
 	}
+	if (strstr(envptr, "cygwin64\\bin") != NULL) {
+		goto found_path;
+	}
 
 	_snprintf_s(file, sizeof(file), _TRUNCATE, "%s\\bin", ts.CygwinDirectory);
 	if (GetFileAttributes(file) == -1) { // open error

• 前の記事 [Ttssh2-commit] [5348] UseNormalBGColor が on の時、OSC 11 の後の OSC 111 で各属性色の背景色がリセットされない問題を修正。
• 次の記事 [Ttssh2-commit] [5350] 英訳
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]