Skip to content

Commit

Permalink
chores
Browse files Browse the repository at this point in the history
: update packaging
  • Loading branch information
jmuelbert committed Nov 7, 2024
1 parent 80f8086 commit 4e526de
Show file tree
Hide file tree
Showing 13 changed files with 143 additions and 129 deletions.
73 changes: 0 additions & 73 deletions packaging/conanfile.py

This file was deleted.

32 changes: 0 additions & 32 deletions packaging/flatpak/org.jmuelbert.jmbde-QT.yml

This file was deleted.

1 change: 0 additions & 1 deletion packaging/linux/BUILDVERSION

This file was deleted.

62 changes: 62 additions & 0 deletions packaging/linux/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
install(
FILES com.jmuelbert.jmbde.desktop
DESTINATION ${CMAKE_INSTALL_DATADIR}/applications/
COMPONENT jmbde_Flatpak
)
install(
FILES com.jmuelbert.jmbde.metainfo.xml
DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo
COMPONENT jmbde_Flatpak
)
install(
FILES com.jmuelbert.jmbde.svg
DESTINATION $(CMAKE_INSTALL_DATADIR)/icons/hicolor/scalable/apps/
COMPONENT jmbde_Flatpak
)

if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
set(CPACK_GENERATOR "ZIP")
else()
set(CPACK_GENERATOR "TZST")
endif()

set(CPACK_COMPONENTS_ALL jmbde_Runtime jmbde_Development)
set(CPACK_ARCHIV_COMPONENT_INSTALL yes)
set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE)

set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})

set(CPACK_PACKAGE_NAME jmbde)
set(CPACK_PACKAGE_VENDOR "Jürgen Mülbert")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The jmbde (QT) application")
set(CPACK_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
set(CPACK_FILE_NAME
jmbde-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH})
set(CPACK_PROJECT_CONFIG_FILE ${CMAKE__CURRENT_LIST_DIR}/cpackGeneratorOverride.cmake)
set(CPACK_STRIP_FILES yes)
set(CPACK_THREADS 0)
set(CPACK_VERBATIM_VARIABLES yes)

set(CPACK_SOURCE_IGNORE_FILES /\\.git/ \\.swp \\.orig /CMakeLists\\.txt\\.user /build/)

include(CPack)

cpack_add_component(
jmbde_Runtime
DISPLAY_NAME Runtime
DESCRIPTION "Shared libraries and executables"
REQUIRED
INSTALL_TYPES Full Developer Minimal)
)
cpack_add_component(
jmbde_Development
DISPLAY_NAME "Developer pre-requisites"
DESCRIPTION "Headers/static libs needed for building"
INSTALL_TYPES Full Developer
)

cpack_add_install_type(Full)
cpack_add_install_type(Minimal)
cpack_add_install_type(Developer)
1 change: 0 additions & 1 deletion packaging/linux/VERSION

This file was deleted.

10 changes: 10 additions & 0 deletions packaging/linux/com.jmuelbert.jmbde.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Desktop Entry]
Type=Application
Name=jmbde
Exec=/app/bin/jmbde
Comment=Add Persons and devices to a company database
Icon=com.jmuelbert.jmbde
StartupWMClass=jmbde
Terminal=false
Categories=Business;Qt
Keywords=jmbde;business
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,38 @@ SPDX-FileCopyrightText: none
SPDX-License-Identifier: CC0-1.0
-->
<component type="desktop-application">
<id>org.jmuelbert.jmbde</id>
<id>com.jmuelbert.jmbde</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<content_rating type="oars-1.1" />
<name>jmbde</name>
<releases>
<release version="0.4.7" date="2018-11-22" />
<release version="0.5.2" date="2020-03-21" />
<release version="0.5.4" date="2020-12-31" />
</releases>
<summary>Simply BDE</summary>
<developer id="jmuelbert">
<name>Jürgen Mülbert</name>
</developer>
<update_contact>juergen.muelbert@outlook.de</update_contact>
<description>
<p>
Collect data of a company. Computers, Printer and Phones
</p>
</description>
<content_rating type="oars-1.1" />
<translation type="qt">jmbde</translation>
<launchable type="desktop-id">com.jmuelbert.jmbde.desktop</launchable>
<url type="bugtracker">https://github.com/jmuelbert/jmbde-QT/íssues</url>
<url type="homepage">https://github.com/jmuelbert/jmbde-QT</url>
<url-type="vcs-browser">https://github.com/jmuelbert/jmbde-QT</url-type>
<!-- screenshots>
<screenshot></screenshot>
<screenshot type="default">
<image>https://raw.github.com/jmuelbert/jmbde-QT/refs/heads/main/screenshots/jmbde%20QT%20Demo.png</image>
<caption>jmbde QT Application Window</caption>
</screenshot>
</screenshots -->
<url type="homepage">https://github.com/jmuelbert/jmbde-QT</url>
<update_contact>https://github.com/jmuelbert/jmbde-QT/issues/new</update_contact>
<launchable type="desktop-id">org.jmuelbert.jmbde.desktop</launchable>
<releases>
<release version="0.4.7" date="2018-11-22" >
<description>
<p>Initial Release</p>
</description>
<release version="0.5.2" date="2020-03-21" />
<release version="0.5.4" date="2020-12-31" />
</releases>
<translation type="qt">jmbde</translation>
</component>
File renamed without changes
45 changes: 45 additions & 0 deletions packaging/linux/com.jmuelbert.jmbde.ymal
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
id: com.jmuelbert.jmbde
runtime: org.kde.Platform
runtime-version: '6.7'
sdk: org.kde.Sdk
command: jmbde
finish-args:
- --socket=wayland
modules:
- name: microsoft-gsl
buildsystem: cmake-ninja
config-opts:
- -DGSL_TEST=no
cleanup:
- '*'
sources:
- type: git
url: https://github.com/microsoft/GSL.git
commit: a3534567187d2edc428efd3f13466ff75fe5805c
tag: v4.0.0
x-checker-data:
type: git
tag-pattern: "^v([\\d.]+)$"
- name: jmbde
buildsystem: simple
buildcommands:
- cmake --workflow --preset flatpak
- cmake --install build --component jmbde_Runtime --prefix="${FLATPAK_DEST}"
- cmake --instsll build --component jmbde_Flatpak --prefix="${FLATPAK_DEST}"
sources:
- type: dir
path: ..
skip:
- .cache
- .direnv
- .github
- .vscode
- build
- build-clang
- build-gcc
- build-coverage-clang
- build-dir
- repo



3 changes: 3 additions & 0 deletions packaging/linux/cpackGeneratorOverrides.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
if(CPACK_GENERATOR MATCHES "^(7Z|TBZ2|TGZ|TXZ|TZ|TZST|ZIP)$")
set(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY YES)
endif()
6 changes: 0 additions & 6 deletions packaging/linux/jmbde

This file was deleted.

4 changes: 0 additions & 4 deletions packaging/linux/qt.conf

This file was deleted.

Empty file added screenshots/.gitkeep
Empty file.

0 comments on commit 4e526de

Please sign in to comment.