Add some useful messages to build output and remove some confusing

output.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4037 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-04-16 18:08:32 +00:00
parent 3b8c9c0f0e
commit ed2de0ed08

View File

@ -13,6 +13,7 @@ if (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
REGEX "^[^?].*$"
)
if (__svn_changes)
message (WARNING "Source tree based on revision ${MY_WC_REVISION} appears to have local changes")
set (MY_WC_REVISION "${MY_WC_REVISION}-dirty")
foreach (__svn_change ${__svn_changes})
message (STATUS "${__svn_change}")
@ -32,11 +33,13 @@ else (Subversion_FOUND AND EXISTS "${SOURCE_DIR}/.svn")
execute_process (COMMAND ${GIT_EXECUTABLE} --git-dir=${SOURCE_DIR}/.git --work-tree=${SOURCE_DIR} svn dcommit --dry-run
RESULT_VARIABLE __git_svn_status
OUTPUT_FILE "${OUTPUT_DIR}/svn_status.txt"
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
file (STRINGS "${OUTPUT_DIR}/svn_status.txt" __svn_changes
REGEX "^diff-tree"
)
if ((NOT ${__git_svn_status} EQUAL 0) OR __svn_changes)
message (WARNING "Source tree based on revision ${MY_WC_REVISION} appears to have local changes")
set (MY_WC_REVISION "${MY_WC_REVISION}-dirty")
endif ()
# write a file with the SVNVERSION define