From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A73E8138247 for ; Mon, 11 Nov 2013 15:33:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38696E0BD3; Mon, 11 Nov 2013 15:33:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4631EE0BCA for ; Mon, 11 Nov 2013 15:33:02 +0000 (UTC) Received: from [192.168.1.11] (unknown [80.80.98.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: pinkbyte) by smtp.gentoo.org (Postfix) with ESMTPSA id AE3CF33E7AF; Mon, 11 Nov 2013 15:33:00 +0000 (UTC) Message-ID: <5280F8A6.6040503@gentoo.org> Date: Mon, 11 Nov 2013 19:32:54 +0400 From: Sergey Popov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131005 Thunderbird/17.0.9 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 To: gentoo-dev@lists.gentoo.org CC: Davide Pesavento Subject: [gentoo-dev] qmake-utils.eclass: new eclass with eqmake4/eqmake5 functions X-Enigmail-Version: 1.5.2 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3xqLPHak3et7rwLocXJBSMb3hgeAw436c" X-Archives-Salt: 60486114-34e4-4e4d-b77e-e1362ca77817 X-Archives-Hash: 79108cafdad219f66f1ab72b043cf3ed This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --3xqLPHak3et7rwLocXJBSMb3hgeAw436c Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Some work on splitting these helper functions was done earlier, and then we have got request(bug #479744), so, with ACK from pesa, i would like to propose this new eclass here and some times after - another proposal with making qt4-r2 eclass depends on this one to prevent code duplication= =2E So, here it is(directly from qt overlay): # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # @ECLASS: qmake-utils.eclass # @MAINTAINER: # Qt herd # @AUTHOR: # Davide Pesavento # @BLURB: Common functions for qmake-based packages. # @DESCRIPTION: # Utility eclass providing wrapper functions for Qt4 and Qt5 qmake. if [[ ${___ECLASS_ONCE_QMAKE_UTILS} !=3D "recur -_+^+_- spank" ]]; then ___ECLASS_ONCE_QMAKE_UTILS=3D"recur -_+^+_- spank" inherit eutils multilib toolchain-funcs # @FUNCTION: qmake-utils_find_pro_file # @RETURN: zero or one qmake .pro file names # @INTERNAL # @DESCRIPTION: # Outputs a project file name that can be passed to eqmake. # 0 *.pro files found --> outputs null string; # 1 *.pro file found --> outputs its name; # 2 or more *.pro files found --> if "${PN}.pro" or # "$(basename ${S}).pro" are there, outputs one of them. qmake-utils_find_pro_file() { local dir_name=3D$(basename "${S}") # set nullglob to avoid expanding *.pro to the literal # string "*.pro" when there are no matching files eshopts_push -s nullglob local pro_files=3D(*.pro) eshopts_pop case ${#pro_files[@]} in 0) : ;; 1) echo "${pro_files}" ;; *) for pro_file in "${pro_files[@]}"; do if [[ ${pro_file%.pro} =3D=3D ${dir_name} || ${pro_file%.pro} =3D=3D $= {PN} ]]; then echo "${pro_file}" break fi done ;; esac } # @VARIABLE: EQMAKE4_EXCLUDE # @DEFAULT_UNSET # @DESCRIPTION: # List of files to be excluded from eqmake4 CONFIG processing. # Paths are relative to the current working directory (usually ${S}). # # Example: EQMAKE4_EXCLUDE=3D"ignore/me.pro foo/*" # @FUNCTION: eqmake4 # @USAGE: [project_file] [parameters to qmake] # @DESCRIPTION: # Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will # look for it in the current directory (${S}, non-recursively). If more # than one project file are found, then ${PN}.pro is processed, provided # that it exists. Otherwise eqmake4 fails. # # All other arguments are appended unmodified to qmake command line. # # For recursive build systems, i.e. those based on the subdirs template, # you should run eqmake4 on the top-level project file only, unless you # have a valid reason to do otherwise. During the building, qmake will # be automatically re-invoked with the right arguments on every directory= # specified inside the top-level project file. eqmake4() { debug-print-function ${FUNCNAME} "$@" has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=3D ebegin "Running qmake" local qmake_args=3D("$@") # check if project file was passed as a first argument # if not, then search for it local regexp=3D'.*\.pro' if ! [[ ${1} =3D~ ${regexp} ]]; then local project_file=3D$(qmake-utils_find_pro_file) if [[ -z ${project_file} ]]; then echo eerror "No project files found in '${PWD}'!" eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" echo die "eqmake4 failed" fi qmake_args+=3D("${project_file}") fi # make sure CONFIG variable is correctly set # for both release and debug builds local config_add=3D"release" local config_remove=3D"debug" if has debug ${IUSE} && use debug; then config_add=3D"debug" config_remove=3D"release" fi local awkscript=3D'BEGIN { printf "### eqmake4 was here ###\n" > file; printf "CONFIG -=3D debug_and_release %s\n", remove >> file; printf "CONFIG +=3D %s\n\n", add >> file; fixed=3D0; } /^[[:blank:]]*CONFIG[[:blank:]]*[\+\*]?=3D/ { if (gsub("\\<((" remove ")|(debug_and_release))\\>", "") > 0) { fixed=3D1; } } /^[[:blank:]]*CONFIG[[:blank:]]*-=3D/ { if (gsub("\\<" add "\\>", "") > 0) { fixed=3D1; } } { print >> file; } END { print fixed; }' [[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_push -o noglob local file while read file; do local excl for excl in ${EQMAKE4_EXCLUDE}; do [[ ${file} =3D=3D ${excl} ]] && continue 2 done grep -q '^### eqmake4 was here ###$' "${file}" && continue local retval=3D$({ rm -f "${file}" || echo FAIL awk -v file=3D"${file}" \ -v add=3D${config_add} \ -v remove=3D${config_remove} \ -- "${awkscript}" || echo FAIL } < "${file}") if [[ ${retval} =3D=3D 1 ]]; then einfo " - fixed CONFIG in ${file}" elif [[ ${retval} !=3D 0 ]]; then eerror " - error while processing ${file}" die "eqmake4 failed to process ${file}" fi done < <(find . -type f -name '*.pr[io]' -printf '%P\n' 2>/dev/null) [[ -n ${EQMAKE4_EXCLUDE} ]] && eshopts_pop "${EPREFIX}"/usr/bin/qmake \ -makefile \ QTDIR=3D"${EPREFIX}"/usr/$(get_libdir) \ QMAKE=3D"${EPREFIX}"/usr/bin/qmake \ QMAKE_AR=3D"$(tc-getAR) cqs" \ QMAKE_CC=3D"$(tc-getCC)" \ QMAKE_CXX=3D"$(tc-getCXX)" \ QMAKE_LINK=3D"$(tc-getCXX)" \ QMAKE_LINK_C=3D"$(tc-getCC)" \ QMAKE_OBJCOPY=3D"$(tc-getOBJCOPY)" \ QMAKE_RANLIB=3D \ QMAKE_STRIP=3D \ QMAKE_CFLAGS=3D"${CFLAGS}" \ QMAKE_CFLAGS_RELEASE=3D \ QMAKE_CFLAGS_DEBUG=3D \ QMAKE_CXXFLAGS=3D"${CXXFLAGS}" \ QMAKE_CXXFLAGS_RELEASE=3D \ QMAKE_CXXFLAGS_DEBUG=3D \ QMAKE_LFLAGS=3D"${LDFLAGS}" \ QMAKE_LFLAGS_RELEASE=3D \ QMAKE_LFLAGS_DEBUG=3D \ QMAKE_LIBDIR_QT=3D"${EPREFIX}"/usr/$(get_libdir)/qt4 \ QMAKE_LIBDIR_X11=3D"${EPREFIX}"/usr/$(get_libdir) \ QMAKE_LIBDIR_OPENGL=3D"${EPREFIX}"/usr/$(get_libdir) \ "${qmake_args[@]}" # was qmake successful? if ! eend $? ; then echo eerror "Running qmake has failed! (see above for details)" eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" echo die "eqmake4 failed" fi } # @FUNCTION: eqmake5 # @USAGE: [arguments for qmake] # @DESCRIPTION: # Wrapper for Qt5's qmake. All arguments are passed to qmake. # # For recursive build systems, i.e. those based on the subdirs template, # you should run eqmake5 on the top-level project file only, unless you # have a valid reason to do otherwise. During the building, qmake will # be automatically re-invoked with the right arguments on every directory= # specified inside the top-level project file. eqmake5() { debug-print-function ${FUNCNAME} "$@" has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=3D ebegin "Running qmake" "${EPREFIX}"/usr/$(get_libdir)/qt5/bin/qmake \ -makefile \ QMAKE_AR=3D"$(tc-getAR) cqs" \ QMAKE_CC=3D"$(tc-getCC)" \ QMAKE_CXX=3D"$(tc-getCXX)" \ QMAKE_LINK=3D"$(tc-getCXX)" \ QMAKE_LINK_C=3D"$(tc-getCC)" \ QMAKE_OBJCOPY=3D"$(tc-getOBJCOPY)" \ QMAKE_RANLIB=3D \ QMAKE_STRIP=3D \ QMAKE_CFLAGS=3D"${CFLAGS}" \ QMAKE_CFLAGS_RELEASE=3D \ QMAKE_CFLAGS_DEBUG=3D \ QMAKE_CXXFLAGS=3D"${CXXFLAGS}" \ QMAKE_CXXFLAGS_RELEASE=3D \ QMAKE_CXXFLAGS_DEBUG=3D \ QMAKE_LFLAGS=3D"${LDFLAGS}" \ QMAKE_LFLAGS_RELEASE=3D \ QMAKE_LFLAGS_DEBUG=3D \ "$@" # was qmake successful? if ! eend $? ; then echo eerror "Running qmake has failed! (see above for details)" eerror "This shouldn't happen - please send a bug report to https://bugs.gentoo.org/" echo die "eqmake5 failed" fi } fi --=20 Best regards, Sergey Popov Gentoo developer Gentoo Desktop-effects project lead Gentoo Qt project lead Gentoo Proxy maintainers project lead --3xqLPHak3et7rwLocXJBSMb3hgeAw436c Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSgPinAAoJECo/aRed9267mk4IAIaRpPpjhqT68RmFI6WBHu9c K2N6meFdEYqW+4Gd8etrWn48o1+wGgRkIgM/uxTddOy4bChUWXtc93bAFxi7plim OexczGiGVMDuuJS8JOppbz4MqYNSsypoegTZMhrzDl0vqGtVeY7csv2PjgmBG6ox 5lCf3rT1/NHHXtIQwxRTPgZz/VCHDZjNHBYcKDB7HuKM1NNe6aGpcGWq6vFOvfZY fFG2TWrhbEgTmZea7tkSDBSo1VLCAx5JIasOeElQ6jpWOaeYVb1I4XoE0J/ULsDx V9UtxEihD0meW0gkznZ3RqS5Is/zbOEO0WC6kfMRCtDm/KUtb0dV5pjq0xzcyuQ= =KS3E -----END PGP SIGNATURE----- --3xqLPHak3et7rwLocXJBSMb3hgeAw436c--