Changes to accomodate infopage compression

Do't include pristine source in the tardist to save space. Instead
only local patches will be in the opt.src subsystem (now truly optional)
Add a - infront of the shortdesc, it looks nicer in swmgr
This commit is contained in:
Tom G. Christensen 2004-10-16 09:53:18 +00:00
parent c050cce4ec
commit 1a59293fc4

View File

@ -41,6 +41,7 @@ strip_static_args="" # GNU default is -g
usedepend=1 # Don't use depend file even if it's available usedepend=1 # Don't use depend file even if it's available
usescripts=1 # Don't add ops even if they're available usescripts=1 # Don't add ops even if they're available
ignore_unpackaged_files=0 # default to check for unpackaged files in the stage area ignore_unpackaged_files=0 # default to check for unpackaged files in the stage area
include_source=0 # Include source[x] in the opt.src subsystem and not just patch[x]
# ver_width controls the width of the pkgversion numbers created # ver_width controls the width of the pkgversion numbers created
# do *not* change this blindly # do *not* change this blindly
@ -636,6 +637,9 @@ parse_def()
;; ;;
'shortdesc') 'shortdesc')
shortdesc="$(_upls ${line:$equalindex:${#line}})" shortdesc="$(_upls ${line:$equalindex:${#line}})"
if [ ! -z "$shortdesc" ]; then
shortdesc=" - $shortdesc"
fi
;; ;;
esac esac
else # Perhaps we hit 'files'? else # Perhaps we hit 'files'?
@ -708,11 +712,11 @@ check_unpackaged()
auto_src() auto_src()
{ {
local distsrcdir="${stagedir}${metainstalldir}/src/$topdir-$version-$pkgver" local distsrcdir="${stagedir}${metainstalldir}/src/$topdir-$version-$pkgver"
$MKDIR -p $distsrcdir
# Add patches # Add patches
local numpatch=${#patch[@]} local numpatch=${#patch[@]}
local pnum=0 local pnum=0
if [ "$numpatch" -gt 0 ]; then if [ "$numpatch" -gt 0 ]; then
$MKDIR -p $distsrcdir
for ((pnum=0; pnum < $numpatch; pnum++)) for ((pnum=0; pnum < $numpatch; pnum++))
do do
if [ ! -z ${patch[$pnum]} ]; then # They didn't give us an empty string if [ ! -z ${patch[$pnum]} ]; then # They didn't give us an empty string
@ -732,6 +736,8 @@ auto_src()
done done
fi fi
# Add sourcecode # Add sourcecode
if [ $include_source -eq 1 ]; then
$MKDIR -p $distsrcdir
local numsource=${#source[@]} local numsource=${#source[@]}
local snum=0 local snum=0
for ((snum=0; $snum < $numsource; snum++)) for ((snum=0; $snum < $numsource; snum++))
@ -745,6 +751,7 @@ auto_src()
$CP ${source[$snum]} $distsrcdir $CP ${source[$snum]} $distsrcdir
fi fi
done done
fi
} }
# auto_rel(): Fix up and add releasenotes to stagedir # auto_rel(): Fix up and add releasenotes to stagedir
@ -807,18 +814,27 @@ generic_pack()
local dir_prefix="${prefix#$topinstalldir*}" local dir_prefix="${prefix#$topinstalldir*}"
if [ "$shortroot" -eq 1 ]; then if [ "$shortroot" -eq 1 ]; then
if [ $catman -eq 1 -a -d $stagedir/man ]; then if [ $catman -eq 1 -a -d $stagedir/${_mandir} ]; then
setdir $stagedir/man setdir $stagedir/${_mandir}
fix_man fix_man
[ "$gzman" -eq 1 ] && compress_man [ "$gzman" -eq 1 ] && compress_man
fi fi
if [ $gzinfo -eq 1 -a -d ${stagedir}/${_infodir} ]; then
setdir $stagedir/${_infodir}
compress_info
fi
setdir stage setdir stage
metainstalldir=/
else else
if [ $catman -eq 1 -a -d ${stagedir}${topinstalldir}${dir_prefix}/man ]; then if [ $catman -eq 1 -a -d ${stagedir}${topinstalldir}${dir_prefix}/${_mandir} ]; then
setdir ${stagedir}${topinstalldir}${dir_prefix}/man setdir ${stagedir}${topinstalldir}${dir_prefix}/${_mandir}
fix_man fix_man
[ "$gzman" -eq 1 ] && compress_man [ "$gzman" -eq 1 ] && compress_man
fi fi
if [ $gzinfo -eq 1 -a -d ${stagedir}/${_infodir} ]; then
setdir $stagedir/${_infodir}
compress_info
fi
setdir $stagedir$topinstalldir setdir $stagedir$topinstalldir
fi fi
auto_src # Add any patches auto_src # Add any patches