[Ttssh2-commit] [7532] git-svn、putty.issがない場合に対応するようにした

scmno****@osdn***** scmno****@osdn*****
2019年 3月 29日 (金) 22:58:10 JST


Revision: 7532
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7532
Author:   zmatsuo
Date:     2019-03-29 22:58:09 +0900 (Fri, 29 Mar 2019)
Log Message:
-----------
git-svn、putty.issがない場合に対応するようにした

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/ttssh2/ttxssh/CMakeLists.txt

-------------- next part --------------
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2019-03-29 13:34:43 UTC (rev 7531)
+++ trunk/CMakeLists.txt	2019-03-29 13:58:09 UTC (rev 7532)
@@ -57,8 +57,14 @@
   if(Git_FOUND)
     execute_process(
       COMMAND ${GIT_EXECUTABLE} svn log --oneline -1
-      OUTPUT_VARIABLE ov)
-    string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+      RESULT_VARIABLE rv
+      OUTPUT_VARIABLE ov
+      ERROR_QUIET)
+    if(${rv})
+      message("git svn error? please check git svn")
+    else()
+      string(REGEX MATCH "[0-9]+" SVNVERSION ${ov})
+    endif()
   endif()
 elseif(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
   # svn

Modified: trunk/ttssh2/ttxssh/CMakeLists.txt
===================================================================
--- trunk/ttssh2/ttxssh/CMakeLists.txt	2019-03-29 13:34:43 UTC (rev 7531)
+++ trunk/ttssh2/ttxssh/CMakeLists.txt	2019-03-29 13:58:09 UTC (rev 7532)
@@ -134,6 +134,11 @@
 
 ### create puttyversion.h
 
+set(PUTTY_ISS "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss")
+if(NOT EXISTS ${PUTTY_ISS})
+  message(FATAL_ERROR "${PUTTY_ISS} not found")
+endif()
+
 file(READ "${CMAKE_SOURCE_DIR}/libs/putty/windows/putty.iss" iis)
 
 string(REGEX MATCH "VersionInfoTextVersion=([^\n]+)\n" _ ${iis})


Ttssh2-commit メーリングリストの案内