From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Feb 2022 16:04:24 +0100 Subject: New upstream version 5.2.2GA --- distribution/posix/CMakeLists.txt | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'distribution/posix/CMakeLists.txt') diff --git a/distribution/posix/CMakeLists.txt b/distribution/posix/CMakeLists.txt index 3356005..6e44581 100644 --- a/distribution/posix/CMakeLists.txt +++ b/distribution/posix/CMakeLists.txt @@ -8,7 +8,12 @@ set(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}////xtrkcad-desc.txt") set(CPACK_PACKAGE_FILE_NAME "xtrkcad-setup-${XTRKCAD_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") -set(CPACK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} ) +if(XTRKCAD_PACKAGE_GA_RELEASE) + set(CPACK_INSTALL_PREFIX "/usr" ) +else() + set(CPACK_INSTALL_PREFIX "/usr/local" ) +endif() + set(CPACK_PACKAGING_INSTALL_PREFIX ${CPACK_INSTALL_PREFIX}) # get the specific configuration for each packager @@ -17,7 +22,7 @@ set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/package.txt) set(CPACK_PACKAGE_VENDOR "XTrackCAD Fork Project") # common dependencies for all Linux builds -set(CPACK_RPM_PACKAGE_REQUIRES "glibc gtk2 zip zlib") +set(CPACK_RPM_PACKAGE_REQUIRES "glibc gtk2 zlib") set(CPACK_RPM_BUILDREQUIRES "gcc, cmake >= 2.4.7, pkgconfig, gtk2-devel" @@ -31,6 +36,12 @@ if(NOT XTRKCAD_USE_BROWSER) # message(AUTHOR_WARNING "Add dependency to webkitgtk for viewing help!") endif() +#Add dependency to MiniXML (mxml) if configured +if(XTRKCAD_CREATE_SVG) + set(CPACK_RPM_PACKAGE_REQUIRES + "${CPACK_RPM_PACKAGE_REQUIRES} mxml") +endif() + # exclude these directories from the rpm set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/local" @@ -54,13 +65,23 @@ set(CPACK_DEBIAN_PACKAGE_VERSION "1:${XTRKCAD_VERSION}") set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "zip") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "xdg-utils") set(CPACK_DEBIAN_PACKAGE_MAINTAINER "xtrkcad@sillub.com") set(CPACK_PACKAGE_CONTACT "xtrkcad@sillub.com") -set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "XTrkCad description") +set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "XTrkCad supports any scale, has libraries of popular brands of \ +turnouts and sectional track (plus you add your own easily), can \ +automatically use spiral transition curves when joining track \ +XTrkCad lets you manipulate track much like you would with actual \ +flex-track to modify, extend and join tracks and turnouts. \ +Additional features include tunnels, 'post-it' notes, on-screen \ +ruler, parts list, 99 drawing layers, undo/redo commands, \ +benchwork, 'Print to BitMap', elevations, train simulation and \ +car inventory. \ +") + set(CPACK_DEBIAN_PACKAGE_SECTION "contrib/graphics") @@ -74,5 +95,7 @@ set(CPACK_PACKAGE_EXECUTABLES "xtrkcad;XTrkCad-5.2.1-Beta") set(CPACK_CREATE_DESKTOP_LINKS "xtrkcad") +set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm") + include(CPack) -- cgit v1.2.3 From a14a7a0ccc9de76aeab0b2e4bbf58f1a79deedc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 3 Jul 2024 10:19:30 +0200 Subject: New upstream version 5.3.0GA --- distribution/posix/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'distribution/posix/CMakeLists.txt') diff --git a/distribution/posix/CMakeLists.txt b/distribution/posix/CMakeLists.txt index 6e44581..f202791 100644 --- a/distribution/posix/CMakeLists.txt +++ b/distribution/posix/CMakeLists.txt @@ -8,10 +8,11 @@ set(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}////xtrkcad-desc.txt") set(CPACK_PACKAGE_FILE_NAME "xtrkcad-setup-${XTRKCAD_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}") -if(XTRKCAD_PACKAGE_GA_RELEASE) - set(CPACK_INSTALL_PREFIX "/usr" ) -else() +if(XTRKCAD_BETA MATCHES "-beta") set(CPACK_INSTALL_PREFIX "/usr/local" ) +else() + set(CPACK_INSTALL_PREFIX "/usr" ) + set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm") endif() set(CPACK_PACKAGING_INSTALL_PREFIX ${CPACK_INSTALL_PREFIX}) @@ -59,7 +60,7 @@ set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_SOURCE_DIR}////changelog.txt") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) -set(CPACK_DEBIAN_PACKAGE_NAME "XTrkCad") +set(CPACK_DEBIAN_PACKAGE_NAME "XTrkCad${XTRKCAD_BETA}") set(CPACK_DEBIAN_PACKAGE_VERSION "1:${XTRKCAD_VERSION}") @@ -95,7 +96,4 @@ set(CPACK_PACKAGE_EXECUTABLES "xtrkcad;XTrkCad-5.2.1-Beta") set(CPACK_CREATE_DESKTOP_LINKS "xtrkcad") -set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm") - include(CPack) - -- cgit v1.2.3