From 065483e283f7553a93f15d5d3d1bcd113aa7e5e4 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 20 Oct 2014 17:38:53 +0000 Subject: [PATCH] Fix Mac OS X DragNDrop DMG Volume name The DMG volume name must not change between versions as it invalidates the .DS_Store file backgound image. Merged from wsjtx-1.4 branch. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4548 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeCPackOptions.cmake.in | 9 +++++---- CMakeLists.txt | 13 +++++++------ Darwin/wsjtx_DMG.DS_Store | Bin 15364 -> 15364 bytes 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index a3a2d0984..feb6936e8 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -8,7 +8,7 @@ set (CPACK_PACKAGE_DESCRIPTION_FILE "@PROJECT_SOURCE_DIR@/Copyright.txt") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "@PROJECT_SUMMARY_DESCRIPTION@") set (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/license.txt") set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME}) -set (CPACK_PACKAGE_EXECUTABLES wsjtx "WSJT-X") +set (CPACK_PACKAGE_EXECUTABLES wsjtx "@PROJECT_NAME@") set (CPACK_CREATE_DESKTOP_LINKS wsjtx) set (CPACK_STRIP_FILES TRUE) @@ -16,7 +16,7 @@ set (CPACK_STRIP_FILES TRUE) # components # #set (CPACK_COMPONENTS_ALL Unspecified Runtime) -#set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "WSJT-X Application") +#set (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "@PROJECT_NAME@ Application") #set (CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "@WSJTX_DESCRIPTION_SUMMARY@") if (CPACK_GENERATOR MATCHES "NSIS") @@ -32,8 +32,8 @@ if (CPACK_GENERATOR MATCHES "NSIS") set (CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/icons/windows-icons\\installer_logo.bmp") # tell cpack to create links to the doc files set (CPACK_NSIS_MENU_LINKS - "@PROJECT_MANUAL_DIRECTORY_URL@/@PROJECT_MANUAL@" "WSJT-X Documentation" - "@PROJECT_HOMEPAGE@" "WSJT-X Web Site" + "@PROJECT_MANUAL_DIRECTORY_URL@/@PROJECT_MANUAL@" "@PROJECT_NAME@ Documentation" + "@PROJECT_HOMEPAGE@" "@PROJECT_NAME@ Web Site" ) # Use the icon from wsjtx for add-remove programs set (CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\wsjtx.exe") @@ -53,6 +53,7 @@ if ("${CPACK_GENERATOR}" STREQUAL "PackageMaker") endif () if ("${CPACK_GENERATOR}" STREQUAL "DragNDrop") + set (CPACK_DMG_VOLUME_NAME "@PROJECT_NAME@") set (CPACK_DMG_BACKGROUND_IMAGE "@PROJECT_SOURCE_DIR@/icons/Darwin/DragNDrop Background.png") set (CPACK_DMG_DS_STORE "@PROJECT_SOURCE_DIR@/Darwin/wsjtx_DMG.DS_Store") set (CPACK_BUNDLE_NAME "@WSJTX_BUNDLE_NAME@") diff --git a/CMakeLists.txt b/CMakeLists.txt index 45a08024c..529544249 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,15 +5,16 @@ project (wsjtx C CXX Fortran) # # project information # +set (PROJECT_NAME "WSJT-X") set (PROJECT_VENDOR "Joe Taylor, K1JT") set (PROJECT_CONTACT "Joe Taylor ") set (PROJECT_COPYRIGHT "Copyright (C) 2001-2014 by Joe Taylor, K1JT") set (PROJECT_HOMEPAGE "http://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html") set (PROJECT_MANUAL wsjtx-main.html) set (PROJECT_MANUAL_DIRECTORY_URL http://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc) -set (PROJECT_SUMMARY_DESCRIPTION "WSJT-X - JT9 and JT65 Modes for LF, MF and HF Amateur Radio.") +set (PROJECT_SUMMARY_DESCRIPTION "${PROJECT_NAME} - JT9 and JT65 Modes for LF, MF and HF Amateur Radio.") set (PROJECT_DESCRIPTION "${PROJECT_SUMMARY_DESCRIPTION} - WSJT-X implements JT9, a new mode designed especially for the LF, MF, + ${PROJECT_NAME} implements JT9, a new mode designed especially for the LF, MF, and HF bands, as well as the popular mode JT65. Both modes were designed for making reliable, confirmed QSOs under extreme weak-signal conditions. They use nearly identical message structure @@ -27,14 +28,14 @@ set (PROJECT_DESCRIPTION "${PROJECT_SUMMARY_DESCRIPTION} As many as 100 JT9 signals can fit into the same space, without overlap. . - WSJT-X offers a “bi-lingual“ operating mode in which you can transmit + ${PROJECT_NAME} offers a “bi-lingual“ operating mode in which you can transmit and receive JT65 and JT9 signals, switching between modes automatically as needed. Displayed bandwidth can be as large as 5 kHz. If your receiver has as upper-sideband filter at least 4 kHz wide, you can have all the typical JT65 and JT9 activity on screen at once, available for making QSOs with a click of the mouse. Even with standard SSB-width IF filters, switching between JT65 and JT9 modes - is quick and convenient. Be sure to read the online WSJT-X User's + is quick and convenient. Be sure to read the online ${PROJECT_NAME} User's Guide.") set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMake/Modules) @@ -495,7 +496,7 @@ FortranCInterface_HEADER (FC.h MACRO_NAMESPACE "FC_" SYMBOL_NAMESPACE "FC_" add_custom_target (user_manual ALL # OUTPUT contrib/${PROJECT_MANUAL} ${CMAKE_COMMAND} -D URL=${PROJECT_MANUAL_DIRECTORY_URL} -D NAME=${PROJECT_MANUAL} -P ${CMAKE_SOURCE_DIR}/CMake/download_html_manual.cmake - COMMENT "Downloading WSJT-X HTML manual" + COMMENT "Downloading ${PROJECT_NAME} HTML manual" VERBATIM ) @@ -702,7 +703,7 @@ set_target_properties (wsjtx PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING "v${wsjtx_VERSION}" MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${wsjtx_VERSION}" - MACOSX_BUNDLE_BUNDLE_NAME "WSJT-X" + MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}" MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}" ) diff --git a/Darwin/wsjtx_DMG.DS_Store b/Darwin/wsjtx_DMG.DS_Store index ae14cb10c969fe7eb2d92afc1ed0295b89214e6b..15d5d90ce094ad462ba2252ae0f95c892ae385dd 100644 GIT binary patch delta 1909 zcmeH{O-vg{6vyAd0#4Jy`b(Ivc$J_uX>C~J_3k22V+=uQA{wN)4XCQfu6H59j@LDq zfT&}uLh7Z8WDSaXFG>zQfW)cFp&W9^AqO9FOm30dLlaqQB2^KBzOkojM0@DHebV#( zX6E_LoB6-pjn$3SosdYjX;@5!0_*D$Sq(|buvQF7>#80@jtv)!E;Mn^mBcE+v)o`EMT3!=NoBWe3_<~d`~{Yz0Sfpn1VUD4n_DDzK3mi0FU4q{0s-A zjd)2f=_4n|`$Q%~WQ0tRDe?)KCZ7t&1P{II4|;p*bq?eb3Au6A#7BSe>!tAO-wK00 zj6FC!JY?tE5db>yDTn~0_+-|CT&@#-QY@D3#? z!LNMa!G*`1y~s~FOUMCM30hnN&^ePTz{C11CPm(7s-Tr?02lbiIK=kCGp8G8Zh2}t zPP*30;sjB~-^#Ld@^_4GW1*Ot3xe`B#$1?k=Le*p{?IwnHH{0`&~xb64VVXD?8n#3 z2lTL08HaQ;n|o`az{=`JXW0{K?EJVI(Zkw#c_JJgij9T!$%GzGXk*&sur5!IMH6%- zu<4(`;3WDr^c?yI`X&u_eICo*Kh1W4085EgKE#zL=+Dt#p$oX55B=>D(saA)r!$e1 zX{(B5DQZMjEyXf)J7OwYY&asziX1bCtW+c-8!39Xd)B2InkJ777HHMiP2D|bOIw(m z8PmR>U-eP#C-^+myY^=ca*nebd5bfXdxJBRdy}(-T;(hybBRkp_V7yhf}1ff$b)S0 z`J;W{s;kjxV0QmU-Zy+X8;uS%+z4Zt>i=B)hxKm#ch%FS-e~+?Y^nfyKY!lC)C9}a z4bz&RmrYGhX_ls#(UhT>x~kijE}QdFRWmd>s?S@ff04{6luNs9(i>qi fK8uN%{r^d*Uqf8_Pka)j%INW3>CAI)rQH4pDUM;) delta 2011 zcmeH{&1)M+6u{rw>sl>Iz51|a%XYNHG1#p>c2~QS78Mff!%aZO35d`TioIH`99xQ3 zk>p50b>z0W^pRfk#9M#^L+qdAh4=mEoX~n7J&VMJmjV(#ysPm$zw~LGpp%^m5RAu$|cOA zS&0|d4f3PiM;7eYwRekJ)+jEP;%2R8UcR7JDq3m9h+kXchN_p$`Wf9Uovj#GSB?7A z$w#;m%A&o$+v2wmV5DAMt2O*$Kn@80iZ1z+TBW{P>dt7VtLMlS$3lO)dWL-G@GcxS znFAX@J8jJ2GCO4znL+J?>6dRojyjcK07jq=Rak=>G{6rc1VBa=kSm~rgl!Tu9zJc$d1HZx(hGCq{1k1Ctti;CHBs2VS zK)%^S;E;DIpF-ZI3_QTufnKK%`BSum(gF@Ut}bInkpH0UK)z4eiTr>vk33^}f^v!n zI8B*p1BRq09P*J~?ZDL%(I>NdGKdQrLa zblTb#MlF+gkPeRgjQSXr#XICeJ%Reng?q2<6MpRWOi0D+nHO`46qfN3h>DUbDN0z; zBN0uLWkJ;CycSkeGU&NrQ}U`FiUrrn*DeqFz%$$0Mf;Xml^~;iOJ1ym4E=9qA82x{ zX5n)RRRe`m>Wu4Df{ECBz-hh=gZ Q3*w~@3;rM7VP+WDU+UC