Tera TermRevision: 9795
https://osdn.net/projects/ttssh2/scm/svn/commits/9795
Author: zmatsuo
Date: 2022-03-09 00:07:04 +0900 (Wed, 09 Mar 2022)
Log Message:
-----------
ビルド用batで32/64bit版cygtermをビルドできるよう変更
- アーカイブbat、インストーラーも修正
- cygwin/cygterm/Makefile
- clean ターゲットを追加
Modified Paths:
--------------
trunk/cygwin/cygterm/Makefile
trunk/installer/build.bat
trunk/installer/makearchive.bat
trunk/installer/teraterm.iss
-------------- next part --------------
Modified: trunk/cygwin/cygterm/Makefile
===================================================================
--- trunk/cygwin/cygterm/Makefile 2022-03-08 15:06:52 UTC (rev 9794)
+++ trunk/cygwin/cygterm/Makefile 2022-03-08 15:07:04 UTC (rev 9795)
@@ -55,7 +55,9 @@
CFG = cygterm.cfg
ARCHIVE = cygterm+.tar.gz
-.PHONY: all clean install uninstall cygterm_x86_64 cygterm_i686
+.PHONY: all clean install uninstall archive
+.PHONY: cygterm+-x86_64 cygterm+-i686
+.PHONY: cygterm+-x86_64-clean cygterm+-i686-clean
all : $(EXE)
@@ -78,6 +80,7 @@
rm -f $(EXE) $(SRC_RC) $(RES) $(ARCHIVE)
rm -f $(DEP)
rm -f $(OBJ) *.o *.obj
+ rm -f $(ARCHIVE)
ifneq (,$(BINARY_DIR))
rm -rf $(BINARY_DIR)
endif
@@ -106,9 +109,15 @@
cygterm+-x86_64:
make CC=x86_64-pc-cygwin-gcc CXX=x86_64-pc-cygwin-g++ RC=x86_64-pc-cygwin-windres EXE_BASE=cygterm.exe BINARY_DIR=cygterm+-x86_64 all
+cygterm+-x86_64-clean:
+ make BINARY_DIR=cygterm+-x86_64 clean
+
cygterm+-i686:
make CC=i686-pc-cygwin-gcc CXX=i686-pc-cygwin-g++ RC=i686-pc-cygwin-windres EXE_BASE=cygterm.exe BINARY_DIR=cygterm+-i686 all
+cygterm+-i686-clean:
+ make BINARY_DIR=cygterm+-i686 clean
+
$(BINARY_DIR)/%.o: %.cpp
@mkdir -p $(BINARY_DIR)
$(CXX) $(CXXFLAGS) -c $< -o $@
Modified: trunk/installer/build.bat
===================================================================
--- trunk/installer/build.bat 2022-03-08 15:06:52 UTC (rev 9794)
+++ trunk/installer/build.bat 2022-03-08 15:07:04 UTC (rev 9795)
@@ -216,8 +216,14 @@
rem cygterm \x82\xF0\x83R\x83\x93\x83p\x83C\x83\x8B
pushd ..\cygwin\cygterm
-if "%BUILD%" == "rebuild" make clean
-make
+if "%BUILD%" == "rebuild" (
+ make clean
+ make cygterm+-x86_64-clean
+ make cygterm+-i686-clean
+)
+make cygterm+-x86_64 -j
+make cygterm+-i686 -j
+make archive
popd
rem lng \x83t\x83@\x83C\x83\x8B\x82\xF0\x8D쐬
Modified: trunk/installer/makearchive.bat
===================================================================
--- trunk/installer/makearchive.bat 2022-03-08 15:06:52 UTC (rev 9794)
+++ trunk/installer/makearchive.bat 2022-03-08 15:07:04 UTC (rev 9795)
@@ -36,14 +36,13 @@
copy /y ..\teraterm\release\*.exe %dst%
copy /y ..\teraterm\release\*.dll %dst%
copy /y ..\ttssh2\ttxssh\Release\ttxssh.dll %dst%
-copy /y ..\cygwin\cygterm\cygterm.exe %dst%
copy /y ..\cygwin\cygterm\cygterm.cfg %dst%
copy /y "..\cygwin\cygterm\cygterm+.tar.gz" %dst%
-copy /y "..\cygwin\cygterm\cygterm.exe" %dst%
mkdir "%dst%\cygterm+-i686"
-copy /y "..\cygwin\cygterm\cygterm.exe" "%dst%\cygterm+-i686"
+copy /y "..\cygwin\cygterm\cygterm+-i686\cygterm.exe" "%dst%\cygterm+-i686"
mkdir "%dst%\cygterm+-x86_64"
copy /y "..\cygwin\cygterm\cygterm+-x86_64\cygterm.exe" "%dst%\cygterm+-x86_64"
+copy /y "..\cygwin\cygterm\cygterm+-x86_64\cygterm.exe" %dst%
copy /y ..\cygwin\Release\cyglaunch.exe %dst%
copy /y ..\ttpmenu\Release\ttpmenu.exe %dst%
copy /y ..\TTProxy\Release\TTXProxy.dll %dst%
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss 2022-03-08 15:06:52 UTC (rev 9794)
+++ trunk/installer/teraterm.iss 2022-03-08 15:07:04 UTC (rev 9795)
@@ -112,7 +112,7 @@
Source: release\lang_utf16le\Traditional Chinese.lng; DestDir: {app}\lang_utf16le; Components: TeraTerm; Attribs: readonly; Flags: uninsremovereadonly overwritereadonly
Source: ..\ttssh2\ttxssh\Release\ttxssh.dll; DestDir: {app}; Components: TTSSH; Flags: ignoreversion
Source: release\ssh_known_hosts; DestDir: {app}; Components: TTSSH; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify
-Source: ..\cygwin\cygterm\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
+Source: ..\cygwin\cygterm\cygterm+-i686\cygterm.exe; DestDir: {app}\cygterm+-i686; Components: cygterm
Source: ..\cygwin\cygterm\cygterm.cfg; DestDir: {app}; Components: cygterm; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify
Source: ..\cygwin\cygterm\cygterm+.tar.gz; DestDir: {app}; Components: cygterm
Source: ..\cygwin\cygterm\cygterm+-x86_64\cygterm.exe; DestDir: {app}\cygterm+-x86_64; Components: cygterm