New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[cmake/cpack] Debian packages generation #9987
Conversation
@@ -38,98 +38,273 @@ configure_file(${CORE_SOURCE_DIR}/tools/Linux/kodi-standalone.sh.in | |||
# Configure cmake files | |||
configure_file(${PROJECT_SOURCE_DIR}/KodiConfig.cmake.in | |||
${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cmake @ONLY) | |||
configure_file(${PROJECT_SOURCE_DIR}/XBMCConfig.cmake.in | |||
${CORE_BUILD_DIR}/scripts/XBMCConfig.cmake @ONLY) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
as for generating changelog. I use this simple bash function: https://github.com/wsnipex/xbmc-packaging-ws/blob/master/buildscripts/buildfromgit.sh#L151-L172 |
33cf0a6
to
afe5d12
Compare
Second iteration:
@wsnipex, any reason why nightly packages use |
aef1f75
to
4d50414
Compare
Do not merge this. |
256f62f
to
7896955
Compare
If no objections, this is going in tonight. |
if(CMAKE_BUILD_TYPE STREQUAL Debug) | ||
set(PACKAGE_NAME_VERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}~git${PACKAGE_TIMESTAMP}-${RELEASE_IDENTIFIER}-${DISTRO_CODENAME}) | ||
else() | ||
set(PACKAGE_NAME_VERSION ${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}~git${PACKAGE_TIMESTAMP}-${RELEASE_IDENTIFIER}-${DISTRO_CODENAME}) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Sorry that it took so long to review. Great work! (found mostly minors, but it would be great if you could fix the find modules) |
Fixed cmake minors. Thanks for the review! |
Minors addressed, Find modules rewritten and retested locally and with jenkins |
This is the work to generate debian packages with our shiny CMake/CPack system.
It currently generates deb packages following stable, unstable or nightly release conventions for name/version:
kodi-bin_16.1
git20160425.1001-final-0xenial_amd64.deb / 2:16.1git20160425.1001-final-0xenialkodi-bin_17.0
git20160703.1014-alpha2-0xenial_amd64.deb / 2:17.0git20160703.1014-alpha2-0xenialkodi-bin_17.0
git20160714.0200-b0970fe-0xenial_amd64.deb / 2:17.0git20160714.0200-b0970fe-0xenialPackages currently generated
kodi
kodi-addon-dev
kodi-audio-dev
kodi-bin
kodi-eventclients-common
kodi-eventclients-dev
kodi-eventclients-ps3
kodi-eventclients-j2mekodi-eventclients-wiiremote
kodi-eventclients-xbmc-send
kodi-inputstream-dev
kodi-pvr-dev
kodi-screensaver-dev
kodi-tools-texturepacker
kodi-visualization-dev
xbmcremovedDesign decisions
CPackConfig.cmake file contains variables and logic common to all generators (DEB/RPM/NSIS/etc.)In turn CPackConfigDEB.cmake is the only file calling CPackConfig.cmakeCPACK_DEBIAN_component_name_FILE_NAME
. It will work with lower versions but resulting package names are meh.Todo
Generate xbmc -> kodi symlinks and add them to packagessymlinks removed. They mess cpack DEB generation and xbmc to kodi transition as lasted long enough.Generate kodi-eventclients-j2me package (I saw that j2me-remote needs ant and immediately lost motivation. 😉 I'm sure I'll find it again after I'm done with all the TODOs)Support for this client was removed in [eventclients] Nuke J2ME #10049As always opinions are welcome.
cc/ @wsnipex, @fetzerch, @notspiff and anyone else interested