moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

Major infrastructure changes, part 2.

Browse source 
* Moved helpers, common and triggers dirs into xbps-src, where
  they belong.
* Renamed the templates dir to srcpkgs, it was so redundant before.
* Make it possible to add subpkgs with no restriction in names, for
  example udev now has a subpkgs called "libgudev". Previously
  subpkgs were named "${sourcepkg}-${pkgname}".
* xbps-src: changed to look for template files in current directory.
  That means that most arguments from the targets have been removed.
* xbps-src: added a reinstall target, to remove + install.
* xbps-src: do not overwrite binpkgs by default, skip them.

And more that I forgot because it's a mega-commit that I've been
working for some days already...

--HG--
extra : convert_revision : 0f466878584d1e6895d2a234f07ea1b2d1e61b3e
This commit is contained in:
Juan RP 2009-11-22 08:31:44 +01:00
parent 3c58e3ad40
commit 85cc462e1d
1305 changed files with 719 additions and 654 deletions
Download patch file Download diff file Expand all files Collapse all files

76
xbps-src/shutils/tmpl_funcs.sh
View file

@ -47,7 +47,6 @@ info_tmpl()
echo "$long_desc"
echo
. $XBPS_SHUTILSDIR/builddep_funcs.sh
run_template $pkgname
check_build_depends_pkg
if [ $? -eq 0 ]; then
echo "This package requires the following dependencies to be built:"
@ -95,24 +94,43 @@ setup_tmpl()
{
local pkg="$1"
[ -z "$pkg" ] && msg_error "missing package name after target."
[ -z "$pkg" ] && return 1
[ "$pkgname" = "$pkg" ] && return 0
for f in $(echo $XBPS_COMMONVARSDIR/*.sh); do
[ -r ${f} ] && . ${f}
done
if [ -f "$XBPS_TEMPLATESDIR/$pkg/template" ]; then
if [ "$pkgname" != "$pkg" ]; then
reset_tmpl_vars
. $XBPS_TEMPLATESDIR/$pkg/template
fi
if [ -f $XBPS_SRCPKGDIR/${pkg}/template ]; then
reset_tmpl_vars
. $XBPS_SRCPKGDIR/${pkg}/template
prepare_tmpl
else
msg_error "cannot find '$pkg' template build file."
msg_error "Cannot find $pkg build template file."
fi
}
check_builddep_dup()
{
local dep="$1" i
for i in ${build_depends}; do
[ "${i}" != "${dep}" ] && continue
return 1
done
}
check_rundep_dup()
{
local dep="$1" i
for i in ${run_depends}; do
[ "${i}" != "${dep}" ] && continue
return 1
done
}
Add_dependency()
{
local type="$1" pkgname="$2" version="$3"
@ -124,29 +142,41 @@ Add_dependency()
[ -z "$pkgname" ] && msg_error "Add_dependency: pkgname empty!"
if [ -f $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends ]; then
. $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends
elif [ -f $XBPS_TEMPLATESDIR/${pkgname}/depends ]; then
. $XBPS_TEMPLATESDIR/${pkgname}/depends
if [ -f $XBPS_SRCPKGDIR/${pkgname}/${pkgname}.depends ]; then
. $XBPS_SRCPKGDIR/${pkgname}/${pkgname}.depends
elif [ -f $XBPS_SRCPKGDIR/${pkgname}/depends ]; then
. $XBPS_SRCPKGDIR/${pkgname}/depends
fi
if [ "$type" = "full" -o "$type" = "build" ]; then
if [ -z "$version" -a -z "$api_depends" ]; then
build_depends="${build_depends} ${pkgname}>=0"
if check_builddep_dup "${pkgname}>=0"; then
build_depends="${build_depends} ${pkgname}>=0"
fi
elif [ -z "$version" -a -n "$api_depends" ]; then
build_depends="${build_depends} ${pkgname}${api_depends}"
if check_builddep_dup "${pkgname}${api_depends}"; then
build_depends="${build_depends} ${pkgname}${api_depends}"
fi
else
build_depends="${build_depends} ${pkgname}${version}"
if check_builddep_dup "${pkgname}${version}"; then
build_depends="${build_depends} ${pkgname}${version}"
fi
fi
fi
if [ "$type" = "full" -o "$type" = "run" ]; then
if [ -z "$version" -a -z "$abi_depends" ]; then
run_depends="${run_depends} ${pkgname}>=0"
if check_rundep_dup "${pkgname}>=0"; then
run_depends="${run_depends} ${pkgname}>=0"
fi
elif [ -z "$version" -a -n "$abi_depends" ]; then
run_depends="${run_depends} ${pkgname}${abi_depends}"
if check_rundep_dup "${pkgname}${api_depends}"; then
run_depends="${run_depends} ${pkgname}${abi_depends}"
fi
else
run_depends="${run_depends} ${pkgname}${version}"
if check_rundep_dup "${pkgname}${version}"; then
run_depends="${run_depends} ${pkgname}${version}"
fi
fi
fi
@ -212,8 +242,8 @@ set_tmpl_common_vars()
{
[ -z "$pkgname" ] && return 1
FILESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/files
PATCHESDIR=${XBPS_TEMPLATESDIR}/${pkgname}/patches
FILESDIR=$XBPS_SRCPKGDIR/$pkgname/files
PATCHESDIR=$XBPS_SRCPKGDIR/$pkgname/patches
DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version}
if [ -z "${sourcepkg}" ]; then
sourcepkg=${pkgname}
@ -227,7 +257,11 @@ run_template()
if [ "$pkgname" != "$pkg" ]; then
reset_tmpl_vars
. $XBPS_TEMPLATESDIR/$pkg/template
if [ ! -d $XBPS_SRCPKGDIR/$pkg -o \
! -f $XBPS_SRCPKGDIR/$pkg/template ]; then
msg_error "Cannot find $pkg build template file!"
fi
. $XBPS_SRCPKGDIR/$pkg/template
set_tmpl_common_vars
fi
}