mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-06-05 16:12:30 -04:00
Don't download and install kvasd. Remove all *.iss files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7499 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
parent
4acf827419
commit
f372e368eb
@ -107,26 +107,6 @@ set_property (DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_WARNIN
|
|||||||
# build the subdirectories
|
# build the subdirectories
|
||||||
add_subdirectory (libm65)
|
add_subdirectory (libm65)
|
||||||
|
|
||||||
# fetch kvasd
|
|
||||||
|
|
||||||
if (APPLE)
|
|
||||||
set (kvasd_NAME http://svn.berlios.de/wsvn/wsjt/trunk/KVASD_gfortran_Mac${CMAKE_EXECUTABLE_SUFFIX})
|
|
||||||
else ()
|
|
||||||
set (kvasd_NAME http://www.physics.princeton.edu/pulsar/K1JT/kvasd${CMAKE_EXECUTABLE_SUFFIX})
|
|
||||||
endif ()
|
|
||||||
file (
|
|
||||||
DOWNLOAD ${kvasd_NAME} contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX}
|
|
||||||
STATUS kvasd_STATUS
|
|
||||||
LOG kvasd_LOG
|
|
||||||
SHOW_PROGRESS
|
|
||||||
)
|
|
||||||
message (${kvasd_LOG})
|
|
||||||
list (GET kvasd_STATUS 0 kvasd_RC)
|
|
||||||
if (!kvasd_RC)
|
|
||||||
message (FATAL_ERROR "${kvasd_STATUS}")
|
|
||||||
endif (!kvasd_RC)
|
|
||||||
add_custom_target (kvasd DEPENDS contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX})
|
|
||||||
|
|
||||||
# UI generation
|
# UI generation
|
||||||
qt5_wrap_ui (GENUISRCS ${UISRCS})
|
qt5_wrap_ui (GENUISRCS ${UISRCS})
|
||||||
|
|
||||||
@ -137,7 +117,6 @@ if (WIN32)
|
|||||||
target_link_libraries (map65)
|
target_link_libraries (map65)
|
||||||
set_target_properties (map65 PROPERTIES LINK_FLAGS_RELEASE "${LINKER_FLAGS_RELEASE} -mwindows")
|
set_target_properties (map65 PROPERTIES LINK_FLAGS_RELEASE "${LINKER_FLAGS_RELEASE} -mwindows")
|
||||||
endif (WIN32)
|
endif (WIN32)
|
||||||
add_dependencies (map65 kvasd)
|
|
||||||
qt5_use_modules (map65 Widgets Multimedia OpenGL)
|
qt5_use_modules (map65 Widgets Multimedia OpenGL)
|
||||||
|
|
||||||
|
|
||||||
@ -156,11 +135,6 @@ install (FILES
|
|||||||
DESTINATION bin
|
DESTINATION bin
|
||||||
)
|
)
|
||||||
|
|
||||||
install (
|
|
||||||
PROGRAMS ${CMAKE_BINARY_DIR}/contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX}
|
|
||||||
DESTINATION bin
|
|
||||||
)
|
|
||||||
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
install (
|
install (
|
||||||
FILES ${fftw3f_LIBRARIES} ${usb_RUNTIME}
|
FILES ${fftw3f_LIBRARIES} ${usb_RUNTIME}
|
||||||
@ -168,7 +142,6 @@ if (WIN32)
|
|||||||
)
|
)
|
||||||
endif (WIN32)
|
endif (WIN32)
|
||||||
|
|
||||||
|
|
||||||
# a custom target that is always built
|
# a custom target that is always built
|
||||||
ADD_CUSTOM_TARGET (revisiontag ALL)
|
ADD_CUSTOM_TARGET (revisiontag ALL)
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +0,0 @@
|
|||||||
[Setup]
|
|
||||||
AppName="QtSupport for MAP65"
|
|
||||||
AppVerName=QtSupport
|
|
||||||
DefaultDirName=C:\MAP65
|
|
||||||
|
|
||||||
[Files]
|
|
||||||
Source: "c:\Users\joe\map65\QtSupport\*.dll"; DestDir: "{app}"; Flags: onlyifdoesntexist
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
[Setup]
|
|
||||||
AppName=MAP65
|
|
||||||
AppVerName=MAP65 Version 2.5 r4705
|
|
||||||
AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT
|
|
||||||
DefaultDirName=C:\WSJT\MAP65
|
|
||||||
DefaultGroupName=WSJT\MAP65
|
|
||||||
|
|
||||||
[Files]
|
|
||||||
Source: "C:\JTSDK-QT\map65\install\Release\bin\*"; DestDir: "{app}";
|
|
||||||
Source: "C:\JTSDK-QT\map65\install\Release\bin\platforms\qwindows.dll"; DestDir: "{app}\platforms"
|
|
||||||
Source: "C:\JTSDK-QT\map65\install\Release\bin\save\Samples"; DestDir: "{app}\save\Samples"; Flags: recursesubdirs createallsubdirs
|
|
||||||
Source: "C:\JTSDK-QT\src\map65\resources\*"; DestDir: "{app}"; Excludes: kvasd.exe
|
|
||||||
|
|
||||||
[Icons]
|
|
||||||
Name: "{group}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
|
|
||||||
Name: "{userdesktop}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
|
|
||||||
Name: {group}\MAP65 Uninstall; Filename: {uninstallexe}
|
|
||||||
|
|
||||||
[Run]
|
|
||||||
Filename: "{app}\wisdom1.bat"; Description: "Optimize plans for FFTs (takes a few minutes)"; Flags: postinstall
|
|
||||||
Filename: "{app}\wisdom2.bat"; Description: "Patiently optimize plans for FFTs (up to one hour)"; Flags: postinstall unchecked
|
|
||||||
Filename: "{app}\map65.exe"; Description: "Launch MAP65"; Flags: postinstall nowait unchecked
|
|
||||||
21
map65.iss
21
map65.iss
@ -1,21 +0,0 @@
|
|||||||
[Setup]
|
|
||||||
AppName=MAP65
|
|
||||||
AppVerName=MAP65 Version 2.5 r4579
|
|
||||||
AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT
|
|
||||||
DefaultDirName=c:\MAP65
|
|
||||||
DefaultGroupName=MAP65
|
|
||||||
|
|
||||||
[Files]
|
|
||||||
Source: "C:\JTSDK-QT\map65\install\Release\bin\*"; DestDir: "{app}"
|
|
||||||
Source: "C:\JTSDK-QT\map65\install\Release\bin\platforms\qwindows.dll"; DestDir: "{app}\platforms"
|
|
||||||
Source: "C:\JTSDK-QT\map65\install\Release\bin\save\Samples"; DestDir: "{app}\save\Samples"; Flags: recursesubdirs createallsubdirs
|
|
||||||
Source: "C:\JTSDK-QT\src\map65\libm65\kvasd.exe"; DestDir: "{app}"
|
|
||||||
Source: "C:\JTSDK-QT\src\map65\resources\*"; DestDir: "{app}"; Flags: onlyifdoesntexist
|
|
||||||
|
|
||||||
[Icons]
|
|
||||||
Name: "{group}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
|
|
||||||
Name: "{userdesktop}\MAP65"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFilename: {app}\wsjt.ico
|
|
||||||
|
|
||||||
[Run]
|
|
||||||
Filename: "{app}\wisdom1.bat"; Description: "Optimize plans for FFTs (takes a few minutes)"; Flags: postinstall
|
|
||||||
Filename: "{app}\wisdom2.bat"; Description: "Patiently optimize plans for FFTs (up to one hour)"; Flags: postinstall unchecked
|
|
||||||
46
map65b.iss
46
map65b.iss
@ -1,46 +0,0 @@
|
|||||||
; For Use With JTSDK v2.0.0
|
|
||||||
#define MyAppName "MAP65"
|
|
||||||
#define MyAppVersion "2.5"
|
|
||||||
#define MyAppPublisher "Joe Taylor, K1JT"
|
|
||||||
#define MyAppCopyright "Copyright (C) 2001-2015 by Joe Taylor, K1JT"
|
|
||||||
#define MyAppURL "http://physics.princeton.edu/pulsar/k1jt/map65.html"
|
|
||||||
#define WsjtGroupURL "https://groups.yahoo.com/neo/groups/wsjtgroup/info"
|
|
||||||
|
|
||||||
[Setup]
|
|
||||||
AppName={#MyAppName}
|
|
||||||
AppVersion={#MyAppVersion}
|
|
||||||
AppPublisher={#MyAppPublisher}
|
|
||||||
AppPublisherURL={#MyAppURL}
|
|
||||||
AppSupportURL={#MyAppURL}
|
|
||||||
AppUpdatesURL={#MyAppURL}
|
|
||||||
DisableReadyPage=yes
|
|
||||||
DefaultDirName=C:\WSJT\MAP65
|
|
||||||
DefaultGroupName=WSJT
|
|
||||||
DisableProgramGroupPage=yes
|
|
||||||
LicenseFile=C:\JTSDK\common-licenses\GPL-3
|
|
||||||
OutputDir=C:\JTSDK\map65\package
|
|
||||||
OutputBaseFilename={#MyAppName}-{#MyAppVersion}-Win32
|
|
||||||
SetupIconFile=C:\JTSDK\icons\wsjt.ico
|
|
||||||
Compression=lzma
|
|
||||||
SolidCompression=yes
|
|
||||||
|
|
||||||
[Languages]
|
|
||||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
|
||||||
|
|
||||||
[Files]
|
|
||||||
Source: "c:\JTSDK\map65\install\Release\bin\*"; DestDir: "{app}"; Excludes: CALL3.TXT; Flags: ignoreversion recursesubdirs createallsubdirs
|
|
||||||
Source: "C:\JTSDK\src\map65\resources\*"; DestDir: "{app}"; Flags: ignoreversion onlyifdoesntexist
|
|
||||||
|
|
||||||
[Icons]
|
|
||||||
Name: "{group}\{#MyAppName}\Documentation\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
|
|
||||||
Name: "{group}\{#MyAppName}\Resources\{cm:ProgramOnTheWeb,WSJT Group}"; Filename: "{#WsjtGroupURL}"
|
|
||||||
Name: "{group}\{#MyAppName}\Tools\Wisdom-1"; Filename: "{app}\wisdom1.bat"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
|
|
||||||
Name: "{group}\{#MyAppName}\Tools\Wisdom-2"; Filename: "{app}\wisdom2.bat"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
|
|
||||||
Name: "{group}\{#MyAppName}\Uninstall\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"; Comment: "Uninstall MAP65";
|
|
||||||
Name: "{group}\{#MyAppName}\{#MyAppName}"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
|
|
||||||
Name: "{userdesktop}\{#MyAppName}"; Filename: "{app}\map65.exe"; WorkingDir: {app}; IconFileName: "{app}\wsjt.ico"
|
|
||||||
|
|
||||||
[Run]
|
|
||||||
Filename: "{app}\wisdom1.bat"; Description: "Optimize plans for FFTs (takes a few minutes)"; Flags: postinstall
|
|
||||||
Filename: "{app}\wisdom2.bat"; Description: "Patiently optimize plans for FFTs (up to one hour)"; Flags: postinstall unchecked
|
|
||||||
Filename: "{app}\map65.exe"; Description: "Launch MAP65"; Flags: postinstall nowait unchecked
|
|
||||||
Loading…
x
Reference in New Issue
Block a user