OSDN -- Develop and Download Open Source Software

[Ttssh2-commit] [5648] 64bit Cygwin 対応強化

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2014年 8月 26日 (火) 17:00:15 JST 

Revision: 5648
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5648
Author:   maya
Date:     2014-08-26 17:00:13 +0900 (Tue, 26 Aug 2014)
Log Message:
-----------
64bit Cygwin 対応強化
  cygwin64 でコンパイルしたバイナリをインストーラに同梱するようにした
    cygwin64 バイナリをソース管理に追加
    32bit版は今まで通り Windows XP・Cygwin 1.5 でコンパイルする
  cygwin64 でのコンパイル用に Makefile を調整
  cygwin64 でのコンパイルに必要なパッケージについて説明を追加

Modified Paths:
--------------
    trunk/cygterm/Makefile
    trunk/doc/en/html/usage/cygwin.html
    trunk/doc/ja/html/usage/cygwin.html
    trunk/installer/teraterm.iss

Added Paths:
-----------
    trunk/cygterm/cygterm+-x86_64/
    trunk/cygterm/cygterm+-x86_64/cyglaunch.exe
    trunk/cygterm/cygterm+-x86_64/cygterm.exe

-------------- next part --------------
Modified: trunk/cygterm/Makefile
===================================================================
--- trunk/cygterm/Makefile	2014-08-18 10:04:00 UTC (rev 5647)
+++ trunk/cygterm/Makefile	2014-08-26 08:00:13 UTC (rev 5648)
@@ -21,7 +21,8 @@
 
 all : $(EXE) $(LAUNCH) $(ARCHIVE)
 
-$(EXE) : $(SRC) $(RES)
+$(EXE) : $(SRC) $(ICO) $(RC)
+	windres -O coff -o $(RES) $(RC)
   ifeq (0, $(shell nm /usr/lib/crt0.o | grep -c WinMainCRTStartup))
 	$(CC) $(CFLAGS) $(LDFLAGS) -DNO_WIN_MAIN -o $(EXE) $(SRC) $(RES)
   else
@@ -29,27 +30,30 @@
   endif
 	strip $(EXE)
 
-$(LAUNCH) : $(LAUNCH_SRC) $(RES)
+$(LAUNCH) : $(LAUNCH_SRC) $(ICO) $(RC)
 	@# 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)
+	@# i686-pc-mingw32-gcc     mingw-gcc-core
+	@# i686-w64-mingw32-gcc    mingw64-i686-gcc-core
+	@# x86_64-w64-mingw32-gcc  mingw64-x86_64-gcc-core
+  ifeq (i686, $(shell uname -m))
+	windres -O coff -o $(RES) $(RC)
+	( i686-pc-mingw32-gcc $(CFLAGS) $(LDFLAGS) -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
+	( i686-w64-mingw32-gcc $(CFLAGS) $(LDFLAGS) -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
 	( $(CC) $(CFLAGS) $(LDFLAGS) -mno-cygwin -o $(LAUNCH) $(LAUNCH_SRC) $(RES) ) || \
-	( gcc-3 $(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) ) 
+	( gcc-3 $(CFLAGS) $(LDFLAGS) -mno-cygwin -o $(LAUNCH) $(LAUNCH_SRC) $(RES) )
 	strip $(LAUNCH)
+  else
+	x86_64-w64-mingw32-windres -O coff -o $(RES) $(RC)
+	x86_64-w64-mingw32-gcc $(CFLAGS) $(LDFLAGS) -o $(LAUNCH) $(LAUNCH_SRC) $(RES)
+	x86_64-w64-mingw32-strip $(LAUNCH)
+  endif
 
 $(RC):
 	echo 'icon ICON $(ICO)' > $(RC)
 
-$(RES): $(ICO) $(RC)
-	windres -O coff -o $(RES) $(RC)
-
 clean :
 	rm -f $(EXE) $(RC) $(RES) $(LAUNCH) $(ARCHIVE)
 

Added: trunk/cygterm/cygterm+-x86_64/cyglaunch.exe
===================================================================
(Binary files differ)


Property changes on: trunk/cygterm/cygterm+-x86_64/cyglaunch.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/cygterm/cygterm+-x86_64/cygterm.exe
===================================================================
(Binary files differ)


Property changes on: trunk/cygterm/cygterm+-x86_64/cygterm.exe
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/doc/en/html/usage/cygwin.html
===================================================================
--- trunk/doc/en/html/usage/cygwin.html	2014-08-18 10:04:00 UTC (rev 5647)
+++ trunk/doc/en/html/usage/cygwin.html	2014-08-26 08:00:13 UTC (rev 5648)
@@ -40,13 +40,25 @@
 <p>
 [NOTE]<br>
 If cygterm fails to start you might need to download its source and recompile it.<br>
+<!--64bit Cygwin \x82ŗ\x98\x97p\x82\xB7\x82\xE9\x82ɂ́Acygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82̎\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82ɏ㏑\x82\xAB\x82\xB7\x82邩\x81Acygterm\x82\xF0\x83r\x83\x8B\x83h\x82\xB5\x92\xBC\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B<br>-->
 Latest source code is included as cygterm+.tar.gz.
 </p>
 
-<p>
-[NOTE] About 64bit Cygwin<br />
-Your cygterm needs to rebuild on the 64bit Cygwin environment. The re-compiling requires the mingw64-x86_64-gcc-core package into your cygwin environment.
-</p>
+<table border="1">
+  <!--caption>\x83r\x83\x8B\x83h\x82ɕK\x97v\x82ȃp\x83b\x83P\x81[\x83W</caption-->
+  <tr>
+    <th>32bit Cygwin</th>
+    <th>64bit Cygwin</th>
+  </tr>
+  <tr>
+    <td>Devel/gcc-g++<br>
+        Devel/make<br>
+        Devel/mingw-gcc-core</td>
+    <td>Devel/gcc-g++<br>
+        Devel/make<br>
+        Devel/mingw64-x86_64-gcc-core</td>
+  </tr>
+</table>
 
 <p>
 Be careful not to save [Setup] [Save setup] in the situation that it was started by cygterm.exe.<br>

Modified: trunk/doc/ja/html/usage/cygwin.html
===================================================================
--- trunk/doc/ja/html/usage/cygwin.html	2014-08-18 10:04:00 UTC (rev 5647)
+++ trunk/doc/ja/html/usage/cygwin.html	2014-08-26 08:00:13 UTC (rev 5648)
@@ -40,13 +40,25 @@
 <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>
+64bit Cygwin \x82ŗ\x98\x97p\x82\xB7\x82\xE9\x82ɂ́Acygterm+-x86_64 \x83t\x83H\x83\x8B\x83_\x93\xE0\x82̎\xC0\x8Ds\x83t\x83@\x83C\x83\x8B\x82\xF0 Tera Term \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x83t\x83H\x83\x8B\x83_\x82ɏ㏑\x82\xAB\x82\xB7\x82邩\x81Acygterm\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 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ɂ́Acygterm\x82̍ăR\x83\x93\x83p\x83C\x83\x8B\x82\xAA\x95K\x97v\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>
+<table border="1">
+  <caption>\x83r\x83\x8B\x83h\x82ɕK\x97v\x82ȃp\x83b\x83P\x81[\x83W</caption>
+  <tr>
+    <th>32bit Cygwin</th>
+    <th>64bit Cygwin</th>
+  </tr>
+  <tr>
+    <td>Devel/gcc-g++<br>
+        Devel/make<br>
+        Devel/mingw-gcc-core</td>
+    <td>Devel/gcc-g++<br>
+        Devel/make<br>
+        Devel/mingw64-x86_64-gcc-core</td>
+  </tr>
+</table>
 
 <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>

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2014-08-18 10:04:00 UTC (rev 5647)
+++ trunk/installer/teraterm.iss	2014-08-26 08:00:13 UTC (rev 5648)
@@ -100,6 +100,8 @@
 Source: ..\cygterm\cygterm.cfg; DestDir: {app}; Components: cygterm; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify
 Source: ..\cygterm\cyglaunch.exe; DestDir: {app}; Components: cygterm
 Source: ..\cygterm\cygterm+.tar.gz; DestDir: {app}; Components: cygterm
+Source: ..\cygterm\cygterm+-x86_64\cygterm.exe; DestDir: {app}\cygterm+-x86_64; Components: cygterm
+Source: ..\cygterm\cygterm+-x86_64\cyglaunch.exe; DestDir: {app}\cygterm+-x86_64; Components: cygterm
 Source: ..\libs\logmett\Setup_LogMeTT_2_10_2.exe; DestDir: {tmp}; Components: LogMeTT; Flags: deleteafterinstall
 Source: ..\libs\logmett\Setup_TTLEditor_1_5_1.exe; DestDir: {tmp}; Components: TTLEdit; Flags: deleteafterinstall
 Source: ..\ttpmenu\Release\ttpmenu.exe; DestDir: {app}; Components: TeraTerm_Menu; Flags: ignoreversion


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