Complete rename to ft8call executable

CMakeCPackOptions.cmake.in

@@ -9,8 +9,8 @@ set (CPACK_PACKAGE_CONTACT "@PROJECT_CONTACT@")
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_SUMMARY_DESCRIPTION@")
 set (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING")
 set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
-set (CPACK_PACKAGE_EXECUTABLES wsjtx-ft8call "@PROJECT_NAME@")
+set (CPACK_PACKAGE_EXECUTABLES ft8call "@PROJECT_NAME@")
-set (CPACK_CREATE_DESKTOP_LINKS wsjtx-ft8call)
+set (CPACK_CREATE_DESKTOP_LINKS ft8call)
 set (CPACK_STRIP_FILES TRUE)
 
 #
@@ -37,13 +37,13 @@ if (CPACK_GENERATOR MATCHES "NSIS")
     "@PROJECT_HOMEPAGE@" "@PROJECT_NAME@ Web Site"
     )
   # Use the icon from wsjtx for add-remove programs
-  set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\wsjtx-ft8call.exe")
+  set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\ft8call.exe")
 
   set (CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_DESCRIPTION_SUMMARY}")
   set (CPACK_NSIS_HELP_LINK "@PROJECT_MANUAL_DIRECTORY_URL@/@PROJECT_MANUAL@")
   set (CPACK_NSIS_URL_INFO_ABOUT "@PROJECT_HOMEPAGE@")
   set (CPACK_NSIS_CONTACT "${CPACK_PACKAGE_CONTACT}")
-  set (CPACK_NSIS_MUI_FINISHPAGE_RUN "wsjtx-ft8call.exe")
+  set (CPACK_NSIS_MUI_FINISHPAGE_RUN "ft8call.exe")
   set (CPACK_NSIS_MODIFY_PATH ON)
 endif ()
 
@@ -67,9 +67,9 @@ if ("${CPACK_GENERATOR}" STREQUAL "WIX")
   # Reset CPACK_PACKAGE_VERSION to deal with WiX restriction.
   # But the file names still use the full CMake_VERSION value:
   set (CPACK_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}-@wsjtx-ft8call_VERSION@-${CPACK_SYSTEM_NAME}")
+    "${CPACK_PACKAGE_NAME}-@ft8call_VERSION@-${CPACK_SYSTEM_NAME}")
   set (CPACK_SOURCE_PACKAGE_FILE_NAME
-    "${CPACK_PACKAGE_NAME}-@wsjtx-ft8call_VERSION@-Source")
+    "${CPACK_PACKAGE_NAME}-@ft8call_VERSION@-Source")
 
   if (NOT CPACK_WIX_SIZEOF_VOID_P)
     set (CPACK_WIX_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")

CMakeLists.txt

@@ -22,7 +22,7 @@ Change this to the newest SDK available that you can install on your system (10.
 Do not override this if you intend to build an official deployable installer.")
 endif (APPLE)
 
-project (wsjtx-ft8call C CXX Fortran)
+project (ft8call C CXX Fortran)
 
 #
 # CMake policies
@@ -1299,7 +1299,7 @@ else (${OPENMP_FOUND} OR APPLE)
 endif (${OPENMP_FOUND} OR APPLE)
 
 # build the main application
-add_executable (wsjtx-ft8call MACOSX_BUNDLE
+add_executable (ft8call MACOSX_BUNDLE
   ${wsjtx_CXXSRCS}
   ${wsjtx_GENUISRCS}
   wsjtx.rc
@@ -1308,10 +1308,10 @@ add_executable (wsjtx-ft8call MACOSX_BUNDLE
   )
 
 if (WSJT_CREATE_WINMAIN)
-  set_target_properties (wsjtx-ft8call PROPERTIES WIN32_EXECUTABLE ON)
+  set_target_properties (ft8call PROPERTIES WIN32_EXECUTABLE ON)
 endif (WSJT_CREATE_WINMAIN)
 
-set_target_properties (wsjtx-ft8call PROPERTIES
+set_target_properties (ft8call PROPERTIES
   MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}"
   MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
   MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION}
@@ -1322,27 +1322,27 @@ set_target_properties (wsjtx-ft8call PROPERTIES
   MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
   )
 
-target_include_directories (wsjtx-ft8call PRIVATE ${FFTW3_INCLUDE_DIRS})
+target_include_directories (ft8call PRIVATE ${FFTW3_INCLUDE_DIRS})
 if (APPLE)
-  target_link_libraries (wsjtx-ft8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+  target_link_libraries (ft8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
 else ()
-  target_link_libraries (wsjtx-ft8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+  target_link_libraries (ft8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
   if (OpenMP_C_FLAGS)
-    set_target_properties (wsjtx-ft8call PROPERTIES
+    set_target_properties (ft8call PROPERTIES
       COMPILE_FLAGS "${OpenMP_C_FLAGS}"
       LINK_FLAGS "${OpenMP_C_FLAGS}"
       )
   endif ()
-  set_target_properties (wsjtx-ft8call PROPERTIES
+  set_target_properties (ft8call PROPERTIES
     Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
     )
   if (WIN32)
-    set_target_properties (wsjtx-ft8call PROPERTIES
+    set_target_properties (ft8call PROPERTIES
       LINK_FLAGS -Wl,--stack,16777216
       )
   endif ()
 endif ()
-qt5_use_modules (wsjtx-ft8call SerialPort) # not sure why the interface link library syntax above doesn't work
+qt5_use_modules (ft8call SerialPort) # not sure why the interface link library syntax above doesn't work
 
 # make a library for WSJT-X UDP servers
 # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
@@ -1387,18 +1387,18 @@ endif (WSJT_CREATE_WINMAIN)
 if (UNIX)
   if (NOT WSJT_SKIP_MANPAGES)
     add_subdirectory (manpages)
-    add_dependencies (wsjtx-ft8call manpages)
+    add_dependencies (ft8call manpages)
   endif (NOT WSJT_SKIP_MANPAGES)
   if (NOT APPLE)
     add_subdirectory (debian)
-    add_dependencies (wsjtx-ft8call debian)
+    add_dependencies (ft8call debian)
   endif (NOT APPLE)
 endif (UNIX)
 
 #
 # installation
 #
-install (TARGETS wsjtx-ft8call
+install (TARGETS ft8call
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
   BUNDLE DESTINATION . COMPONENT runtime
   )
@@ -1488,11 +1488,11 @@ add_custom_target (uninstall
 
 
 # creates svnversion.h using cmake script
-add_custom_target (revisiontag
+# add_custom_target (revisiontag
-  COMMAND ${CMAKE_COMMAND} -D SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D OUTPUT_DIR=${PROJECT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/getsvn.cmake
+#   COMMAND ${CMAKE_COMMAND} -D SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D OUTPUT_DIR=${PROJECT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/getsvn.cmake
-  COMMENT "Generating Subversion revision information"
+#   COMMENT "Generating Subversion revision information"
-  VERBATIM
+#   VERBATIM
-  )
+#   )
 # explicitly say that the wsjt_qt depends on custom target, this is
 # done indirectly so that the revisiontag target gets built exactly
 # once per build
@@ -1512,7 +1512,7 @@ if (NOT WIN32 AND NOT APPLE)
   # install a desktop file so wsjtx appears in the application start
   # menu with an icon
   install (
-    FILES wsjtx-ft8call.desktop message_aggregator.desktop
+    FILES ft8call.desktop message_aggregator.desktop
     DESTINATION share/applications
     #COMPONENT runtime
     )

ft8call.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
-Name=wsjtx-ft8call
+Name=ft8call
 Comment=Amateur Radio Weak Signal Operating
-Exec=wsjtx-ft8call
+Exec=ft8call
 Icon=wsjtx_icon
 Terminal=false
 X-MultipleArgs=false

revision_utils.cpp

@@ -5,64 +5,9 @@
 #include <QCoreApplication>
 #include <QRegularExpression>
 
-#include "svnversion.h"
-
-namespace
-{
-  QString revision_extract_number (QString const& s)
-  {
-    QString revision;
-
-    // try and match a number
-    QRegularExpression re {R"(^[$:]\w+: (\d+[^$]*)\$$)"};
-    auto match = re.match (s);
-    if (match.hasMatch ())
-      {
-        revision = 'r' + match.captured (1);
-      }
-    return revision;
-  }
-}
-
 QString revision (QString const& svn_rev_string)
 {
-  QString result;
+  return "";
-#if 0
-  auto revision_from_svn = revision_extract_number (svn_rev_string);
-
-#if defined (CMAKE_BUILD)
-  QString svn_info {":Rev: " WSJTX_STRINGIZE (SVNVERSION) " $"};
-
-  auto revision_from_svn_info = revision_extract_number (svn_info);
-  if (!revision_from_svn_info.isEmpty ())
-    {
-      // we managed to get the revision number from svn info etc.
-      result = revision_from_svn_info;
-    }
-  else if (!revision_from_svn.isEmpty ())
-    {
-      // fall back to revision passed in if any
-      result = revision_from_svn;
-    }
-  else
-    {
-      // match anything
-      QRegularExpression re {R"(^[$:]\w+: ([^$]*)\$$)"};
-      auto match = re.match (svn_info);
-      if (match.hasMatch ())
-        {
-          result = match.captured (1);
-        }
-    }
-#else
-  if (!revision_from_svn.isEmpty ())
-    {
-      // not CMake build so all we have is revision passed
-      result = revision_from_svn;
-    }
-#endif
-#endif
-  return result.trimmed ();
 }
 
 QString version (bool include_patch)