Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-10-05 14:37:31 +03:00
Code Issues Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Martin Marmsoler 2023-01-27 17:04:28 +01:00
parent bf6dc26f40
commit 1775ef4b0e
7 changed files with 94 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -136,15 +136,15 @@ if(APPLE)
endif()
if(APPLE)
set(CONTENTS_DIR ${GITTYUP_NAME}.app/Contents)
set(L10N_INSTALL_DIR ${CONTENTS_DIR}/Locale)
set(RESOURCES_DIR ${CONTENTS_DIR}/Resources)
set(CONTENTS_DIR ${GITTYUP_NAME}.app/Contents)
set(L10N_INSTALL_DIR ${CONTENTS_DIR}/Locale)
set(RESOURCES_DIR ${CONTENTS_DIR}/Resources)
elseif(UNIX)
set(L10N_INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${GITTYUP_NAME})
set(RESOURCES_DIR ${CMAKE_INSTALL_DATADIR}/${GITTYUP_NAME})
else()
set(L10N_INSTALL_DIR Resources/l10n)
set(RESOURCES_DIR Resources)
set(L10N_INSTALL_DIR Resources/l10n)
set(RESOURCES_DIR Resources)
endif()
add_subdirectory(dep)

1
dep/libgit2/CMakeLists.txt
View File

@ -33,7 +33,6 @@ if(WIN32)
endif()
if(NOT USE_SYSTEM_LIBGIT2)
set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${GITTYUP_NAME}test123)
add_subdirectory(libgit2)
target_include_directories(
git2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/libgit2/include)

5
pack/CMakeLists.txt
View File

@ -292,7 +292,10 @@ set(CPACK_PACKAGE_VERSION_PATCH ${GITTYUP_VERSION_PATCH})
if(WIN32)
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.md)
else()
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/Gittyup RENAME LICENSE)
install(
FILES ${CMAKE_SOURCE_DIR}/LICENSE.md
DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/Gittyup
RENAME LICENSE)
endif()
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})

72
rsrc/github-repository-open-graph-Gittyup.png.xmp Normal file
View File

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 4.4.0-Exiv2">
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<rdf:Description rdf:about=""
xmlns:exif="http://ns.adobe.com/exif/1.0/"
xmlns:xmp="http://ns.adobe.com/xap/1.0/"
xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
xmlns:darktable="http://darktable.sf.net/"
exif:DateTimeOriginal=""
xmp:Rating="1"
xmpMM:DerivedFrom="github-repository-open-graph-Gittyup.png"
darktable:import_timestamp="63810317507625743"
darktable:change_timestamp="-1"
darktable:export_timestamp="-1"
darktable:print_timestamp="-1"
darktable:xmp_version="5"
darktable:raw_params="0"
darktable:auto_presets_applied="1"
darktable:history_end="4"
darktable:iop_order_version="2"
darktable:history_basic_hash="adf93e2c7aefb698a6ff153e3fa7f0b8"
darktable:history_current_hash="adf93e2c7aefb698a6ff153e3fa7f0b8">
<darktable:masks_history>
<rdf:Seq/>
</darktable:masks_history>
<darktable:history>
<rdf:Seq>
<rdf:li
darktable:num="0"
darktable:operation="colorin"
darktable:enabled="1"
darktable:modversion="7"
darktable:params="gz48eJzjZBgFowABWAbaAaNgwAEAMNgADg=="
darktable:multi_name=""
darktable:multi_priority="0"
darktable:blendop_version="11"
darktable:blendop_params="gz14eJxjYIAACQYYOOHEgAZY0QVwggZ7CB6pfNoAAE8gGQg="/>
<rdf:li
darktable:num="1"
darktable:operation="colorout"
darktable:enabled="1"
darktable:modversion="5"
darktable:params="gz35eJxjZBgFo4CBAQAEEAAC"
darktable:multi_name=""
darktable:multi_priority="0"
darktable:blendop_version="11"
darktable:blendop_params="gz14eJxjYIAACQYYOOHEgAZY0QVwggZ7CB6pfNoAAE8gGQg="/>
<rdf:li
darktable:num="2"
darktable:operation="gamma"
darktable:enabled="1"
darktable:modversion="1"
darktable:params="0000000000000000"
darktable:multi_name=""
darktable:multi_priority="0"
darktable:blendop_version="11"
darktable:blendop_params="gz14eJxjYIAACQYYOOHEgAZY0QVwggZ7CB6pfNoAAE8gGQg="/>
<rdf:li
darktable:num="3"
darktable:operation="flip"
darktable:enabled="1"
darktable:modversion="2"
darktable:params="ffffffff"
darktable:multi_name=""
darktable:multi_priority="0"
darktable:blendop_version="11"
darktable:blendop_params="gz14eJxjYIAACQYYOOHEgAZY0QVwggZ7CB6pfNoAAE8gGQg="/>
</rdf:Seq>
</darktable:history>
</rdf:Description>
</rdf:RDF>
</x:xmpmeta>

14
src/app/CMakeLists.txt
View File

@ -208,10 +208,16 @@ execute_process(COMMAND
else()
# Windows and UNIX must be ./ otherwise it is interpreted as absolute path
if(UNIX)
install(FILES ${CMAKE_SOURCE_DIR}/rsrc/linux/com.github.Murmele.Gittyup.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications RENAME ${GITTYUP_NAME}.desktop)
if (${GENERATE_APPDATA})
install(FILES ${APPDATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo RENAME ${GITTYUP_NAME}.appdata.xml)
endif()
install(
FILES ${CMAKE_SOURCE_DIR}/rsrc/linux/com.github.Murmele.Gittyup.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
RENAME ${GITTYUP_NAME}.desktop)
if(${GENERATE_APPDATA})
install(
FILES ${APPDATA}
DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo
RENAME ${GITTYUP_NAME}.appdata.xml)
endif()
endif()
# Install config files.

5
src/conf/CMakeLists.txt
View File

@ -6,7 +6,6 @@ target_link_libraries(conf lua Qt5::Core util)
target_compile_definitions(
conf PRIVATE SCINTILLUA_LEXERS_DIR="${SCINTILLUA_LEXERS_DIR}")
target_compile_definitions(
conf PRIVATE CONF_DIR="${RESOURCES_DIR}"
L10N_DIR="${L10N_INSTALL_DIR}")
target_compile_definitions(conf PRIVATE CONF_DIR="${RESOURCES_DIR}"
L10N_DIR="${L10N_INSTALL_DIR}")
set_target_properties(conf PROPERTIES AUTOMOC ON)

2
src/conf/Settings.cpp
View File

@ -233,7 +233,7 @@ QDir Settings::confDir() {
QDir Settings::l10nDir() {
QDir dir = confDir();
if (!dir.cd("l10n"))
dir = QDir(L10N_DIR); // For debugging search in source dir
dir = QDir(L10N_DIR); // For debugging search in source dir
qDebug() << "l10n dir: " << dir;
return dir;