MacOSX bundle check

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>

Author: Ho-Ro

.travis.yml

@@ -40,9 +40,9 @@ script:
     - if test -d openhantek/OpenHantek.app; then
           export PATH=${CMAKE_PREFIX_PATH}/bin:${PATH} ;
           cd openhantek ;
-          macdeployqt OpenHantek.app -always-overwrite -verbose=2 ;
+          macdeployqt OpenHantek.app -always-overwrite -verbose=1 ;
           python ../../utils/macdeployqtfix/macdeployqtfix.py OpenHantek.app/Contents/MacOS/OpenHantek ${CMAKE_PREFIX_PATH} ;
-          create-dmg --volname OpenHantek OpenHantek.dmg OpenHantek.app ;
+          create-dmg --volname OpenHantek --volicon ../../openhantek/res/images/openhantek.icns --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "OpenHantek.app" 200 190 --hide-extension "OpenHantek.app" --app-drop-link 600 185 --eula ../../LICENSE OpenHantek.dmg OpenHantek.app ;
           ls -lhAFRO@ OpenHantek.* ;
           xattr -l OpenHantek.dmg ;
           cd .. ;

LICENSE

@@ -0,0 +1,2 @@
+This work is released under the terms of the GNU General Public License, version 3.
+The full text of the license can be found at https://www.gnu.org/licenses/gpl-3.0.html

cmake/CPackInfos.cmake

@@ -10,22 +10,24 @@ if (GIT_EXECUTABLE AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
         COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         RESULT_VARIABLE CMD_RESULT
-        # OUTPUT_VARIABLE VCS_REVISION
+        OUTPUT_VARIABLE VCS_REVISION
         OUTPUT_STRIP_TRAILING_WHITESPACE
         )
 endif()
+# message( STATUS "VCS_REVISION: ${VCS_REVISION}" )
 
 if(NOT DEFINED CMD_RESULT)
     set(VCS_BRANCH "master")
     set(GIT_COMMIT_HASH "1")
-    # set(VCS_REVISION "na")
+    set(VCS_REVISION "na")
 else()
     execute_process(
         COMMAND git log -1 --format=%h
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE GIT_COMMIT_HASH
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+    # message( STATUS "GIT_COMMIT_HASH: ${GIT_COMMIT_HASH}" )
 
     execute_process(
         COMMAND ${GIT_EXECUTABLE} status
@@ -41,7 +43,7 @@ else()
     string(REPLACE " " ";" DESCRIBE_STATUS ${DESCRIBE_STATUS})
     list(GET DESCRIBE_STATUS 2 VCS_BRANCH)
 
-    message(STATUS "Branch: ${VCS_BRANCH}") # /${VCS_REVISION}")
+    # message(STATUS "Branch: ${VCS_BRANCH}") # /${VCS_REVISION}")
 
     execute_process(
         COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
@@ -50,6 +52,7 @@ else()
         OUTPUT_VARIABLE VCS_URL
         OUTPUT_STRIP_TRAILING_WHITESPACE
         )
+    # message( STATUS "VCS_URL: ${VCS_URL}")
 
     set(ENV{LANG} "en_US")
     if(GIT_VERSION_STRING VERSION_LESS 2.6)

cmake/OpenHantekBundleInfo.plist.in

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+    <key>CFBundleGetInfoString</key>
+    <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+    <key>CFBundleIconFile</key>
+    <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleLongVersionString</key>
+    <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+    <key>CFBundleName</key>
+    <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>CFBundleVersion</key>
+    <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+    <key>CSResourcesFileMapped</key>
+    <true/>
+    <key>NSHumanReadableCopyright</key>
+    <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+    <key>NSHighResolutionCapable</key>
+    <string>True</string>
+</dict>
+</plist>

openhantek/CMakeLists.txt

@@ -31,17 +31,31 @@ add_custom_target(format SOURCES ".clang-format"
 include(translations/Translations.cmake)
 
 add_definitions(-DVERSION="${CPACK_PACKAGE_VERSION}")
+message( STATUS "VERSION: ${CPACK_PACKAGE_VERSION}" )
 
-option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" ON)
 set(EXECTYPE "")
 if(WIN32 AND MINGW)
     set(EXECTYPE WIN32)
 endif()
-if(APPLE AND BUILD_MACOSX_BUNDLE)
-    set(EXECTYPE MACOSX_BUNDLE)
-    set(MACOSX_BUNDLE_ICON_FILE openhantek.icns)
-    set(ICONS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/openhantek.icns)
-    set_source_files_properties(${ICONS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+
+# Enable MacOSX bundle magic in the next line
+option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" ON)
+#
+if( APPLE AND BUILD_MACOSX_BUNDLE )
+    # Use own template that defines NSPrincipalClass=NSApplication & NSHighResolutionCapable=True
+    set( MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_LIST_DIR}/../cmake/OpenHantekBundleInfo.plist.in )
+    #
+    set( EXECTYPE MACOSX_BUNDLE )
+    set( MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}" )
+    set( MACOSX_BUNDLE_INFO_STRING "Digital oscilloscope software for Hantek DSO6022" )
+    set( MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_NAME}" )
+    set( MACOSX_BUNDLE_SHORT_VERSION_STRING ${DATE_VERSION} )
+    set( MACOSX_BUNDLE_BUNDLE_VERSION ${CPACK_PACKAGE_VERSION} )
+    string(TIMESTAMP THISYEAR "%Y")
+    set( MACOSX_BUNDLE_COPYRIGHT "(C) 2012-${THISYEAR} OpenHantek community" )
+    set( MACOSX_BUNDLE_ICON_FILE openhantek.icns )
+    set( ICONS ${CMAKE_CURRENT_SOURCE_DIR}/res/images/openhantek.icns )
+    set_source_files_properties( ${ICONS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" )
 endif()
 
 # make executable
@@ -77,15 +91,15 @@ endif()
 
 # install commands
 if (APPLE AND BUILD_MACOSX_BUNDLE)
-    set_target_properties(${PROJECT_NAME} PROPERTIES
-        MACOSX_BUNDLE_NAME "${PROJECT_NAME}"
-        MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_NAME}"
-    )
+    # set_target_properties(${PROJECT_NAME} PROPERTIES
+    #    MACOSX_BUNDLE_NAME "${PROJECT_NAME}"
+    #    # MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_NAME}"
+    # )
     # no install, it's already in openhantek/OpenHantek.app/...
     # install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.app/Contents/MacOS/${PROJECT_NAME})
     # install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION ${CMAKE_BINARY_DIR}) # -> build
 else()
-	install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin")
+    install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "bin")
 endif()
 include(../cmake/copy_qt5_dlls_to_bin_dir.cmake)
 

openhantek/src/OH_BUILD.h

@@ -1,2 +1,2 @@
 // Do not edit, will be re-created at each commit!
-#define OH_BUILD "20191105 build 539"
+#define OH_BUILD "20191106 build 540"