From 7382cf8d0be3465640cd558dcfffd79116c09882 Mon Sep 17 00:00:00 2001 From: Dustin Polke Date: Mon, 10 Oct 2011 14:21:25 +0200 Subject: cairo-dock.eclass: Add support for CMakeLists-{CD_PV_MAJ_MIN_MIC}-.txt. --- eclass/cairo-dock.eclass | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'eclass') diff --git a/eclass/cairo-dock.eclass b/eclass/cairo-dock.eclass index 9f20217..3851474 100644 --- a/eclass/cairo-dock.eclass +++ b/eclass/cairo-dock.eclass @@ -62,7 +62,8 @@ S="${WORKDIR}"/${CD_P} # @DESCRIPTION: # For plugins, unpack only code for plugins to be build; otherwise run # default_src_unpack. -# Don't unpack CMakeLists.txt if ${FILESDIR}/${P}-CMakeLists.txt exists. +# Don't unpack CMakeLists.txt if ${FILESDIR}/${P}-CMakeLists.txt or +# ${FILESDIR}/${PN}-${CD_PV_MAJ_MIN_MIC}-CMakeLists.txt exist. cairo-dock_src_unpack() { if [ "${CD_TYPE}" == "plug-ins" ]; then local target targets @@ -71,7 +72,8 @@ cairo-dock_src_unpack() { for target in ${CD_PLUGINS[@]}; do targets+=( "${CDP_P}/${target}" ) done - [ ! -f "${FILESDIR}"/${P}-CMakeLists.txt ] && \ + [ ! -f "${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN_MIC}-CMakeLists.txt -a \ + ! -f "${FILESDIR}"/${P}-CMakeLists.txt ] && targets+=( "${CDP_P}/CMakeLists.txt" ) einfo tar xzf "${DISTDIR}"/${CDP_P}.tar.gz ${targets[@]} tar xzf "${DISTDIR}"/${CDP_P}.tar.gz ${targets[@]} || die @@ -82,15 +84,23 @@ cairo-dock_src_unpack() { # @FUNCTION: cairo-dock_src_unpack # @DESCRIPTION: -# Apply CMakeLists.patch if it exists, and -# use ${FILESDIR}/${P}-CMAkeLists.txt if exits. +# Apply CMakeLists.patch if it exists, and use ${FILESDIR}/${P}-CMakeLists.txt +# or ${FILESDIR}/${PN}-${CD_PV_MAJ_MIN_MIC}-CMakeLists.txt if they exit. # Enable verbose building. cairo-dock_src_prepare() { if [ -f "${FILESDIR}"/${P}-CMakeLists.patch ]; then epatch "${FILESDIR}"/${P}-CMakeLists.patch else - einfo "Copy CMakeLists.txt from '${FILESDIR}'" - cp {"${FILESDIR}"/${P}-,"${S}"/}CMakeLists.txt || die + if [ -f "${FILESDIR}"/${P}-CMakeLists.txt ]; then + einfo "Copying ${P}-CMakeLists.txt from '${FILESDIR}'..." + cp {"${FILESDIR}"/${P}-,"${S}"/}CMakeLists.txt || die + else + einfo "Copying ${PN}-${CD_PV_MAJ_MIN_MIC}-CMakeLists.txt from '${FILESDIR}'..." + cp {"${FILESDIR}"/${PN}-${CD_PV_MAJ_MIN_MIC}-,"${S}"/}CMakeLists.txt || die + einfo "Adjusting version to $(replace_version_separator 3 '~' )..." + sed -e "s/@CD_VER@/$(replace_version_separator 3 '~' )/" \ + -i "${S}"/CMakeLists.txt + fi fi mycmakeargs=( "-DCMAKE_VERBOSE_MAKEFILE=TRUE" ) } -- cgit v1.2.3-65-gdbad