Merged master 8748
This commit is contained in:
Jordan Sherer
@@ -1,32 +0,0 @@
|
||||
=== Help with Setup
|
||||
|
||||
The best source of help in setting up your station or configuring
|
||||
_WSJT-X_ is the {wsjt_yahoo_group} at email address
|
||||
wsjtgroup@yahoogroups.com. The chances are good that someone with
|
||||
similar interests and equipment has already solved your problem and
|
||||
will be happy to help. To post messages here you will need to join
|
||||
the group.
|
||||
|
||||
=== Bug Reports
|
||||
|
||||
One of your responsibilities as a _WSJT-X_ user is to help the
|
||||
volunteer programmers to make the program better. Bugs may be
|
||||
reported to {wsjt_yahoo_group} (email address
|
||||
wsjtgroup@yahoogroups.com) or the WSJT Developers list
|
||||
(wsjt-devel@lists.sourceforge.net). Again, you will need to join the
|
||||
group or subscribe to the list. To be useful, bug reports should
|
||||
include at least the following information:
|
||||
|
||||
- Program version
|
||||
- Operating system
|
||||
- Concise description of the problem
|
||||
- Exact sequence of steps required to reproduce the problem
|
||||
|
||||
=== Feature Requests
|
||||
|
||||
Suggestions from users often result in new program features. Good
|
||||
ideas are always welcome: if there's a feature you would like to see
|
||||
in _WSJT-X_, spell it out in as much detail as seems useful and send
|
||||
it to us at one of the email addresses given a few lines above. Be
|
||||
sure to explain why you think the feature is desirable, and what sort
|
||||
of other users might find it so.
|
||||
@@ -1,29 +0,0 @@
|
||||
include::./links.adoc[]
|
||||
_{prog}_ is free software: you may redistribute and/or modify it
|
||||
under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
_{prog}_ is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this documentation. If not, see {gnu_gpl}.
|
||||
|
||||
Except where otherwise noted, all algorithms, protocol designs, source
|
||||
code, and supporting files contained in the _{prog}_ package are the
|
||||
intellectual property of the program's authors. The authors assert
|
||||
*Copyright ownership* of this material, whether or not such copyright
|
||||
notice appears in each individual file. Others who make fair use of
|
||||
our work under terms of the GNU General Public License must display
|
||||
the following copyright notice prominently:
|
||||
|
||||
*The algorithms, source code, look-and-feel of _{prog}_ and related
|
||||
programs, and protocol specifications for the modes FSK441, FT8, JT4,
|
||||
JT6M, JT9, JT65, JTMS, QRA64, ISCAT, and MSK144 are Copyright (C)
|
||||
2001-2017 by one or more of the following authors: Joseph Taylor,
|
||||
K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo,
|
||||
IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR;
|
||||
Philip Karn, KA9Q; and other members of the WSJT Development Group.*
|
||||
@@ -0,0 +1,75 @@
|
||||
message (STATUS "Checking for revision information")
|
||||
if (EXISTS "${SOURCE_DIR}/.svn")
|
||||
message (STATUS "Checking for Subversion revision information")
|
||||
find_package (Subversion QUIET REQUIRED)
|
||||
# the FindSubversion.cmake module is part of the standard distribution
|
||||
include (FindSubversion)
|
||||
# extract working copy information for SOURCE_DIR into MY_XXX variables
|
||||
Subversion_WC_INFO (${SOURCE_DIR} MY)
|
||||
message ("${MY_WC_INFO}")
|
||||
# determine if the working copy has outstanding changes
|
||||
execute_process (COMMAND ${Subversion_SVN_EXECUTABLE} status ${SOURCE_DIR}
|
||||
OUTPUT_FILE "${BINARY_DIR}/svn_status.txt"
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
file (STRINGS "${BINARY_DIR}/svn_status.txt" __svn_changes
|
||||
REGEX "^[^?].*$"
|
||||
)
|
||||
if (__svn_changes)
|
||||
message (WARNING "Source tree based on revision ${MY_WC_LAST_CHANGED_REV} appears to have local changes")
|
||||
set (MY_WC_LAST_CHANGED_REV "${MY_WC_LAST_CHANGED_REV}-dirty")
|
||||
foreach (__svn_change ${__svn_changes})
|
||||
message (STATUS "${__svn_change}")
|
||||
endforeach (__svn_change ${__svn_changes})
|
||||
endif (__svn_changes)
|
||||
message (STATUS "${SOURCE_DIR} contains a .svn and is revision ${MY_WC_LAST_CHANGED_REV}")
|
||||
# write a file with the SCS_VERSION define
|
||||
file (WRITE "${BINARY_DIR}/scs_version.h.txt" "#define SCS_VERSION r${MY_WC_LAST_CHANGED_REV}\n")
|
||||
elseif (EXISTS "${SOURCE_DIR}/.git")
|
||||
if (EXISTS "${SOURCE_DIR}/.git/svn/.metadata") # try git-svn
|
||||
message (STATUS "Checking for Subversion revision information using git-svn")
|
||||
include (${SOURCE_DIR}/CMake/Modules/FindGitSubversion.cmake)
|
||||
# extract working copy information for SOURCE_DIR into MY_XXX variables
|
||||
GitSubversion_WC_INFO (${SOURCE_DIR} MY)
|
||||
message ("${MY_WC_INFO}")
|
||||
# try and determine if the working copy has outstanding changes
|
||||
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 "${BINARY_DIR}/svn_status.txt"
|
||||
ERROR_QUIET
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
file (STRINGS "${BINARY_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_LAST_CHANGED_REV} appears to have local changes")
|
||||
set (MY_WC_LAST_CHANGED_REV "${MY_WC_LAST_CHANGED_REV}-dirty")
|
||||
endif ()
|
||||
# write a file with the SVNVERSION define
|
||||
file (WRITE "${BINARY_DIR}/scs_version.h.txt" "#define SCS_VERSION r${MY_WC_LAST_CHANGED_REV}\n")
|
||||
else ()
|
||||
#
|
||||
# try git
|
||||
#
|
||||
message (STATUS "Checking for gitrevision information")
|
||||
include (${SOURCE_DIR}/CMake/Modules/GetGitRevisionDescription.cmake)
|
||||
get_git_head_revision (${SOURCE_DIR} GIT_REFSPEC GIT_SHA1)
|
||||
git_local_changes (${SOURCE_DIR} GIT_DIRTY)
|
||||
string (SUBSTRING "${GIT_SHA1}" 0 6 GIT_SHA1)
|
||||
if ("${GIT_DIRTY}" STREQUAL "DIRTY")
|
||||
message (WARNING "Source tree based on revision ${GIT_REFSPEC} ${GIT_SHA1} appears to have local changes")
|
||||
set (GIT_SHA1 "${GIT_SHA1}-dirty")
|
||||
execute_process (COMMAND ${GIT_EXECUTABLE} --git-dir=${SOURCE_DIR}/.git --work-tree=${SOURCE_DIR} status
|
||||
ERROR_QUIET
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
endif ()
|
||||
message (STATUS "refspec: ${GIT_REFSPEC} - SHA1: ${GIT_SHA1}")
|
||||
file (WRITE "${BINARY_DIR}/scs_version.h.txt" "#define SCS_VERSION ${GIT_SHA1}\n")
|
||||
endif ()
|
||||
else()
|
||||
message (STATUS "No SCS found")
|
||||
file (WRITE "${BINARY_DIR}/scs_version.h.txt" "#define SCS_VERSION\n")
|
||||
endif ()
|
||||
|
||||
# copy the file to the final header only if the version changes
|
||||
# reduces needless rebuilds
|
||||
execute_process (COMMAND ${CMAKE_COMMAND} -E copy_if_different "${BINARY_DIR}/scs_version.h.txt" "${OUTPUT_DIR}/scs_version.h")
|
||||
Reference in New Issue
Block a user