xbps-src: revamped build_style.

By default now it's assumed that if $build_style is not set, the template
uses 'custom-install' build, .e.g do_{build,configure,install}.

If it's set, a helper with the same name with .sh extension will be sourced
to set do_{build,configure,install} phases.

The exception is "meta-template" which currently it must be set via
build_style, probably will change in the future.
This commit is contained in:
Juan RP 2011-10-24 14:12:09 +02:00
parent 31452a3a22
commit 90204b7b28
9 changed files with 86 additions and 123 deletions

View file

@ -27,25 +27,14 @@
# Runs the "build" phase for a pkg. This builds the binaries and other
# related stuff.
#
do_make_build()
{
#
# Build package via make.
#
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
}
build_src_phase()
{
local f rval
local rval
[ -z $pkgname -o -z $version ] && return 1
#
# Skip this phase for meta-template and only-install style builds.
#
[ "$build_style" = "meta-template" -o \
"$build_style" = "only-install" ] && return 0
# Skip this phase for meta-template style builds.
[ "$build_style" = "meta-template" ] && return 0
[ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]\n"
@ -54,25 +43,18 @@ build_src_phase()
cd $build_wrksrc || return 1
fi
if [ "$build_style" = "python-module" ]; then
make_cmd="python"
make_build_args="setup.py build"
else
[ -z "$make_cmd" ] && make_cmd=make
[ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ] && \
makejobs="-j$XBPS_MAKEJOBS"
fi
# Run pre_build func.
if [ ! -f $XBPS_PRE_BUILD_DONE ]; then
run_func pre_build
[ $? -eq 0 ] && touch -f $XBPS_PRE_BUILD_DONE
fi
if [ "$build_style" = "custom-install" ]; then
run_func do_build
else
run_func do_make_build
if [ -r $XBPS_HELPERSDIR/${build_style}.sh ]; then
. $XBPS_HELPERSDIR/${build_style}.sh
fi
# do_build()
run_func do_build
rval=$?
# Run post_build func.
@ -81,8 +63,6 @@ build_src_phase()
[ $? -eq 0 ] && touch -f $XBPS_POST_BUILD_DONE
fi
unset makejobs
[ "$rval" -eq 0 ] && touch -f $XBPS_BUILD_DONE
return 0

View file

@ -28,52 +28,14 @@
# other stuff required to be able to build binaries or such.
#
# This variable can be used for packages wanting to use common arguments
# to GNU configure scripts.
#
export CONFIGURE_SHARED_ARGS="--prefix=/usr --sysconfdir=/etc \
--infodir=/usr/share/info --mandir=/usr/share/man \
--localstatedir=/var"
do_gnu_configure()
{
#
# Packages using GNU autoconf
#
${configure_script} ${CONFIGURE_SHARED_ARGS} ${configure_args}
}
do_nongnu_configure()
{
#
# Packages using custom configure scripts.
#
${configure_script} ${configure_args}
}
do_perl_configure()
{
#
# Packages that are perl modules and use Makefile.PL files.
# They are all handled by the helper perl-module.sh.
#
. $XBPS_HELPERSDIR/perl-module.sh
perl_module_build $pkgname
}
configure_src_phase()
{
local f rval
[ -z $pkgname ] && return 1
#
# Skip this phase for: meta-template, only-install,
# gnu_makefile and python-module style builds.
#
[ "$build_style" = "meta-template" -o \
"$build_style" = "only-install" -o \
"$build_style" = "gnu_makefile" -o \
"$build_style" = "python-module" ] && return 0
# Skip this phase for meta-template style builds.
[ "$build_style" = "meta-template" ] && return 0
cd $wrksrc || msg_error "unexistent build directory [$wrksrc].\n"
@ -83,27 +45,16 @@ configure_src_phase()
[ $? -eq 0 ] && touch -f $XBPS_PRECONFIGURE_DONE
fi
[ -z "$configure_script" ] && configure_script="./configure"
cd $wrksrc || return 1
if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || return 1
fi
if [ "$build_style" = "gnu_configure" ]; then
run_func do_gnu_configure
elif [ "$build_style" = "configure" ]; then
run_func do_nongnu_configure
elif [ "$build_style" = "perl-module" ]; then
run_func do_perl_configure
elif [ "$build_style" = "custom-install" ]; then
run_func do_configure
else
#
# Unknown build_style type won't work :-)
#
msg_error "$pkgver: unknown build_style [$build_style]\n"
if [ -r $XBPS_HELPERSDIR/${build_style}.sh ]; then
. $XBPS_HELPERSDIR/${build_style}.sh
fi
# run do_configure()
run_func do_configure
rval=$?
# Run post_configure func.

View file

@ -47,7 +47,7 @@ info_tmpl()
echo "maintainer: $maintainer"
[ -n "$homepage" ] && echo "Upstream URL: $homepage"
[ -n "$license" ] && echo "License(s): $license"
echo "build_style: $build_style"
[ -n "$build_style" ] && echo "build_style: $build_style"
for i in ${configure_args}; do
[ -n "$i" ] && echo "configure_args: $i"
done
@ -242,7 +242,7 @@ prepare_tmpl()
{
local REQ_VARS i found
REQ_VARS="pkgname version build_style short_desc long_desc"
REQ_VARS="pkgname version short_desc long_desc"
if [ "$build_style" = "meta-template" ]; then
nofetch=yes