fix

vnotex · May 22, 2024 · 827af10 · 827af10
1 parent 7c3461a
commit 827af10
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -53,7 +53,7 @@ set(VX_RESOURCE_FILES data/core/core.qrc)
 qt_add_binary_resources(VX_EXTRA_RESOURCE data/extra/extra.qrc DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/vnote_extra.rcc
     OPTIONS -compress 9)
 
-add_executable(vnote WIN32 MACOSX_BUNDLE
+add_executable(vnote WIN32
     application.cpp application.h
     commandlineoptions.cpp commandlineoptions.h
     fakeaccessible.cpp fakeaccessible.h
@@ -122,19 +122,9 @@ if (WIN32)
     install(TARGETS vnote RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
     install(FILES "${PROJECT_SOURCE_DIR}/package/qt.conf" DESTINATION ${CMAKE_INSTALL_BINDIR})
 elseif(APPLE)
-    set(CMAKE_MACOSX_BUNDLE ON)
+    set(CMAKE_MACOSX_BUNDLE OFF)
     set(CMAKE_MACOSX_RPATH ON)
     install(TARGETS vnote BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-    set_target_properties(vnote
-        PROPERTIES
-        MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
-        MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}"
-        MACOSX_BUNDLE_GUI_IDENTIFIER "fun.vnote.app"
-        MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}"
-        MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}"
-        MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_VERSION}"
-        MACOSX_BUNDLE_COPYRIGHT "Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun"
-    )
 else()
     install(TARGETS vnote
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

diff --git a/src/CPackMacDeployQt.cmake.in b/src/CPackMacDeployQt.cmake.in
@@ -1,4 +1,4 @@
 execute_process(COMMAND "${MACDEPLOYQT_EXECUTABLE}" ${CMAKE_CURRENT_BINARY_DIR}/vnote.app -dmg
-    -always-overwrite -verbose=2
+    -always-overwrite -verbose=1
     WORKING_DIRECTORY ${CPACK_PACKAGE_DIRECTORY}
 )
diff --git a/src/Packaging.cmake b/src/Packaging.cmake
@@ -102,7 +102,7 @@ set(CPACK_WIX_UI_DIALOG "${PROJECT_SOURCE_DIR}/package/wix_dialog.png")
 set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/BundleConfig.cmake")
 
 add_custom_target(pack
-                  COMMAND ${CMAKE_CPACK_COMMAND} "--config" "${CMAKE_BINARY_DIR}/BundleConfig.cmake"
+                  COMMAND ${CMAKE_CPACK_COMMAND} "--config" "${CMAKE_BINARY_DIR}/BundleConfig.cmake" "--verbose"
                   COMMENT "Running CPACK. Please wait..."
                   DEPENDS vnote)
 add_dependencies(pack lrelease)

diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist
@@ -18,26 +18,26 @@
             </array>
         </dict>
     </array>
+    <key>CFBundleName</key>
+    <string>VNote</string>
     <key>CFBundleExecutable</key>
     <string>vnote</string>
     <key>CFBundleShortVersionString</key>
-    <string>3.17.0</string>
+    <string>3.17</string>
     <key>CFBundleVersion</key>
-    <string>3.17.0.1</string>
+    <string>3.17.0</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Created by VNoteX</string>
+    <string>Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun</string>
     <key>CFBundleIconFile</key>
     <string>vnote.icns</string>
     <key>CFBundleIdentifier</key>
     <string>fun.vnote.app</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.12</string>
+    <string>12.1</string>
     <key>NOTE</key>
-    <string>Visit [GitHub VNote](https://github.com/vnotex/vnote) for details.</string>
+    <string>A pleasant note-taking platform</string>
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
     <key>NSSupportsAutomaticGraphicsSwitching</key>