joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to wsjt-x 2.6.1

Browse Source
This commit is contained in:
Jakob Ketterl 2023-01-28 19:13:10 +01:00
parent 2342bb5d29
commit 0de597481c
2 changed files with 342 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

651
docker/files/wsjtx/wsjtx.patch
View File

@ -1,310 +1,341 @@
diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
--- wsjtx-orig/CMakeLists.txt 2021-11-02 16:34:09.361811689 +0100 --- wsjtx-orig/CMakeLists.txt 2023-01-28 17:43:05.586124507 +0100
+++ wsjtx/CMakeLists.txt 2021-11-02 16:38:36.696088115 +0100 +++ wsjtx/CMakeLists.txt 2023-01-28 17:56:07.108634912 +0100
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.") option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.")
option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON) option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.") option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
-option (WSJT_GENERATE_DOCS "Generate documentation files." ON) -option (WSJT_GENERATE_DOCS "Generate documentation files." ON)
+option (WSJT_GENERATE_DOCS "Generate documentation files.") +option (WSJT_GENERATE_DOCS "Generate documentation files.")
option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.") option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.")
option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.") option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.")
option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON) option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON)
@@ -169,76 +169,7 @@ @@ -170,77 +170,7 @@
) )
set (wsjt_qt_CXXSRCS set (wsjt_qt_CXXSRCS
- helper_functions.cpp - helper_functions.cpp
- qt_helpers.cpp - qt_helpers.cpp
- widgets/MessageBox.cpp - widgets/MessageBox.cpp
- MetaDataRegistry.cpp - MetaDataRegistry.cpp
- Network/NetworkServerLookup.cpp - Network/NetworkServerLookup.cpp
revision_utils.cpp revision_utils.cpp
- L10nLoader.cpp - L10nLoader.cpp
- WFPalette.cpp - WFPalette.cpp
- Radio.cpp - Radio.cpp
- RadioMetaType.cpp - RadioMetaType.cpp
- NonInheritingProcess.cpp - NonInheritingProcess.cpp
- models/IARURegions.cpp - models/IARURegions.cpp
- models/Bands.cpp - models/Bands.cpp
- models/Modes.cpp - models/Modes.cpp
- models/FrequencyList.cpp - models/FrequencyList.cpp
- models/StationList.cpp - models/StationList.cpp
- widgets/FrequencyLineEdit.cpp - widgets/FrequencyLineEdit.cpp
- widgets/FrequencyDeltaLineEdit.cpp - widgets/FrequencyDeltaLineEdit.cpp
- item_delegates/CandidateKeyFilter.cpp - item_delegates/CandidateKeyFilter.cpp
- item_delegates/ForeignKeyDelegate.cpp - item_delegates/ForeignKeyDelegate.cpp
- validators/LiveFrequencyValidator.cpp - item_delegates/MessageItemDelegate.cpp
- GetUserId.cpp - validators/LiveFrequencyValidator.cpp
- Audio/AudioDevice.cpp - GetUserId.cpp
- Transceiver/Transceiver.cpp - Audio/AudioDevice.cpp
- Transceiver/TransceiverBase.cpp - Transceiver/Transceiver.cpp
- Transceiver/EmulateSplitTransceiver.cpp - Transceiver/TransceiverBase.cpp
- Transceiver/TransceiverFactory.cpp - Transceiver/EmulateSplitTransceiver.cpp
- Transceiver/PollingTransceiver.cpp - Transceiver/TransceiverFactory.cpp
- Transceiver/HamlibTransceiver.cpp - Transceiver/PollingTransceiver.cpp
- Transceiver/HRDTransceiver.cpp - Transceiver/HamlibTransceiver.cpp
- Transceiver/DXLabSuiteCommanderTransceiver.cpp - Transceiver/HRDTransceiver.cpp
- Network/NetworkMessage.cpp - Transceiver/DXLabSuiteCommanderTransceiver.cpp
- Network/MessageClient.cpp - Network/NetworkMessage.cpp
- widgets/LettersSpinBox.cpp - Network/MessageClient.cpp
- widgets/HintedSpinBox.cpp - widgets/LettersSpinBox.cpp
- widgets/RestrictedSpinBox.cpp - widgets/HintedSpinBox.cpp
- widgets/HelpTextWindow.cpp - widgets/RestrictedSpinBox.cpp
- SampleDownloader.cpp - widgets/HelpTextWindow.cpp
- SampleDownloader/DirectoryDelegate.cpp - SampleDownloader.cpp
- SampleDownloader/Directory.cpp - SampleDownloader/DirectoryDelegate.cpp
- SampleDownloader/FileNode.cpp - SampleDownloader/Directory.cpp
- SampleDownloader/RemoteFile.cpp - SampleDownloader/FileNode.cpp
- DisplayManual.cpp - SampleDownloader/RemoteFile.cpp
- MultiSettings.cpp - DisplayManual.cpp
- validators/MaidenheadLocatorValidator.cpp - MultiSettings.cpp
- validators/CallsignValidator.cpp - validators/MaidenheadLocatorValidator.cpp
- widgets/SplashScreen.cpp - validators/CallsignValidator.cpp
- EqualizationToolsDialog.cpp - widgets/SplashScreen.cpp
- widgets/DoubleClickablePushButton.cpp - EqualizationToolsDialog.cpp
- widgets/DoubleClickableRadioButton.cpp - widgets/DoubleClickablePushButton.cpp
- Network/LotWUsers.cpp - widgets/DoubleClickableRadioButton.cpp
- models/DecodeHighlightingModel.cpp - Network/LotWUsers.cpp
- widgets/DecodeHighlightingListView.cpp - models/DecodeHighlightingModel.cpp
- models/FoxLog.cpp - widgets/DecodeHighlightingListView.cpp
- widgets/AbstractLogWindow.cpp - models/FoxLog.cpp
- widgets/FoxLogWindow.cpp - widgets/AbstractLogWindow.cpp
- widgets/CabrilloLogWindow.cpp - widgets/FoxLogWindow.cpp
- item_delegates/CallsignDelegate.cpp - widgets/CabrilloLogWindow.cpp
- item_delegates/MaidenheadLocatorDelegate.cpp - item_delegates/CallsignDelegate.cpp
- item_delegates/FrequencyDelegate.cpp - item_delegates/MaidenheadLocatorDelegate.cpp
- item_delegates/FrequencyDeltaDelegate.cpp - item_delegates/FrequencyDelegate.cpp
- item_delegates/SQLiteDateTimeDelegate.cpp - item_delegates/FrequencyDeltaDelegate.cpp
- models/CabrilloLog.cpp - item_delegates/SQLiteDateTimeDelegate.cpp
- logbook/AD1CCty.cpp - models/CabrilloLog.cpp
- logbook/WorkedBefore.cpp - logbook/AD1CCty.cpp
- logbook/Multiplier.cpp - logbook/WorkedBefore.cpp
- Network/NetworkAccessManager.cpp - logbook/Multiplier.cpp
- widgets/LazyFillComboBox.cpp - Network/NetworkAccessManager.cpp
- widgets/CheckableItemComboBox.cpp - widgets/LazyFillComboBox.cpp
- widgets/BandComboBox.cpp - widgets/CheckableItemComboBox.cpp
) - widgets/BandComboBox.cpp
)
set (wsjt_qtmm_CXXSRCS
@@ -1079,9 +1010,6 @@ set (wsjt_qtmm_CXXSRCS
if (WSJT_GENERATE_DOCS) @@ -1089,9 +1019,6 @@
add_subdirectory (doc) if (WSJT_GENERATE_DOCS)
endif (WSJT_GENERATE_DOCS) add_subdirectory (doc)
-if (EXISTS ${CMAKE_SOURCE_DIR}/tests AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/tests) endif (WSJT_GENERATE_DOCS)
- add_subdirectory (tests) -if (EXISTS ${CMAKE_SOURCE_DIR}/tests AND IS_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
-endif () - add_subdirectory (tests)
-endif ()
# build a library of package functionality (without and optionally with OpenMP support)
add_library (wsjt_cxx STATIC ${wsjt_CSRCS} ${wsjt_CXXSRCS}) # build a library of package functionality (without and optionally with OpenMP support)
@@ -1340,10 +1268,7 @@ add_library (wsjt_cxx STATIC ${wsjt_CSRCS} ${wsjt_CXXSRCS})
add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS}) @@ -1357,10 +1284,7 @@
# set wsjtx_udp exports to static variants add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS} ${GENAXSRCS})
target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE) # set wsjtx_udp exports to static variants
-target_link_libraries (wsjt_qt Hamlib::Hamlib Boost::log qcp Qt5::Widgets Qt5::Network Qt5::Sql) target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE)
-if (WIN32) -target_link_libraries (wsjt_qt Hamlib::Hamlib Boost::log qcp Qt5::Widgets Qt5::Network Qt5::Sql)
- target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase) -if (WIN32)
-endif (WIN32) - target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase)
+target_link_libraries (wsjt_qt Qt5::Core) -endif (WIN32)
+target_link_libraries (wsjt_qt Qt5::Core)
# build a library of package Qt functionality used in Fortran utilities
add_library (fort_qt STATIC ${fort_qt_CXXSRCS}) # build a library of package Qt functionality used in Fortran utilities
@@ -1408,60 +1333,6 @@ add_library (fort_qt STATIC ${fort_qt_CXXSRCS})
add_subdirectory (map65) @@ -1425,90 +1349,6 @@
endif () add_subdirectory (map65)
endif ()
-# build the main application
-generate_version_info (wsjtx_VERSION_RESOURCES -# build the main application
- NAME wsjtx -generate_version_info (wsjtx_VERSION_RESOURCES
- BUNDLE ${PROJECT_BUNDLE_NAME} - NAME wsjtx
- ICON ${WSJTX_ICON_FILE} - BUNDLE ${PROJECT_BUNDLE_NAME}
- ) - ICON ${WSJTX_ICON_FILE}
- - )
-add_executable (wsjtx MACOSX_BUNDLE -
- ${wsjtx_CXXSRCS} -add_executable (wsjtx MACOSX_BUNDLE
- ${wsjtx_GENUISRCS} - ${wsjtx_CXXSRCS}
- ${WSJTX_ICON_FILE} - ${wsjtx_GENUISRCS}
- ${wsjtx_RESOURCES_RCC} - ${WSJTX_ICON_FILE}
- ${wsjtx_VERSION_RESOURCES} - ${wsjtx_RESOURCES_RCC}
- ) - ${wsjtx_VERSION_RESOURCES}
- - )
-if (WSJT_CREATE_WINMAIN) -
- set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON) -if (WSJT_CREATE_WINMAIN)
-endif (WSJT_CREATE_WINMAIN) - set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON)
- -endif (WSJT_CREATE_WINMAIN)
-set_target_properties (wsjtx PROPERTIES -
- MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in" -set_target_properties (wsjtx PROPERTIES
- MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}" - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in"
- MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}" - MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}"
- MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} - MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
- MACOSX_BUNDLE_SHORT_VERSION_STRING "v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" - MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
- MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${SCS_VERSION_STR}" - MACOSX_BUNDLE_SHORT_VERSION_STRING "v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
- MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_BUNDLE_NAME}" - MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${SCS_VERSION_STR}"
- MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}" - MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_BUNDLE_NAME}"
- MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}" - MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}"
- MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx" - MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
- ) - MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
- - )
-target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS}) -
-if (APPLE) -target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS})
- target_link_libraries (wsjtx wsjt_fort) -if ((NOT ${OPENMP_FOUND}) OR APPLE)
-else () - target_link_libraries (wsjtx wsjt_fort)
- target_link_libraries (wsjtx wsjt_fort_omp) -else ()
- if (OpenMP_C_FLAGS) - target_link_libraries (wsjtx wsjt_fort_omp)
- set_target_properties (wsjtx PROPERTIES - if (OpenMP_C_FLAGS)
- COMPILE_FLAGS "${OpenMP_C_FLAGS}" - set_target_properties (wsjtx PROPERTIES
- LINK_FLAGS "${OpenMP_C_FLAGS}" - COMPILE_FLAGS "${OpenMP_C_FLAGS}"
- ) - LINK_FLAGS "${OpenMP_C_FLAGS}"
- endif () - )
- set_target_properties (wsjtx PROPERTIES - endif ()
- Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp - set_target_properties (wsjtx PROPERTIES
- ) - Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
- if (WIN32) - )
- set_target_properties (wsjtx PROPERTIES - if (WIN32)
- LINK_FLAGS -Wl,--stack,0x1000000,--heap,0x20000000 - set_target_properties (wsjtx PROPERTIES
- ) - LINK_FLAGS -Wl,--stack,0x1000000,--heap,0x20000000
- endif () - )
-endif () - endif ()
-target_link_libraries (wsjtx Qt5::SerialPort wsjt_cxx wsjt_qt wsjt_qtmm ${FFTW3_LIBRARIES} ${LIBM_LIBRARIES}) -endif ()
- -target_link_libraries (wsjtx Qt5::SerialPort wsjt_cxx wsjt_qt wsjt_qtmm ${FFTW3_LIBRARIES} ${LIBM_LIBRARIES})
# make a library for WSJT-X UDP servers -
# add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS}) -# make a library for WSJT-X UDP servers
add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS}) -# add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
@@ -1501,47 +1372,9 @@ -add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
add_executable (wsjtx_app_version AppVersion/AppVersion.cpp ${wsjtx_app_version_VERSION_RESOURCES}) -#target_include_directories (wsjtx_udp
target_link_libraries (wsjtx_app_version wsjt_qt) -# INTERFACE
-# $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wsjtx>
-generate_version_info (message_aggregator_VERSION_RESOURCES -# )
- NAME message_aggregator -target_include_directories (wsjtx_udp-static
- BUNDLE ${PROJECT_BUNDLE_NAME} - INTERFACE
- ICON ${WSJTX_ICON_FILE} - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wsjtx>
- FILE_DESCRIPTION "Example WSJT-X UDP Message Protocol application" - )
- ) -#set_target_properties (wsjtx_udp PROPERTIES
-add_resources (message_aggregator_RESOURCES /qss ${message_aggregator_STYLESHEETS}) -# PUBLIC_HEADER "${UDP_library_HEADERS}"
-configure_file (UDPExamples/message_aggregator.qrc.in message_aggregator.qrc @ONLY) -# )
-qt5_add_resources (message_aggregator_RESOURCES_RCC -set_target_properties (wsjtx_udp-static PROPERTIES
- ${CMAKE_CURRENT_BINARY_DIR}/message_aggregator.qrc - OUTPUT_NAME wsjtx_udp
- contrib/QDarkStyleSheet/qdarkstyle/style.qrc - )
- ) -target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE)
-add_executable (message_aggregator -target_link_libraries (wsjtx_udp-static Qt5::Network Qt5::Gui)
- ${message_aggregator_CXXSRCS} -generate_export_header (wsjtx_udp-static BASE_NAME udp)
- ${message_aggregator_RESOURCES_RCC} -
- ${message_aggregator_VERSION_RESOURCES} -generate_version_info (udp_daemon_VERSION_RESOURCES
- ) - NAME udp_daemon
-target_link_libraries (message_aggregator wsjt_qt Qt5::Widgets wsjtx_udp-static) - BUNDLE ${PROJECT_BUNDLE_NAME}
- - ICON ${WSJTX_ICON_FILE}
-if (WSJT_CREATE_WINMAIN) - FILE_DESCRIPTION "Example WSJT-X UDP Message Protocol daemon"
- set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON) - )
-endif (WSJT_CREATE_WINMAIN) -add_executable (udp_daemon UDPExamples/UDPDaemon.cpp ${udp_daemon_VERSION_RESOURCES})
- -target_link_libraries (udp_daemon wsjtx_udp-static)
-if (UNIX) -
- if (NOT WSJT_SKIP_MANPAGES) generate_version_info (wsjtx_app_version_VERSION_RESOURCES
- add_subdirectory (manpages) NAME wsjtx_app_version
- add_dependencies (wsjtx manpages) BUNDLE ${PROJECT_BUNDLE_NAME}
- endif (NOT WSJT_SKIP_MANPAGES) @@ -1518,47 +1358,9 @@
- if (NOT APPLE) add_executable (wsjtx_app_version AppVersion/AppVersion.cpp ${wsjtx_app_version_VERSION_RESOURCES})
- add_subdirectory (debian) target_link_libraries (wsjtx_app_version wsjt_qt)
- add_dependencies (wsjtx debian)
- endif (NOT APPLE) -generate_version_info (message_aggregator_VERSION_RESOURCES
-endif (UNIX) - NAME message_aggregator
- - BUNDLE ${PROJECT_BUNDLE_NAME}
# - ICON ${WSJTX_ICON_FILE}
# installation - FILE_DESCRIPTION "Example WSJT-X UDP Message Protocol application"
# - )
-install (TARGETS wsjtx -add_resources (message_aggregator_RESOURCES /qss ${message_aggregator_STYLESHEETS})
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime -configure_file (UDPExamples/message_aggregator.qrc.in message_aggregator.qrc @ONLY)
- BUNDLE DESTINATION . COMPONENT runtime -qt5_add_resources (message_aggregator_RESOURCES_RCC
- ) - ${CMAKE_CURRENT_BINARY_DIR}/message_aggregator.qrc
- contrib/QDarkStyleSheet/qdarkstyle/style.qrc
# install (TARGETS wsjtx_udp EXPORT udp - )
# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -add_executable (message_aggregator
@@ -1560,12 +1393,7 @@ - ${message_aggregator_CXXSRCS}
# DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx - ${message_aggregator_RESOURCES_RCC}
# ) - ${message_aggregator_VERSION_RESOURCES}
- )
-install (TARGETS udp_daemon message_aggregator wsjtx_app_version -target_link_libraries (message_aggregator wsjt_qt Qt5::Widgets wsjtx_udp-static)
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime -
- BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime -if (WSJT_CREATE_WINMAIN)
- ) - set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON)
- -endif (WSJT_CREATE_WINMAIN)
-install (TARGETS jt9 wsprd fmtave fcal fmeasure -
+install (TARGETS wsjtx_app_version jt9 wsprd -if (UNIX)
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime - if (NOT WSJT_SKIP_MANPAGES)
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime - add_subdirectory (manpages)
) - add_dependencies (wsjtx manpages)
@@ -1578,38 +1406,6 @@ - endif (NOT WSJT_SKIP_MANPAGES)
) - if (NOT APPLE)
endif(WSJT_BUILD_UTILS) - add_subdirectory (debian)
- add_dependencies (wsjtx debian)
-install (PROGRAMS - endif (NOT APPLE)
- ${RIGCTL_EXE} -endif (UNIX)
- DESTINATION ${CMAKE_INSTALL_BINDIR} -
- #COMPONENT runtime #
- RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX} # installation
- ) #
- -install (TARGETS wsjtx
-install (PROGRAMS - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- ${RIGCTLD_EXE} - BUNDLE DESTINATION . COMPONENT runtime
- DESTINATION ${CMAKE_INSTALL_BINDIR} - )
- #COMPONENT runtime
- RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX} # install (TARGETS wsjtx_udp EXPORT udp
- ) # RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- @@ -1577,12 +1379,7 @@
-install (PROGRAMS # DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
- ${RIGCTLCOM_EXE} # )
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- #COMPONENT runtime -install (TARGETS udp_daemon message_aggregator wsjtx_app_version
- RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- ) - BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- - )
-install (FILES -
- README -install (TARGETS jt9 wsprd fmtave fcal fmeasure
- COPYING +install (TARGETS wsjtx_app_version jt9 wsprd
- AUTHORS RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- THANKS BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
- NEWS )
- BUGS @@ -1595,38 +1392,6 @@
- DESTINATION ${CMAKE_INSTALL_DOCDIR} )
- #COMPONENT runtime endif(WSJT_BUILD_UTILS)
- )
- -install (PROGRAMS
install (FILES - ${RIGCTL_EXE}
cty.dat - DESTINATION ${CMAKE_INSTALL_BINDIR}
cty.dat_copyright.txt - #COMPONENT runtime
@@ -1618,13 +1414,6 @@ - RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
#COMPONENT runtime - )
) -
-install (PROGRAMS
-install (DIRECTORY - ${RIGCTLD_EXE}
- example_log_configurations - DESTINATION ${CMAKE_INSTALL_BINDIR}
- DESTINATION ${CMAKE_INSTALL_DOCDIR} - #COMPONENT runtime
- FILES_MATCHING REGEX "^.*[^~]$" - RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
- #COMPONENT runtime - )
- ) -
- -install (PROGRAMS
# - ${RIGCTLCOM_EXE}
# Mac installer files - DESTINATION ${CMAKE_INSTALL_BINDIR}
# - #COMPONENT runtime
@@ -1676,22 +1465,6 @@ - RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
"${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h" - )
) -
-install (FILES
- - README
-if (NOT WIN32 AND NOT APPLE) - COPYING
- # install a desktop file so wsjtx appears in the application start - AUTHORS
- # menu with an icon - THANKS
- install ( - NEWS
- FILES wsjtx.desktop message_aggregator.desktop - BUGS
- DESTINATION share/applications - DESTINATION ${CMAKE_INSTALL_DOCDIR}
- #COMPONENT runtime - #COMPONENT runtime
- ) - )
- install ( -
- FILES icons/Unix/wsjtx_icon.png install (FILES
- DESTINATION share/pixmaps cty.dat
- #COMPONENT runtime cty.dat_copyright.txt
- ) @@ -1635,13 +1400,6 @@
-endif (NOT WIN32 AND NOT APPLE) #COMPONENT runtime
- )
if (APPLE)
set (CMAKE_POSTFLIGHT_SCRIPT -install (DIRECTORY
"${wsjtx_BINARY_DIR}/postflight.sh") - example_log_configurations
- DESTINATION ${CMAKE_INSTALL_DOCDIR}
- FILES_MATCHING REGEX "^.*[^~]$"
- #COMPONENT runtime
- )
-
#
# Mac installer files
#
@@ -1693,22 +1451,6 @@
"${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
)
-
-if (NOT WIN32 AND NOT APPLE)
- # install a desktop file so wsjtx appears in the application start
- # menu with an icon
- install (
- FILES wsjtx.desktop message_aggregator.desktop
- DESTINATION share/applications
- #COMPONENT runtime
- )
- install (
- FILES icons/Unix/wsjtx_icon.png
- DESTINATION share/pixmaps
- #COMPONENT runtime
- )
-endif (NOT WIN32 AND NOT APPLE)
-
if (APPLE)
set (CMAKE_POSTFLIGHT_SCRIPT
"${wsjtx_BINARY_DIR}/postflight.sh")

2
docker/scripts/install-dependencies.sh
View File

@ -51,7 +51,7 @@ rm /js8call-hamlib.patch
cmakebuild ${JS8CALL_DIR} cmakebuild ${JS8CALL_DIR}
rm ${JS8CALL_TGZ} rm ${JS8CALL_TGZ}
WSJT_DIR=wsjtx-2.5.4 WSJT_DIR=wsjtx-2.6.1
WSJT_TGZ=${WSJT_DIR}.tgz WSJT_TGZ=${WSJT_DIR}.tgz
wget https://downloads.sourceforge.net/project/wsjt/${WSJT_DIR}/${WSJT_TGZ} wget https://downloads.sourceforge.net/project/wsjt/${WSJT_DIR}/${WSJT_TGZ}
tar xfz ${WSJT_TGZ} tar xfz ${WSJT_TGZ}