[9779] cygtermの出力フォルダの変更に対応 (ttssh2-commit) - Tera Term

Revision: 9779
          https://osdn.net/projects/ttssh2/scm/svn/commits/9779
Author:   zmatsuo
Date:     2022-02-27 01:59:53 +0900 (Sun, 27 Feb 2022)
Log Message:
-----------
cygtermの出力フォルダの変更に対応

Modified Paths:
--------------
    branches/cygterm/cygwin/cygterm/Makefile
    branches/cygterm/installer/build.bat
    branches/cygterm/installer/makearchive.bat
    branches/cygterm/installer/teraterm.iss

-------------- next part --------------
Modified: branches/cygterm/cygwin/cygterm/Makefile
===================================================================

--- branches/cygterm/cygwin/cygterm/Makefile	2022-02-24 15:55:01 UTC (rev 9778)
+++ branches/cygterm/cygwin/cygterm/Makefile	2022-02-26 16:59:53 UTC (rev 9779)
@@ -65,7 +65,9 @@
 endif
 endif
 
-.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)
 
@@ -88,6 +90,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
@@ -120,9 +123,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: branches/cygterm/installer/build.bat
===================================================================
--- branches/cygterm/installer/build.bat	2022-02-24 15:55:01 UTC (rev 9778)
+++ branches/cygterm/installer/build.bat	2022-02-26 16:59:53 UTC (rev 9779)
@@ -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: branches/cygterm/installer/makearchive.bat
===================================================================
--- branches/cygterm/installer/makearchive.bat	2022-02-24 15:55:01 UTC (rev 9778)
+++ branches/cygterm/installer/makearchive.bat	2022-02-26 16:59:53 UTC (rev 9779)
@@ -44,14 +44,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: branches/cygterm/installer/teraterm.iss
===================================================================
--- branches/cygterm/installer/teraterm.iss	2022-02-24 15:55:01 UTC (rev 9778)
+++ branches/cygterm/installer/teraterm.iss	2022-02-26 16:59:53 UTC (rev 9779)
@@ -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


Tera Term

[ttssh2-commit] [9779] cygtermの出力フォルダの変更に対応