Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-11 10:45:39 +03:00
Code Issues Projects Releases Wiki Activity

change executable name to lower case

Browse Source
This commit is contained in:
Martin Marmsoler 2023-02-23 10:29:14 +01:00
parent 205506e0ba
commit 5b93e7e514
6 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -3,6 +3,8 @@ project(Gittyup)
# Set name and version. # Set name and version.
set(GITTYUP_NAME "Gittyup") set(GITTYUP_NAME "Gittyup")
set(GITTYUP_EXECUTABLE_NAME "gittyup")
set(GITTYUP_IDENTIFIER "com.github.Murmele.Gittyup")
set(GITTYUP_VERSION_MAJOR 1) set(GITTYUP_VERSION_MAJOR 1)
set(GITTYUP_VERSION_MINOR 2) set(GITTYUP_VERSION_MINOR 2)
set(GITTYUP_VERSION_PATCH 2) set(GITTYUP_VERSION_PATCH 2)

19
pack/CMakeLists.txt
View File

@ -205,13 +205,13 @@ if(UNIX AND NOT APPLE)
FILES ${RSRC_DIR}/Gittyup.iconset/icon_${icon}x${icon}.png FILES ${RSRC_DIR}/Gittyup.iconset/icon_${icon}x${icon}.png
DESTINATION share/icons/hicolor/${icon}x${icon}/apps DESTINATION share/icons/hicolor/${icon}x${icon}/apps
COMPONENT ${GITTYUP_NAME} COMPONENT ${GITTYUP_NAME}
RENAME ${GITTYUP_NAME}.png) RENAME ${GITTYUP_EXECUTABLE_NAME}.png)
endforeach() endforeach()
install( install(
FILES ${RSRC_DIR}/Gittyup.iconset/gittyup_logo.svg FILES ${RSRC_DIR}/Gittyup.iconset/gittyup_logo.svg
DESTINATION share/icons/hicolor/scalable/apps DESTINATION share/icons/hicolor/scalable/apps
COMPONENT ${GITTYUP_NAME} COMPONENT ${GITTYUP_NAME}
RENAME ${GITTYUP_NAME}.svg) RENAME ${GITTYUP_EXECUTABLE_NAME}.svg)
endif() endif()
# Sign bundle on macOS. # Sign bundle on macOS.
@ -236,9 +236,10 @@ elseif(WIN32)
set(CPACK_NSIS_CREATE_ICONS_EXTRA set(CPACK_NSIS_CREATE_ICONS_EXTRA
"CreateShortCut \ "CreateShortCut \
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${GITTYUP_NAME}.lnk\\\" \ \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${GITTYUP_NAME}.lnk\\\" \
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_NAME}.exe\\\"") \\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_EXECUTABLE_NAME}.exe\\\""
)
set(CPACK_NSIS_EXECUTABLES_DIRECTORY ${CMAKE_INSTALL_BINDIR}) set(CPACK_NSIS_EXECUTABLES_DIRECTORY ${CMAKE_INSTALL_BINDIR})
set(CPACK_NSIS_MUI_FINISHPAGE_RUN ${GITTYUP_NAME}.exe) set(CPACK_NSIS_MUI_FINISHPAGE_RUN ${GITTYUP_EXECUTABLE_NAME}.exe)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
install( install(
@ -275,16 +276,14 @@ set(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_BINARY_DIR} ${GITTYUP_NAME}
# Add Context Menu Shortcuts # Add Context Menu Shortcuts
if(WIN32) if(WIN32)
set(WINREGSTR_EXECUTABLE_PATH
'\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_NAME}.exe\\\"')
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS
"${CPACK_NSIS_EXTRA_INSTALL_COMMANDS} "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup' '' 'Open with Gittyup' WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup' '' 'Open with Gittyup'
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup' 'Icon' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_NAME}.exe\\\"' WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup' 'Icon' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_EXECUTABLE_NAME}.exe\\\"'
WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup\\\\command' '' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_NAME}.exe\\\" \\\"%V\\\"' WriteRegStr HKCR 'Directory\\\\Background\\\\shell\\\\Gittyup\\\\command' '' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_EXECUTABLE_NAME}.exe\\\" \\\"%V\\\"'
WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup' '' 'Open with Gittyup' WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup' '' 'Open with Gittyup'
WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup' 'Icon' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_NAME}.exe\\\"' WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup' 'Icon' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_EXECUTABLE_NAME}.exe\\\"'
WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup\\\\command' '' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_NAME}.exe\\\" \\\"%L\\\"'" WriteRegStr HKCR 'Directory\\\\shell\\\\Gittyup\\\\command' '' '\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\${GITTYUP_EXECUTABLE_NAME}.exe\\\" \\\"%L\\\"'"
) )
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS
"${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS} "${CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS}

2
rsrc/linux/com.github.Murmele.Gittyup.appdata.xml.in
View File

@ -45,7 +45,7 @@
<url type="donation">https://liberapay.com/Gittyup/donate</url> <url type="donation">https://liberapay.com/Gittyup/donate</url>
<provides> <provides>
<binary>Gittyup</binary> <binary>gittyup</binary>
<id>com.github.Murmele.Gittyup</id> <id>com.github.Murmele.Gittyup</id>
</provides> </provides>

4
rsrc/linux/com.github.Murmele.Gittyup.desktop
View File

@ -2,9 +2,9 @@
Encoding=UTF-8 Encoding=UTF-8
Name=Gittyup Name=Gittyup
Comment=Graphical Git client for Windows, Linux and macOS Comment=Graphical Git client for Windows, Linux and macOS
Exec=Gittyup Exec=gittyup
StartupWMClass=com.github.Murmele.Gittyup StartupWMClass=com.github.Murmele.Gittyup
Icon=Gittyup Icon=gittyup
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Development; Categories=Development;

6
src/app/Application.cpp
View File

@ -323,9 +323,9 @@ static MainWindow *openOrSwitch(QDir repo) {
} }
#if defined(Q_OS_LINUX) #if defined(Q_OS_LINUX)
#define DBUS_SERVICE_NAME "com.github.Murmele.Gittyup" #define DBUS_SERVICE_NAME GITTYUP_IDENTIFIER
#define DBUS_INTERFACE_NAME "com.github.Murmele.Gittyup.Application" #define DBUS_INTERFACE_NAME GITTYUP_DBUS_INTERFACE_NAME
#define DBUS_OBJECT_PATH "/com/github/Murmele/Gittyup/Application" #define DBUS_OBJECT_PATH GITTYUP_DBUS_OBJECT_PATH
DBusGittyup::DBusGittyup(QObject *parent) : QObject(parent) {} DBusGittyup::DBusGittyup(QObject *parent) : QObject(parent) {}

19
src/app/CMakeLists.txt
View File

@ -59,7 +59,13 @@ endif()
target_compile_definitions( target_compile_definitions(
app app
PUBLIC GITTYUP_NAME="${GITTYUP_NAME}" GITTYUP_VERSION="${GITTYUP_VERSION}" PUBLIC GITTYUP_NAME="${GITTYUP_NAME}"
GITTYUP_VERSION="${GITTYUP_VERSION}"
GITTYUP_IDENTIFIER="${GITTYUP_IDENTIFIER}"
GITTYUP_DBUS_INTERFACE_NAME
"${GITTYUP_IDENTIFIER}.Application"
GITTYUP_DBUS_OBJECT_PATH
"/com/github/Murmele/Gittyup/Application"
PRIVATE QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" PRIVATE QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"
BUILD_DESCRIPTION="${BUILD_DESCRIPTION}") BUILD_DESCRIPTION="${BUILD_DESCRIPTION}")
@ -104,8 +110,8 @@ endif()
target_link_libraries(gittyup app) target_link_libraries(gittyup app)
set_target_properties( set_target_properties(
gittyup PROPERTIES OUTPUT_NAME ${GITTYUP_NAME} RUNTIME_OUTPUT_DIRECTORY gittyup PROPERTIES OUTPUT_NAME ${GITTYUP_EXECUTABLE_NAME}
${CMAKE_BINARY_DIR}) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
if(WIN32) if(WIN32)
target_link_libraries(app Dbghelp.lib) target_link_libraries(app Dbghelp.lib)
@ -116,10 +122,11 @@ elseif(APPLE)
MACOSX_BUNDLE_INFO_PLIST ${RSRC_DIR}/Info.plist.in MACOSX_BUNDLE_INFO_PLIST ${RSRC_DIR}/Info.plist.in
MACOSX_BUNDLE_ICON_FILE ${GITTYUP_NAME} MACOSX_BUNDLE_ICON_FILE ${GITTYUP_NAME}
MACOSX_BUNDLE_BUNDLE_NAME ${GITTYUP_NAME} MACOSX_BUNDLE_BUNDLE_NAME ${GITTYUP_NAME}
MACOSX_BUNDLE_EXECUTABLE_NAME ${GITTYUP_EXECUTABLE_NAME}
MACOSX_BUNDLE_BUNDLE_VERSION ${GITTYUP_VERSION} MACOSX_BUNDLE_BUNDLE_VERSION ${GITTYUP_VERSION}
MACOSX_BUNDLE_LONG_VERSION_STRING ${GITTYUP_VERSION} MACOSX_BUNDLE_LONG_VERSION_STRING ${GITTYUP_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${GITTYUP_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${GITTYUP_VERSION}
MACOSX_BUNDLE_GUI_IDENTIFIER "com.Murmele.Gittyup") MACOSX_BUNDLE_GUI_IDENTIFIER ${GITTYUP_IDENTIFIER})
# Copy config files into bundle. # Copy config files into bundle.
set_source_files_properties( set_source_files_properties(
@ -202,12 +209,12 @@ else()
install( install(
FILES ${CMAKE_SOURCE_DIR}/rsrc/linux/com.github.Murmele.Gittyup.desktop FILES ${CMAKE_SOURCE_DIR}/rsrc/linux/com.github.Murmele.Gittyup.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
RENAME ${GITTYUP_NAME}.desktop) RENAME ${GITTYUP_EXECUTABLE_NAME}.desktop)
if(${GENERATE_APPDATA}) if(${GENERATE_APPDATA})
install( install(
FILES ${APPDATA} FILES ${APPDATA}
DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo
RENAME ${GITTYUP_NAME}.appdata.xml) RENAME ${GITTYUP_EXECUTABLE_NAME}.appdata.xml)
endif() endif()
endif() endif()