Pantyhose-X
/
LibreWeb-Browser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve packaging

master
Melroy van den Berg 2021-02-28 23:37:26 +01:00
parent 3ce234e989
commit 742a59c04f
6 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -49,9 +49,9 @@ upload_and_release:
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/browser-v${CI_COMMIT_TAG}.deb ${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.deb'
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/browser-v${CI_COMMIT_TAG}.rpm ${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.rpm'
- 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file build_prod/browser-v${CI_COMMIT_TAG}.tar.gz ${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.tar.gz'
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Debian/Ubuntu/Linux Mint)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.deb\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Red-Hat/Fedora/openSUSE)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.rpm\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Compressed binary)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.tar.gz\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Red-Hat/Fedora/openSUSE)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.rpm\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
- 'curl --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" --header "Content-Type: application/json" --request POST --data "{\"name\":\"DWeb Browser (Debian/Ubuntu/Linux Mint)\",\"url\":\"${PACKAGE_REGISTRY_URL}/browser-v${CI_COMMIT_TAG}.deb\",\"link_type\":\"package\"}" ${RELEASE_LINKS_URL}'
#release:
# stage: release

19
cmake/packaging.cmake
View File

@ -1,6 +1,6 @@
# Example: https://github.com/MariaDB/server/tree/10.5/cmake
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Browser - Decentralized WWW")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "DWeb Browser - Decentralized Web-Browser")
set(CPACK_PACKAGE_VENDOR "Melroy van den Berg")
set(CPACK_PACKAGE_CONTACT "Melroy van den Berg <melroy@melroy.org>")
set(CPACK_PACKAGE_HOMEPAGE_URL "https://melroy.org")
@ -8,8 +8,8 @@ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_TARGET}-${CPACK_PACKAGE_VERSION}")
set(CPACK_DEBIAN_PACKAGE_SECTION "utils") # Change
set(CPACK_RPM_PACKAGE_GROUP "Applications/Productivity") # Change
set(CPACK_DEBIAN_PACKAGE_SECTION "web")
set(CPACK_RPM_PACKAGE_GROUP "Applications/Internet")
set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-v${CPACK_PACKAGE_VERSION}") # Without '-Linux' suffix
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND EXISTS "/etc/os-release")
@ -27,18 +27,19 @@ endif ()
if(${LINUX_DISTRO} MATCHES "openSUSE")
# OpenSuse/Leap
set(CPACK_RPM_PACKAGE_REQUIRES "") # Change
set(CPACK_RPM_PACKAGE_REQUIRES "gtkmm3")
else()
# Redhat/CentOS/Fedora/etc.
set(CPACK_RPM_PACKAGE_REQUIRES "") # Change
set(CPACK_RPM_PACKAGE_REQUIRES "gtkmm30")
endif()
# Optional RPM packages
set(CPACK_RPM_PACKAGE_SUGGESTS "") # Change
set(CPACK_RPM_PACKAGE_SUGGESTS "")
# Debian/Ubuntu/Mint Mint
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5widgets5")
# Debian Jessie/Ubuntu Trusty/Mint Qiana (libgtkmm-3.0-1) or
# Debian Stretch, Buster or newer, Ubuntu Xenial, Artful, Bionic or newer, Linux Mint Sarah, Tessa, Tina or newer (libgtkmm-3.0-1v5)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtkmm-3.0-1 | libgtkmm-3.0-1v5")
# Optional deb packages
set(CPACK_DEBIAN_PACKAGE_SUGGESTS "") # Change
set(CPACK_DEBIAN_PACKAGE_SUGGESTS "")
# include CPack model once all variables are set
include(CPack)

10
misc/browser.desktop
View File

@ -1,10 +0,0 @@
[Desktop Entry]
Name=Browser
Comment=Decentralized WWW
Exec=/usr/bin/browser
Terminal=false
Type=Application
StartupNotify=true
Icon=browser
Categories=Settings;Utility;
Keywords=Browser;Internet;WWW

0
images/browser_logo.xcf → misc/browser_logo.xcf
View File

10
misc/dweb-browser.desktop Normal file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=DWeb Browser
Comment=Decentralized Web-Browser
Exec=/usr/bin/browser
Terminal=false
Type=Application
StartupNotify=true
Icon=browser
Categories=Network;WebBrowser
Keywords=Browser;Internet;WWW;Decentralized;Web

4
src/CMakeLists.txt
View File

@ -105,3 +105,7 @@ target_link_directories(${PROJECT_TARGET} PRIVATE
target_link_libraries(${PROJECT_TARGET} PRIVATE LibCommonMarker LibCommonMarkerExtensions ipfs-http-client Threads::Threads ${CXX_FILESYSTEM_LIBRARIES} ${GTKMM_LIBRARIES} ${CAIRO_LIBRARIES} nlohmann_json::nlohmann_json)
install(TARGETS ${PROJECT_TARGET} RUNTIME DESTINATION "bin" COMPONENT applications)
install(FILES misc/dweb-browser.desktop DESTINATION share/applications)
install(DIRECTORY images DESTINATION share/dweb-browser)
#install(FILES images/dweb-browser.png DESTINATION share/icons/hicolor/48x48/apps)
#install(FILES images/dweb-browser.svg DESTINATION share/icons/hicolor/scalable/apps)