Re: [gentoo-dev] RFC: fox.eclass update
Must admit that I have no idea of what fox is at all, but:
On 09/16/2010 08:32 PM, Peter Volkov wrote:
В Чтв, 16/09/2010 в 16:24 +0200, Matti Bickel пишет:
- elibtoolize
+ eautoreconf
Hm, is this change necessary?
The obvious reason for eautoreconf here is:
fox_src_prepare() updates configure.{ac,in} and Makefile.am's just before.
The non-obvious reason is:
Ebuilds may have to patch these files too for random (usually prefix) platforms.
Iff not eautoreconf but elibtoolize were done here, the ebuild would have to do
the
eautoreconf itself, which doesn't work right now[1] when elibtoolize was called
before.
[1] http://bugs.gentoo.org/show_bug.cgi?id=232820
/haubi/
--
Michael Haubenwallner
Gentoo on a different level
[gentoo-dev] RFC: fox.eclass update
Hi folks, The fox eclass accumulated a lot of cruft over the years. Specifically, it includes quite a bit of code to support versions loong gone from our tree. The only officially supported versions now are 1.6 and 1.7. Thus, I've edited it a bit. Main points are EAPI2 phase support and a lot of variable quoting. Posting this for review as the diff is rather largish and I'm known to have the usual typo in it ;) Comments welcome. signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] RFC: fox.eclass update
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Dne 16.9.2010 15:31, Matti Bickel napsal(a): Posting this for review as the diff is rather largish and I'm known to have the usual typo in it ;) Your mail lacks the attachment :) Tom -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.16 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAkySHgQACgkQHB6c3gNBRYfX/wCfapaZNILD7SQrYfgAZXDGZXA8 +xwAoKex7dx+cm90t+XcEjQmns/AtWb5 =b9z+ -END PGP SIGNATURE-
Re: [gentoo-dev] RFC: fox.eclass update
On Thu, 16 Sep 2010 16:24:18 +0200, Matti Bickel m...@gentoo.org wrote: On 09/16/2010 03:31 PM, Matti Bickel wrote: -- Now complete with attachments :) Hey Matti, few quick things. * Can you add eclass-manpages documentation? * econf doesn't need to || die * What is the mysterious FOXCONF variable in econf for? (could just be documented? or removed?)
Re: [gentoo-dev] RFC: fox.eclass update
On Thu, 16 Sep 2010 09:41:30 -0500 Jeremy Olexa darks...@gentoo.org wrote: * econf doesn't need to || die Is that a novelty change? Most of the tree still does econf || die ... jer
Re: [gentoo-dev] RFC: fox.eclass update
On 09/16/2010 04:41 PM, Jeremy Olexa wrote:
Hey Matti, few quick things.
Thanks, all done. FOXCONF is now documented (though not set by default).
Updated diff and eclass attached.
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# @ECLASS: fox.eclass
# @MAINTAINER:
# m...@gentoo.org
# @BLURB: Functionality required the FOX Toolkit and it's applications
# @DESCRIPTION:
# This eclass allows building SLOT-able FOX Toolkit installations
# (x11-libs/fox: headers, libs, and docs), which are by design
# parallel-installable, while installing only one version of the utils
# (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
# x11-misc/pathfinder, and x11-misc/shutterbug).
#
# Version numbering follows the kernel-style odd-even minor version
# designation. Even-number minor versions are API stable, which patch
# releases aimed mostly at the library; apps generally won't need to be
# bumped for a patch release.
#
# Odd-number versions are development branches with their own SLOT and
# are API unstable; changes are made to the apps, and likely need to be
# bumped together with the library.
#
# Here are sample [R]DEPENDs for the fox apps
# 1.6: 'x11-libs/fox:1.6'
# 1.7: '~x11-libs/fox-${PV}'
#
# EAPI phase trickery borrowed from enlightenment.eclass
inherit autotools versionator
FOX_EXPF=src_unpack src_compile src_install pkg_postinst
case ${EAPI:-0} in
2|3|4) FOX_EXPF+= src_prepare src_configure ;;
*) ;;
esac
EXPORT_FUNCTIONS ${FOX_EXPF}
# @ECLASS-VARIABLE: FOX_PV
# @DESCRIPTION:
# The version of the FOX Toolkit provided or required by the package
FOX_PV=${FOX_PV:-${PV}}
# @ECLASS-VARIABLE: FOXVER
# @INTERNAL
# @DESCRIPTION:
# The major.minor version of FOX_PV, usually acts as $SLOT and is used in
# building the applications
FOXVER=`get_version_component_range 1-2 ${FOX_PV}`
# @ECLASS-VARIABLE: FOX_APPS
# @INTERNAL
# @DESCRIPTION:
# The applications originally packaged in the FOX Toolkit
FOX_APPS=adie calculator pathfinder shutterbug
FOX_CHART=chart
# @ECLASS-VARIABLE: FOXCONF
# @DEFAULT_UNSET
# @DESCRIPTION:
# Set this to add additional configuration options during src_configure
DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily
and effectively
HOMEPAGE=http://www.fox-toolkit.org/;
SRC_URI=http://www.fox-toolkit.org/ftp/fox-${FOX_PV}.tar.gz;
IUSE=debug doc profile
if [ ${PN} != fox ] ; then
FOX_COMPONENT=${FOX_COMPONENT:-${PN}}
fi
if [ -z ${FOX_COMPONENT} ] ; then
DOXYGEN_DEP=doc? ( app-doc/doxygen )
fi
if [ ${PN} != reswrap ] ; then
RESWRAP_DEP=dev-util/reswrap
fi
DEPEND=${DOXYGEN_DEP}
${RESWRAP_DEP}
=sys-devel/automake-1.4*
=sys-apps/sed-4
S=${WORKDIR}/fox-${FOX_PV}
fox_src_unpack() {
unpack ${A}
cd ${S}
hasq src_prepare ${FOX_EXPF} || fox_src_prepare
}
fox_src_prepare() {
# fox changed from configure.in to configure.am in 1.6.38
local confFile=configure.ac
[[ -r configure.in ]] confFile=configure.in
# Respect system CXXFLAGS
sed -i -e 's:CXXFLAGS=::' $confFile || die sed ${confFile} error
# don't build apps from top-level (i.e. x11-libs/fox)
# utils == reswrap
for d in ${FOX_APPS} utils windows ; do
sed -i -e s:${d}:: Makefile.am || die sed Makefile.am error
done
# use the installed reswrap for everything else
for d in ${FOX_APPS} ${FOX_CHART} tests ; do
sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
sed -i \
-e s:-I\$(top_srcdir)/include
-I\$(top_builddir)/include:-I\$(includedir)/fox-${FOXVER}: \
-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
-e 's:\.la::' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
eautoreconf
}
fox_src_configure() {
use debug FOXCONF+= --enable-debug \
|| FOXCONF+= --enable-release
econf ${FOXCONF} \
$(use_with profile profiling)
}
fox_src_compile() {
hasq src_configure ${FOX_EXPF} || fox_src_configure
cd ${S}/${FOX_COMPONENT}
emake || die compile error
# build class reference docs (FOXVER = 1.2)
if use doc [ -z ${FOX_COMPONENT} ] ; then
cd ${S}/doc
make docs || die doxygen error
fi
}
fox_src_install() {
cd ${S}/${FOX_COMPONENT}
emake install \
DESTDIR=${D} \
htmldir=/usr/share/doc/${PF}/html \
artdir=/usr/share/doc/${PF}/html/art \
screenshotsdir=/usr/share/doc/${PF}/html/screenshots \
Re: [gentoo-dev] RFC: fox.eclass update
В Чтв, 16/09/2010 в 16:24 +0200, Matti Bickel пишет:
+FOXVER=`get_version_component_range 1-2 ${FOX_PV}`
It's better to prefer $() style over ``:
http://mywiki.wooledge.org/BashFAQ/082
if [ ${PN} != fox ] ; then
FOX_COMPONENT=${FOX_COMPONENT:-${PN}}
fi
-if [ ${FOXVER} != 1.0 ] [ -z ${FOX_COMPONENT} ] ; then
+if [ -z ${FOX_COMPONENT} ] ; then
DOXYGEN_DEP=doc? ( app-doc/doxygen )
fi
It's better to use [[ ]] and avoid quotes since ebuilds are bash
scripts.
- elibtoolize
+ eautoreconf
Hm, is this change necessary?
+ if ( ! use doc ) [ -d ${D}/usr/share/doc/${PF}/html ] ;
then
Subshell looks redundant here.
+ epause
It's better to avoid epause as it makes build slower at the same time
it's most probable that nobody is looking on the screen at the moment[1]
and portage will print all elog messages at the end of the build in any
case.
[1] while emerge output is one of those things one can observe for ages
(like water, fire and others working) still it's possible no one
thoughtfully staring at the screen...
--
Peter.
Re: [gentoo-dev] RFC: fox.eclass update
On 09/16/2010 08:32 PM, Peter Volkov wrote:
В Чтв, 16/09/2010 в 16:24 +0200, Matti Bickel пишет:
+FOXVER=`get_version_component_range 1-2 ${FOX_PV}`
It's better to prefer $() style over ``:
http://mywiki.wooledge.org/BashFAQ/082
Hmm, I prefer Backticks personally, as I like to conserve space whenever
possible. But for consistency with the rest of the tree, I changed that
to $() in the diff.
- elibtoolize
+ eautoreconf
Hm, is this change necessary?
I might be missing something here, but the change in recent fox versions
to configure.ac instead of configure.in forces a run of autoconf, afaik.
Thanks for the comments, updated eclass attached.
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# @ECLASS: fox.eclass
# @MAINTAINER:
# m...@gentoo.org
# @BLURB: Functionality required the FOX Toolkit and it's applications
# @DESCRIPTION:
# This eclass allows building SLOT-able FOX Toolkit installations
# (x11-libs/fox: headers, libs, and docs), which are by design
# parallel-installable, while installing only one version of the utils
# (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
# x11-misc/pathfinder, and x11-misc/shutterbug).
#
# Version numbering follows the kernel-style odd-even minor version
# designation. Even-number minor versions are API stable, which patch
# releases aimed mostly at the library; apps generally won't need to be
# bumped for a patch release.
#
# Odd-number versions are development branches with their own SLOT and
# are API unstable; changes are made to the apps, and likely need to be
# bumped together with the library.
#
# Here are sample [R]DEPENDs for the fox apps
# 1.6: 'x11-libs/fox:1.6'
# 1.7: '~x11-libs/fox-${PV}'
#
# EAPI phase trickery borrowed from enlightenment.eclass
inherit autotools versionator
FOX_EXPF=src_unpack src_compile src_install pkg_postinst
case ${EAPI:-0} in
2|3|4) FOX_EXPF+= src_prepare src_configure ;;
*) ;;
esac
EXPORT_FUNCTIONS ${FOX_EXPF}
# @ECLASS-VARIABLE: FOX_PV
# @DESCRIPTION:
# The version of the FOX Toolkit provided or required by the package
FOX_PV=${FOX_PV:-${PV}}
# @ECLASS-VARIABLE: FOXVER
# @INTERNAL
# @DESCRIPTION:
# The major.minor version of FOX_PV, usually acts as $SLOT and is used in
# building the applications
FOXVER=$(get_version_component_range 1-2 ${FOX_PV})
# @ECLASS-VARIABLE: FOX_APPS
# @INTERNAL
# @DESCRIPTION:
# The applications originally packaged in the FOX Toolkit
FOX_APPS=adie calculator pathfinder shutterbug
FOX_CHART=chart
# @ECLASS-VARIABLE: FOXCONF
# @DEFAULT_UNSET
# @DESCRIPTION:
# Set this to add additional configuration options during src_configure
DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily
and effectively
HOMEPAGE=http://www.fox-toolkit.org/;
SRC_URI=http://www.fox-toolkit.org/ftp/fox-${FOX_PV}.tar.gz;
IUSE=debug doc profile
if [[ ${PN} != fox ]] ; then
FOX_COMPONENT=${FOX_COMPONENT:-${PN}}
fi
if [[ -z ${FOX_COMPONENT} ]] ; then
DOXYGEN_DEP=doc? ( app-doc/doxygen )
fi
if [[ ${PN} != reswrap ]] ; then
RESWRAP_DEP=dev-util/reswrap
fi
DEPEND=${DOXYGEN_DEP}
${RESWRAP_DEP}
=sys-devel/automake-1.4*
=sys-apps/sed-4
S=${WORKDIR}/fox-${FOX_PV}
fox_src_unpack() {
unpack ${A}
cd ${S}
hasq src_prepare ${FOX_EXPF} || fox_src_prepare
}
fox_src_prepare() {
# fox changed from configure.in to configure.am in 1.6.38
local confFile=configure.ac
[[ -r configure.in ]] confFile=configure.in
# Respect system CXXFLAGS
sed -i -e 's:CXXFLAGS=::' $confFile || die sed ${confFile} error
# don't build apps from top-level (i.e. x11-libs/fox)
# utils == reswrap
for d in ${FOX_APPS} utils windows ; do
sed -i -e s:${d}:: Makefile.am || die sed Makefile.am error
done
# use the installed reswrap for everything else
for d in ${FOX_APPS} ${FOX_CHART} tests ; do
sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
sed -i \
-e s:-I\$(top_srcdir)/include
-I\$(top_builddir)/include:-I\$(includedir)/fox-${FOXVER}: \
-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
-e 's:\.la::' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
eautoreconf
}
fox_src_configure() {
use debug FOXCONF+= --enable-debug \
|| FOXCONF+= --enable-release
econf ${FOXCONF} \
$(use_with profile profiling)
}
fox_src_compile() {
hasq src_configure ${FOX_EXPF} || fox_src_configure
cd ${S}/${FOX_COMPONENT}
emake || die
Re: [gentoo-dev] RFC: fox.eclass update
On Thursday, September 16, 2010 14:51:39 Matti Bickel wrote:
+#1.6: 'x11-libs/fox:1.6'
+# 1.7: '~x11-libs/fox-${PV}'
first line is using a tab while second is spaces. both should be tabs.
FOX_PV=${FOX_PV:-${PV}}
while you're here, i'd change to:
: ${FOX_PV:=${PV}}
for d in ${FOX_APPS} ; do
your prepare func should declare 'd' as local
+ if use doc [[ -z ${FOX_COMPONENT} ]] ; then
+ cd ${S}/doc
make docs || die doxygen error
fi
should be `emake`, and better to use -C ${S}/doc so that you dont change
$PWD on people
+ if ! use doc [[ -d ${D}/usr/share/doc/${PF}/html ]] ; then
+ rm -fr ${D}/usr/share/doc/${PF}/html
fi
you dont really need the -d check as the -f option to rm will keep it from
warning on missing dirs
use doc || rm -rf ${D}/usr/share/doc/${PF}/html
+ if [[ -f ${D}/usr/bin/fox-config ]] ; then
+ mv ${D}/usr/bin/fox-config ${D}/usr/bin/fox-${FOXVER}-config
fi
seems like you would want || die here
-mike
signature.asc
Description: This is a digitally signed message part.
Re: [gentoo-dev] RFC: fox.eclass update
В Чтв, 16/09/2010 в 15:29 -0400, Mike Frysinger пишет:
FOX_PV=${FOX_PV:-${PV}}
while you're here, i'd change to:
: ${FOX_PV:=${PV}}
Why? This looks less readable...
--
Peter.
Re: [gentoo-dev] RFC: fox.eclass update
On 09/16/2010 09:29 PM, Mike Frysinger wrote:
+if [[ -f ${D}/usr/bin/fox-config ]] ; then
+mv ${D}/usr/bin/fox-config ${D}/usr/bin/fox-${FOXVER}-config
fi
seems like you would want || die here
Why? I can't imagine how that could fail.
signature.asc
Description: OpenPGP digital signature
Re: [gentoo-dev] RFC: fox.eclass update
On Thursday, September 16, 2010 16:24:14 Matti Bickel wrote:
On 09/16/2010 09:29 PM, Mike Frysinger wrote:
+ if [[ -f ${D}/usr/bin/fox-config ]] ; then
+ mv ${D}/usr/bin/fox-config ${D}/usr/bin/fox-${FOXVER}-config
fi
seems like you would want || die here
Why? I can't imagine how that could fail.
then the `die` should never be called
-mike
signature.asc
Description: This is a digitally signed message part.
Re: [gentoo-dev] RFC: fox.eclass update
On Thursday, September 16, 2010 15:41:27 Peter Volkov wrote:
В Чтв, 16/09/2010 в 15:29 -0400, Mike Frysinger пишет:
FOX_PV=${FOX_PV:-${PV}}
while you're here, i'd change to:
: ${FOX_PV:=${PV}}
Why? This looks less readable...
only because your eyes arent tuned to it
-mike
signature.asc
Description: This is a digitally signed message part.
Re: [gentoo-dev] RFC: fox.eclass update
В Чтв, 16/09/2010 в 18:34 -0400, Mike Frysinger пишет:
On Thursday, September 16, 2010 15:41:27 Peter Volkov wrote:
В Чтв, 16/09/2010 в 15:29 -0400, Mike Frysinger пишет:
FOX_PV=${FOX_PV:-${PV}}
while you're here, i'd change to:
: ${FOX_PV:=${PV}}
Why? This looks less readable...
only because your eyes arent tuned to it
Instead of explicit variable assignment (what was intended) you suggest
to call `:` command and implicitly assign variable with bash parameter
expansion...
--
Peter.
Re: [gentoo-dev] RFC: fox.eclass update
On Friday, September 17, 2010 01:06:19 Peter Volkov wrote:
В Чтв, 16/09/2010 в 18:34 -0400, Mike Frysinger пишет:
On Thursday, September 16, 2010 15:41:27 Peter Volkov wrote:
В Чтв, 16/09/2010 в 15:29 -0400, Mike Frysinger пишет:
FOX_PV=${FOX_PV:-${PV}}
while you're here, i'd change to:
: ${FOX_PV:=${PV}}
Why? This looks less readable...
only because your eyes arent tuned to it
Instead of explicit variable assignment (what was intended) you suggest
to call `:` command and implicitly assign variable with bash parameter
expansion...
what exactly is your point ? there is no performance difference. my style
suggestion however is significantly more compact and has no redundancy.
-mike
signature.asc
Description: This is a digitally signed message part.
Re: [gentoo-dev] RFC: fox.eclass update
В Вск, 08/02/2009 в 23:06 +0100, Matti Bickel пишет: +# could probably be lower +WANT_AUTOCONF=latest +WANT_AUTOMAKE=latest These are defaults. You don't need to specify them. + eautomake || die automake error eautomake dies on its own. You don't need || die here. -- Peter.
Re: [gentoo-dev] RFC: fox.eclass update
Peter Volkov p...@gentoo.org wrote:
В Вск, 08/02/2009 в 23:06 +0100, Matti Bickel пишет:
+# could probably be lower
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
These are defaults. You don't need to specify them.
+ eautomake || die automake error
eautomake dies on its own. You don't need || die here.
Thanks for the comments, WANT_AUTO* was specified to make some previous
commenter happy, but removed now ;)
Where was that 'which functions || die on their own' table, anyway?
--
Regards, Matti Bickel
Signed/Encrypted email preferred (key 4849EC6C)
--- /usr/portage/eclass/fox.eclass 2008-10-12 14:36:35.0 +0200
+++ fox-proposed.eclass 2009-02-09 19:21:03.0 +0100
@@ -1,8 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.8 2008/10/12 12:31:36
mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:27:06
mabi Exp $
-# fox eclass
+# @ECLASS: fox.eclass
+# @MAINTAINER: m...@gentoo.org
+# @BLURB: Common build and install functions for fox-related apps and library
+# @DESCRIPTION: Used by the x11-libs/fox library and all applications that come
+# with the upstream source tarball.
#
# This eclass allows building SLOT-able FOX Toolkit installations
# (x11-libs/fox: headers, libs, and docs), which are by design
@@ -19,26 +23,18 @@
# are API unstable; changes are made to the apps, and likely need to be
# bumped together with the library.
#
-# Here are sample [R]DEPENDs for the fox apps
-# fox versions that do not use this eclass are blocked in INCOMPAT_DEP below
-# 1.0: '=x11-libs/fox-1.0*'
-# 1.2: '=x11-libs/fox-1.2*'
+# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
+#
+# @EXAMPLE: Here are sample [R]DEPENDs for the fox apps
# 1.4: '=x11-libs/fox-1.4*'
# 1.5: '~x11-libs/fox-${PV}'
# 1.6: '=x11-libs/fox-${FOXVER}*'
-#
-# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
-
-inherit eutils libtool versionator
+inherit autotools eutils libtool versionator
FOX_PV=${FOX_PV:-${PV}}
-PVP=(${FOX_PV//[-\._]/ })
-FOXVER=${PVP[0]}.${PVP[1]}
-
-if [ ${FOXVER} != 1.0 ] ; then
- FOXVER_SUFFIX=-${FOXVER}
-fi
+FOXVER=$(get_version_component_range 1-2)
+FOXVER_SUFFIX=-${FOXVER}
DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily
and effectively
HOMEPAGE=http://www.fox-toolkit.org/;
@@ -46,44 +42,28 @@
IUSE=debug doc profile
-# from fox-1.0
-FOX_APPS=adie calculator pathfinder
-# from fox-1.2+
-if [ ${FOXVER} != 1.0 ] ; then
- FOX_APPS=${FOX_APPS} shutterbug
- FOX_CHART=chart
-fi
+# @ECLASS-VARIABLE: FOX_APPS
+# @DESCRIPTION: all applications that come with the fox toolkit source
+FOX_APPS=adie calculator pathfinder shutterbug chart
if [ ${PN} != fox ] ; then
FOX_COMPONENT=${FOX_COMPONENT:-${PN}}
fi
-if [ ${FOXVER} != 1.0 ] [ -z ${FOX_COMPONENT} ] ; then
- DOXYGEN_DEP=doc? ( app-doc/doxygen )
-fi
-
if [ ${PN} != reswrap ] ; then
RESWRAP_DEP=dev-util/reswrap
fi
-# These versions are not compatible with new fox layout
-# and will cause collissions - we need to block them
-INCOMPAT_DEP=!x11-libs/fox-1.0.53
- !=x11-libs/fox-1.2.4
- !~x11-libs/fox-1.2.6
- !=x11-libs/fox-1.4.11
-
-DEPEND=${INCOMPAT_DEP}
- ${DOXYGEN_DEP}
- ${RESWRAP_DEP}
- =sys-devel/automake-1.4*
+DEPEND=${RESWRAP_DEP}
+ doc? ( app-doc/doxygen )
+ =sys-devel/automake-1.4
=sys-apps/sed-4
S=${WORKDIR}/fox-${FOX_PV}
fox_src_unpack() {
unpack ${A}
- cd ${S}
+ cd ${S}
ebegin Fixing configure
@@ -103,14 +83,14 @@
done
# use the installed reswrap for everything else
- for d in ${FOX_APPS} ${FOX_CHART} tests ; do
+ for d in ${FOX_APPS} tests ; do
sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
- if version_is_at_least 1.6.34 ${PV} ; then
+ if version_is_at_least 1.6.34 ${PV}; then
sed -i \
-e s:-I\$(top_srcdir)/include
-I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}: \
-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
@@ -124,19 +104,13 @@
${d}/Makefile.am || die sed ${d}/Makefile.am
error
fi
done
-
- # Upstream often has trouble with version number transitions
- if [ ${FOXVER} == 1.5 ] ; then
- sed -i -e 's:1.4:1.5:g' chart/Makefile.am
- fi
-
eend
ebegin Running automake
- automake-1.4 -a -c || die automake error
+ eautomake
eend
-
Re: [gentoo-dev] RFC: fox.eclass update
On Mon, Feb 9, 2009 at 11:52 PM, Matti Bickel m...@gentoo.org wrote: eautomake dies on its own. You don't need || die here. Thanks for the comments, WANT_AUTO* was specified to make some previous commenter happy, but removed now ;) Where was that 'which functions || die on their own' table, anyway? ls /usr/lib/portage/bin/ -- that'll give you a list of functions which don't die on their own -- ~Nirbheek Chauhan
Re: [gentoo-dev] RFC: fox.eclass update
Hi,
shame on me, here i'm wondering why noone replies...
Sorry, i failed to send the updated patch o.O
Here's the patch again w/ your suggestions included.
--
Regards, Matti Bickel
Signed/Encrypted email preferred (key 4849EC6C)
--- /usr/portage/eclass/fox.eclass 2008-10-12 14:36:35.0 +0200
+++ fox-proposed.eclass 2009-02-08 19:35:49.0 +0100
@@ -1,8 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.8 2008/10/12 12:31:36
mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:27:06
mabi Exp $
-# fox eclass
+# @ECLASS: fox.eclass
+# @MAINTAINER: m...@gentoo.org
+# @BLURB: Common build and install functions for fox-related apps and library
+# @DESCRIPTION: Used by the x11-libs/fox library and all applications that come
+# with the upstream source tarball.
#
# This eclass allows building SLOT-able FOX Toolkit installations
# (x11-libs/fox: headers, libs, and docs), which are by design
@@ -19,26 +23,22 @@
# are API unstable; changes are made to the apps, and likely need to be
# bumped together with the library.
#
-# Here are sample [R]DEPENDs for the fox apps
-# fox versions that do not use this eclass are blocked in INCOMPAT_DEP below
-# 1.0: '=x11-libs/fox-1.0*'
-# 1.2: '=x11-libs/fox-1.2*'
+# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
+#
+# @EXAMPLE: Here are sample [R]DEPENDs for the fox apps
# 1.4: '=x11-libs/fox-1.4*'
# 1.5: '~x11-libs/fox-${PV}'
# 1.6: '=x11-libs/fox-${FOXVER}*'
-#
-# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
-inherit eutils libtool versionator
+# could probably be lower
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+inherit autotools eutils libtool versionator
FOX_PV=${FOX_PV:-${PV}}
-PVP=(${FOX_PV//[-\._]/ })
-FOXVER=${PVP[0]}.${PVP[1]}
-
-if [ ${FOXVER} != 1.0 ] ; then
- FOXVER_SUFFIX=-${FOXVER}
-fi
+FOXVER=$(get_version_component_range 1-2)
+FOXVER_SUFFIX=-${FOXVER}
DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily
and effectively
HOMEPAGE=http://www.fox-toolkit.org/;
@@ -46,44 +46,28 @@
IUSE=debug doc profile
-# from fox-1.0
-FOX_APPS=adie calculator pathfinder
-# from fox-1.2+
-if [ ${FOXVER} != 1.0 ] ; then
- FOX_APPS=${FOX_APPS} shutterbug
- FOX_CHART=chart
-fi
+# @ECLASS-VARIABLE: FOX_APPS
+# @DESCRIPTION: all applications that come with the fox toolkit source
+FOX_APPS=adie calculator pathfinder shutterbug chart
if [ ${PN} != fox ] ; then
FOX_COMPONENT=${FOX_COMPONENT:-${PN}}
fi
-if [ ${FOXVER} != 1.0 ] [ -z ${FOX_COMPONENT} ] ; then
- DOXYGEN_DEP=doc? ( app-doc/doxygen )
-fi
-
if [ ${PN} != reswrap ] ; then
RESWRAP_DEP=dev-util/reswrap
fi
-# These versions are not compatible with new fox layout
-# and will cause collissions - we need to block them
-INCOMPAT_DEP=!x11-libs/fox-1.0.53
- !=x11-libs/fox-1.2.4
- !~x11-libs/fox-1.2.6
- !=x11-libs/fox-1.4.11
-
-DEPEND=${INCOMPAT_DEP}
- ${DOXYGEN_DEP}
- ${RESWRAP_DEP}
- =sys-devel/automake-1.4*
+DEPEND=${RESWRAP_DEP}
+ doc? ( app-doc/doxygen )
+ =sys-devel/automake-1.4
=sys-apps/sed-4
S=${WORKDIR}/fox-${FOX_PV}
fox_src_unpack() {
unpack ${A}
- cd ${S}
+ cd ${S}
ebegin Fixing configure
@@ -103,14 +87,14 @@
done
# use the installed reswrap for everything else
- for d in ${FOX_APPS} ${FOX_CHART} tests ; do
+ for d in ${FOX_APPS} tests ; do
sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
- if version_is_at_least 1.6.34 ${PV} ; then
+ if version_is_at_least 1.6.34 ${PV}; then
sed -i \
-e s:-I\$(top_srcdir)/include
-I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}: \
-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
@@ -124,19 +108,13 @@
${d}/Makefile.am || die sed ${d}/Makefile.am
error
fi
done
-
- # Upstream often has trouble with version number transitions
- if [ ${FOXVER} == 1.5 ] ; then
- sed -i -e 's:1.4:1.5:g' chart/Makefile.am
- fi
-
eend
ebegin Running automake
- automake-1.4 -a -c || die automake error
+ eautomake || die automake error
eend
- elibtoolize
+ #elibtoolize
}
fox_src_compile() {
@@ -150,21 +128,21 @@
$(use_with profile profiling) \
|| die configure error
- cd ${S}/${FOX_COMPONENT}
+ cd ${S}/${FOX_COMPONENT}
Re: [gentoo-dev] RFC: fox.eclass update
--- gentoo-x86/eclass/fox.eclass 2008-10-12 14:31:36.0 +0200
+++ fox-proposed.eclass 2008-10-13 20:27:05.0 +0200
[...]
-inherit eutils libtool versionator
+inherit autotools eutils libtool versionator
You should probably be setting WANT_AUTO* before inheriting autotools.
[...]
+ if ( ! use doc ) [ -d ${D}/usr/share/doc/${PF}/html ] ; then
Get rid of the pointless subshell.
if use !doc ...
--
Bo Andresen
signature.asc
Description: This is a digitally signed message part.
Re: [gentoo-dev] RFC: fox.eclass update
Matti Bickel kirjoitti: Hi folks, While fixing bug #240060 I touched fox.eclass. In the process, I updated the eclass to * use versionator * cut support for fox-1.0 (loong outdated) * cut support for fox-1.5 * use eautomake instead of =automake-1.4* * use emake instead of make * use elog instead of einfo * apply more variable quoting I'm sure, I missed one or the other issue. That's why I'm posting it here for public review. If you have requests or comments to make, please reply to this thread. Could you also send a diff next time. Regards, Petteri signature.asc Description: OpenPGP digital signature
Re: [gentoo-dev] RFC: fox.eclass update
On 13:56 Mon 13 Oct , Petteri Räty wrote: Could you also send a diff next time. Or this time, even. +1 on that. One easy thing to do is move what comments exist to the eclass-manpages format. -- Thanks, Donnie Donnie Berkholz Developer, Gentoo Linux Blog: http://dberkholz.wordpress.com pgpE4dFNeVYYH.pgp Description: PGP signature
Re: [gentoo-dev] RFC: fox.eclass update
Donnie Berkholz [EMAIL PROTECTED] wrote:
On 13:56 Mon 13 Oct , Petteri Räty wrote:
Could you also send a diff next time.
Or this time, even. +1 on that.
Here you are. It's attached.
One easy thing to do is move what comments exist to the eclass-manpages
format.
I also included some eclass-manpage foo now, thanks for the hint.
--
Regards, Matti Bickel
Signed/Encrypted email preferred (key 4849EC6C)
--- gentoo-x86/eclass/fox.eclass2008-10-12 14:31:36.0 +0200
+++ fox-proposed.eclass 2008-10-13 20:27:05.0 +0200
@@ -1,8 +1,12 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.8 2008/10/12 12:31:36
mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:27:06
mabi Exp $
-# fox eclass
+# @ECLASS: fox.eclass
+# @MAINTAINER: [EMAIL PROTECTED]
+# @BLURB: Common build and install functions for fox-related apps and library
+# @DESCRIPTION: Used by the x11-libs/fox library and all applications that come
+# with the upstream source tarball.
#
# This eclass allows building SLOT-able FOX Toolkit installations
# (x11-libs/fox: headers, libs, and docs), which are by design
@@ -19,26 +23,18 @@
# are API unstable; changes are made to the apps, and likely need to be
# bumped together with the library.
#
-# Here are sample [R]DEPENDs for the fox apps
-# fox versions that do not use this eclass are blocked in INCOMPAT_DEP below
-# 1.0: '=x11-libs/fox-1.0*'
-# 1.2: '=x11-libs/fox-1.2*'
+# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
+#
+# @EXAMPLE: Here are sample [R]DEPENDs for the fox apps
# 1.4: '=x11-libs/fox-1.4*'
# 1.5: '~x11-libs/fox-${PV}'
# 1.6: '=x11-libs/fox-${FOXVER}*'
-#
-# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
-
-inherit eutils libtool versionator
+inherit autotools eutils libtool versionator
FOX_PV=${FOX_PV:-${PV}}
-PVP=(${FOX_PV//[-\._]/ })
-FOXVER=${PVP[0]}.${PVP[1]}
-
-if [ ${FOXVER} != 1.0 ] ; then
- FOXVER_SUFFIX=-${FOXVER}
-fi
+FOXVER=$(get_version_component_range 1-2)
+FOXVER_SUFFIX=-${FOXVER}
DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily
and effectively
HOMEPAGE=http://www.fox-toolkit.org/;
@@ -46,44 +42,28 @@
IUSE=debug doc profile
-# from fox-1.0
-FOX_APPS=adie calculator pathfinder
-# from fox-1.2+
-if [ ${FOXVER} != 1.0 ] ; then
- FOX_APPS=${FOX_APPS} shutterbug
- FOX_CHART=chart
-fi
+# @ECLASS-VARIABLE: FOX_APPS
+# @DESCRIPTION: all applications that come with the fox toolkit source
+FOX_APPS=adie calculator pathfinder shutterbug chart
if [ ${PN} != fox ] ; then
FOX_COMPONENT=${FOX_COMPONENT:-${PN}}
fi
-if [ ${FOXVER} != 1.0 ] [ -z ${FOX_COMPONENT} ] ; then
- DOXYGEN_DEP=doc? ( app-doc/doxygen )
-fi
-
if [ ${PN} != reswrap ] ; then
RESWRAP_DEP=dev-util/reswrap
fi
-# These versions are not compatible with new fox layout
-# and will cause collissions - we need to block them
-INCOMPAT_DEP=!x11-libs/fox-1.0.53
- !=x11-libs/fox-1.2.4
- !~x11-libs/fox-1.2.6
- !=x11-libs/fox-1.4.11
-
-DEPEND=${INCOMPAT_DEP}
- ${DOXYGEN_DEP}
- ${RESWRAP_DEP}
- =sys-devel/automake-1.4*
+DEPEND=${RESWRAP_DEP}
+ doc? ( app-doc/doxygen )
+ =sys-devel/automake-1.4
=sys-apps/sed-4
S=${WORKDIR}/fox-${FOX_PV}
fox_src_unpack() {
unpack ${A}
- cd ${S}
+ cd ${S}
ebegin Fixing configure
@@ -103,14 +83,14 @@
done
# use the installed reswrap for everything else
- for d in ${FOX_APPS} ${FOX_CHART} tests ; do
+ for d in ${FOX_APPS} tests ; do
sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
- if version_is_at_least 1.6.34 ${PV} ; then
+ if version_is_at_least 1.6.34 ${PV}; then
sed -i \
-e s:-I\$(top_srcdir)/include
-I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}: \
-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
@@ -124,19 +104,13 @@
${d}/Makefile.am || die sed ${d}/Makefile.am
error
fi
done
-
- # Upstream often has trouble with version number transitions
- if [ ${FOXVER} == 1.5 ] ; then
- sed -i -e 's:1.4:1.5:g' chart/Makefile.am
- fi
-
eend
ebegin Running automake
- automake-1.4 -a -c || die automake error
+ eautomake || die automake error
eend
- elibtoolize
+ #elibtoolize
}
fox_src_compile() {
@@ -150,21 +124,21 @@
$(use_with profile profiling) \
[gentoo-dev] RFC: fox.eclass update
Hi folks,
While fixing bug #240060 I touched fox.eclass.
In the process, I updated the eclass to
* use versionator
* cut support for fox-1.0 (loong outdated)
* cut support for fox-1.5
* use eautomake instead of =automake-1.4*
* use emake instead of make
* use elog instead of einfo
* apply more variable quoting
I'm sure, I missed one or the other issue. That's why I'm posting it
here for public review. If you have requests or comments to make, please
reply to this thread.
--
Regards, Matti Bickel
Signed/Encrypted email preferred (key 4849EC6C)
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/fox.eclass,v 1.7 2007/01/15 20:27:06
mabi Exp $
# fox eclass
#
# This eclass allows building SLOT-able FOX Toolkit installations
# (x11-libs/fox: headers, libs, and docs), which are by design
# parallel-installable, while installing only one version of the utils
# (dev-util/reswrap) and apps (app-editors/adie, sci-calculators/calculator,
# x11-misc/pathfinder, and x11-misc/shutterbug).
#
# Version numbering follows the kernel-style odd-even minor version
# designation. Even-number minor versions are API stable, which patch
# releases aimed mostly at the library; apps generally won't need to be
# bumped for a patch release.
#
# Odd-number versions are development branches with their own SLOT and
# are API unstable; changes are made to the apps, and likely need to be
# bumped together with the library.
#
# Here are sample [R]DEPENDs for the fox apps
# 1.4: '=x11-libs/fox-1.4*'
# 1.5: '~x11-libs/fox-${PV}'
# 1.6: '=x11-libs/fox-${FOXVER}*'
#
# Some concepts borrowed from gst-plugins and gtk-sharp-component eclasses
inherit autotools eutils libtool versionator
FOX_PV=${FOX_PV:-${PV}}
FOXVER=$(get_version_component_range 1-2)
FOXVER_SUFFIX=-${FOXVER}
DESCRIPTION=C++ based Toolkit for developing Graphical User Interfaces easily
and effectively
HOMEPAGE=http://www.fox-toolkit.org/;
SRC_URI=http://www.fox-toolkit.org/ftp/fox-${FOX_PV}.tar.gz;
IUSE=debug doc profile
FOX_APPS=adie calculator pathfinder shutterbug chart
if [ ${PN} != fox ] ; then
FOX_COMPONENT=${FOX_COMPONENT:-${PN}}
fi
if [ ${PN} != reswrap ] ; then
RESWRAP_DEP=dev-util/reswrap
fi
DEPEND=${RESWRAP_DEP}
doc? ( app-doc/doxygen )
=sys-devel/automake-1.4
=sys-apps/sed-4
S=${WORKDIR}/fox-${FOX_PV}
fox_src_unpack() {
unpack ${A}
cd ${S}
ebegin Fixing configure
# Respect system CXXFLAGS
sed -i -e 's:CXXFLAGS=::' configure.in || die sed configure.in error
touch aclocal.m4
sed -i -e 's:CXXFLAGS=::' configure || die sed configure error
eend
ebegin Fixing Makefiles
# don't build apps from top-level (i.e. x11-libs/fox)
# utils == reswrap
for d in ${FOX_APPS} utils windows ; do
sed -i -e s:${d}:: Makefile.am || die sed Makefile.am error
done
# use the installed reswrap for everything else
for d in ${FOX_APPS} tests ; do
sed -i -e 's:$(top_builddir)/utils/reswrap:reswrap:' \
${d}/Makefile.am || die sed ${d}/Makefile.am error
done
# use the installed headers and library for apps
for d in ${FOX_APPS} ; do
if version_is_at_least 1.6.34 ${PV}; then
sed -i \
-e s:-I\$(top_srcdir)/include
-I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}: \
-e 's:$(top_builddir)/src/libFOX:-lFOX:' \
-e 's:\.la::' \
${d}/Makefile.am || die sed ${d}/Makefile.am
error
else
sed -i \
-e s:-I\$(top_srcdir)/include
-I\$(top_builddir)/include:-I\$(includedir)/fox${FOXVER_SUFFIX}: \
-e 's:../src/libFOX:-lFOX:' \
-e 's:\.la::' \
${d}/Makefile.am || die sed ${d}/Makefile.am
error
fi
done
eend
ebegin Running automake
eautomake || die automake error
eend
#elibtoolize
}
fox_src_compile() {
local myconf
use debug myconf=${myconf} --enable-debug \
|| myconf=${myconf} --enable-release
econf \
${FOXCONF} \
${myconf} \
$(use_with profile profiling) \
|| die configure error
cd ${S}/${FOX_COMPONENT}
emake || die compile error
# build class reference docs (FOXVER = 1.2)
if use doc [ -z ${FOX_COMPONENT} ] ; then
cd ${S}/doc
emake docs || die doxygen error
fi
}
fox_src_install () {
cd ${S}/${FOX_COMPONENT}
