janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

ini-tools.sh: Now not passing inifile as global variable any longer

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-02 09:49:34 +00:00
commit 0b3332cc56
3 changed files with 63 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

46
scripts/create-mkspec.sh
View file

@ -1,9 +1,19 @@
#!/bin/sh
dir=`dirname $0`
inifile=$1
inifile="$1"
. $dir/ini-tools.sh
cfg_section()
{
ini_section "$inifile" $@
}
cfg_value()
{
ini_value "$inifile" $@
}
_cat()
{
sed 's/^ *|//'
@ -11,7 +21,7 @@ _cat()
_cat << EOT
|echo "Name: \$NAME"
|echo "Summary: `ini_value summary`"
|echo "Summary: `cfg_value summary`"
|echo "Version: \$VERSION"
|echo "Release: \$RELEASE"
|echo "License: Jannet IT Services proprietary license"
@ -22,30 +32,30 @@ _cat << EOT
|echo "BuildRoot: /var/tmp/%{name}-buildroot"
|echo ""
|echo "%description"
|echo "`ini_value description`"
|echo "`cfg_value description`"
|echo ""
EOT
ini_value global.subpackages | grep -q run && _cat << EOT
cfg_value global.subpackages | grep -q run && _cat << EOT
|# ---------------------------------------
|echo "%package -n \$NAME-run"
|echo "Summary: `ini_value summary`"
|echo "Group: `ini_value global.group`"
|echo "Summary: `cfg_value summary`"
|echo "Group: `cfg_value global.group`"
|[ "\$REQUIRES_RUN" ] && echo "Requires: \$REQUIRES_RUN"
|echo "%description -n \$NAME-run"
|echo "Runtime package"
|echo ""
EOT
ini_value global.subpackages | grep -q devel && _cat << EOT
cfg_value global.subpackages | grep -q devel && _cat << EOT
|# ---------------------------------------
|echo "%package -n \$NAME-devel"
|echo "Summary: `ini_value summary`, development package"
|echo "Group: `ini_value global.group`"
|echo "Summary: `cfg_value summary`, development package"
|echo "Group: `cfg_value global.group`"
|[ "\$REQUIRES_DEVEL" ] && echo "Requires: \$REQUIRES_DEVEL"
|echo "%description -n \$NAME-devel"
|echo "Development package"
|echo ""
EOT
ini_value global.subpackages | grep -q run && _cat << EOT
cfg_value global.subpackages | grep -q run && _cat << EOT
|# ---------------------------------------
|echo "%prep -n \$NAME-run"
|echo ""
@ -72,16 +82,16 @@ _cat << EOT
EOT
# -- scripts
for p in `ini_value global.subpackages`; do
for p in `cfg_value global.subpackages`; do
for stage in preun post postun; do
echo "================= processing stage $stage: ini_section pkg.$p.$stage" >&2
ini_section pkg.$p.$stage >&2
ini_section pkg.$p.$stage | grep -q . && {
echo "================= processing stage $stage: cfg_section pkg.$p.$stage" >&2
cfg_section pkg.$p.$stage >&2
cfg_section pkg.$p.$stage | grep -q . && {
_cat <<- EOT
|echo "%$stage -n \$NAME-$p"
EOT
echo "cat << EOT"
ini_section pkg.$p.$stage | ini_escape
cfg_section pkg.$p.$stage | cfg_escape
echo "EOT"
}
done
@ -91,13 +101,13 @@ _cat << EOT
|echo "%clean"
|#echo 'rm -rf \$RPM_BUILD_ROOT'
EOT
ini_value global.subpackages | grep -q run && _cat << EOT
cfg_value global.subpackages | grep -q run && _cat << EOT
|echo "%files -n \$NAME-run -f \$INSTALL_LOG.\$NAME-run"
EOT
if ini_value global.subpackages | grep -q devel; then _cat << EOT
if cfg_value global.subpackages | grep -q devel; then _cat << EOT
|echo "%files -n \$NAME-devel -f \$INSTALL_LOG.\$NAME-devel"
EOT
ini_section pkg.devel.post
cfg_section pkg.devel.post
else
_cat << EOT
|echo "%exclude /opt/\$NAME/make/*.mk"