[8571] msys2 の svn でエラーが出ていたので修正 (Ttssh2-commit) - Tera Term

Revision: 8571
          https://osdn.net/projects/ttssh2/scm/svn/commits/8571
Author:   zmatsuo
Date:     2020-03-04 00:55:02 +0900 (Wed, 04 Mar 2020)
Log Message:
-----------
msys2 の svn でエラーが出ていたので修正

- パスの変換 "c:/..." -> "/c/..."
- スクリプトの修正

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/ci_scripts/appveyor.md
    trunk/ci_scripts/build_appveyor.bat
    trunk/ci_scripts/build_local_appveyor_mingw_clang_x64.bat
    trunk/ci_scripts/build_local_appveyor_mingw_gcc_x64.bat

-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================

--- trunk/CMakeLists.txt	2020-03-01 15:44:31 UTC (rev 8570)
+++ trunk/CMakeLists.txt	2020-03-03 15:55:02 UTC (rev 8571)
@@ -93,7 +93,14 @@
   # svn
   find_package(Subversion)
   if(SUBVERSION_FOUND)
-    Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
+    if("CMAKE_COMMAND=${CMAKE_COMMAND}" MATCHES "msys")
+      # svn on msys
+      file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} MSYS_CMAKE_SOURCE_DIR)
+      string(REGEX REPLACE "^([a-zA-Z]):/" "/\\1/" MSYS_CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
+      Subversion_WC_INFO(${MSYS_CMAKE_SOURCE_DIR} TT)
+    else()
+      Subversion_WC_INFO(${CMAKE_SOURCE_DIR} TT)
+    endif()
     set(SVNVERSION "${TT_WC_REVISION}")
   endif()
 else()

Modified: trunk/ci_scripts/appveyor.md
===================================================================
--- trunk/ci_scripts/appveyor.md	2020-03-01 15:44:31 UTC (rev 8570)
+++ trunk/ci_scripts/appveyor.md	2020-03-03 15:55:02 UTC (rev 8571)
@@ -32,3 +32,4 @@
 ## build_local_appveyor_*
 
 - ローカルで build_appveyor.bat をテストするための bat ファイル
+- Visual Studio と msys2 を使用

Modified: trunk/ci_scripts/build_appveyor.bat
===================================================================
--- trunk/ci_scripts/build_appveyor.bat	2020-03-01 15:44:31 UTC (rev 8570)
+++ trunk/ci_scripts/build_appveyor.bat	2020-03-03 15:55:02 UTC (rev 8571)
@@ -3,19 +3,11 @@
   call getcmake.bat nopause
   cd ..
 )
-if "%COMPILER%" == "mingw" (
-  if "%MINGW_X64%" == "1" (
-    set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin
-    pacman -S --noconfirm --needed mingw64/mingw-w64-x86_64-cmake
-    if "%MINGW_CC%" == "clang" (
-      pacman -S --noconfirm --needed mingw64/mingw-w64-x86_64-clang
-    )
-  ) else (
-    set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin
-    pacman -S --noconfirm --needed mingw32/mingw-w64-i686-cmake
-    if "%MINGW_CC%" == "clang" (
-      pacman -S --noconfirm --needed mingw32/mingw-w64-i686-clang
-    )
+if "%COMPILER%" == "mingw"  (
+  set PATH=C:\msys64\mingw32\bin;C:\msys64\usr\bin
+  pacman -S --noconfirm --needed mingw32/mingw-w64-i686-cmake
+  if "%MINGW_CC%" == "clang" (
+    pacman -S --noconfirm --needed mingw32/mingw-w64-i686-clang
   )
   set CC=%MINGW_CC%
   set CXX=%MINGW_CXX%
@@ -22,6 +14,17 @@
   set CMAKE_OPTION_BUILD=-- -s -j
   set CMAKE_OPTION_GENERATE=%CMAKE_OPTION_GENERATE% -DCMAKE_BUILD_TYPE=Release
 )
+if "%COMPILER%" == "mingw_x64"  (
+  set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin
+  pacman -S --noconfirm --needed mingw64/mingw-w64-x86_64-cmake
+  if "%MINGW_CC%" == "clang" (
+    pacman -S --noconfirm --needed mingw64/mingw-w64-x86_64-clang
+  )
+  set CC=%MINGW_CC%
+  set CXX=%MINGW_CXX%
+  set CMAKE_OPTION_BUILD=-- -s -j
+  set CMAKE_OPTION_GENERATE=%CMAKE_OPTION_GENERATE% -DCMAKE_BUILD_TYPE=Release
+)
 cd libs
 if not exist openssl11_%COMPILER% (
   "%CMAKE_COMMAND%" -DCMAKE_GENERATOR="%GENERATOR%" %CMAKE_OPTION_LIBS% -P buildall.cmake

Modified: trunk/ci_scripts/build_local_appveyor_mingw_clang_x64.bat
===================================================================
--- trunk/ci_scripts/build_local_appveyor_mingw_clang_x64.bat	2020-03-01 15:44:31 UTC (rev 8570)
+++ trunk/ci_scripts/build_local_appveyor_mingw_clang_x64.bat	2020-03-03 15:55:02 UTC (rev 8571)
@@ -1,5 +1,5 @@
 setlocal
-set COMPILER=mingw
+set COMPILER=mingw_x64
 set GENERATOR=Unix Makefiles
 set CMAKE_COMMAND=cmake
 set CMAKE_OPTION_LIBS=
@@ -7,7 +7,6 @@
 set CMAKE_OPTION_BUILD=
 set MINGW_CC=clang
 set MINGW_CXX=clang++
-set MINGW_X64=1
 set BUILD_DIR=build_%COMPILER%_msys2_clang_x64
 set REV=9999
 set DATE_TIME=20200228

Modified: trunk/ci_scripts/build_local_appveyor_mingw_gcc_x64.bat
===================================================================
--- trunk/ci_scripts/build_local_appveyor_mingw_gcc_x64.bat	2020-03-01 15:44:31 UTC (rev 8570)
+++ trunk/ci_scripts/build_local_appveyor_mingw_gcc_x64.bat	2020-03-03 15:55:02 UTC (rev 8571)
@@ -1,5 +1,5 @@
 setlocal
-set COMPILER=mingw
+set COMPILER=mingw_x64
 set GENERATOR=Unix Makefiles
 set CMAKE_COMMAND=cmake
 set CMAKE_OPTION_LIBS=
@@ -7,7 +7,6 @@
 set CMAKE_OPTION_BUILD=
 set MINGW_CC=gcc
 set MINGW_CXX=g++
-set MINGW_X64=1
 set BUILD_DIR=build_%COMPILER%_msys2_gcc_x64
 set REV=9999
 set DATE_TIME=20200228


Tera Term

[Ttssh2-commit] [8571] msys2 の svn でエラーが出ていたので修正