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

create-mkspec.sh: Create-mkspec.sh remove %exclude opt/$NAME/make/*.mk from spec

Browse source 
Not exactly sure why this was needed in the first place. It apparently
was introduced on 2013-03-18, and already then denoted as a kludge.

Also some more code beautification

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-09-07 10:06:58 +00:00
commit 0d14436afb
1 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

45
scripts/create-mkspec.sh
View file

@ -22,7 +22,7 @@ _cat()
subpackages() subpackages()
{ {
echo $SUBPACKAGES echo $subpackages
} }
# -- here we go # -- here we go
@ -34,16 +34,16 @@ dir=`dirname $0`
inifile="$1" inifile="$1"
. $dir/ini-tools.sh . $dir/ini-tools.sh
LICENSE=`cfg_value global.license` subpackages=`cfg_value global.subpackages`
[ "$LICENSE" ] || LICENSE="janware GmbH proprietary license" license=`cfg_value global.license`
SUBPACKAGES=`cfg_value global.subpackages` [ "$license" ] || license="janware GmbH proprietary license"
_cat << EOT _cat <<- EOT
|echo "Name: \$NAME" |echo "Name: \$NAME"
|echo "Summary: `cfg_value summary`" |echo "Summary: `cfg_value summary`"
|echo "Version: \$VERSION" |echo "Version: \$VERSION"
|echo "Release: \$RELEASE" |echo "Release: \$RELEASE"
|echo "License: $LICENSE" |echo "License: $license"
|echo "Group: System/Libraries" |echo "Group: System/Libraries"
|[ -n "\$SOURCE" ] && echo "Source: \$SOURCE" |[ -n "\$SOURCE" ] && echo "Source: \$SOURCE"
|echo "Vendor: janware GmbH" |echo "Vendor: janware GmbH"
@ -55,7 +55,8 @@ _cat << EOT
|echo "`cfg_value description`" |echo "`cfg_value description`"
|echo "" |echo ""
EOT EOT
subpackages | grep -q run && _cat << EOT
subpackages | grep -q run && _cat <<- EOT
|# --------------------------------------- |# ---------------------------------------
|echo "%package -n \$NAME-run" |echo "%package -n \$NAME-run"
|echo "Summary: `cfg_value summary`" |echo "Summary: `cfg_value summary`"
@ -66,7 +67,8 @@ subpackages | grep -q run && _cat << EOT
|echo "Runtime package" |echo "Runtime package"
|echo "" |echo ""
EOT EOT
subpackages | grep -q devel && _cat << EOT
subpackages | grep -q devel && _cat <<- EOT
|# --------------------------------------- |# ---------------------------------------
|echo "%package -n \$NAME-devel" |echo "%package -n \$NAME-devel"
|echo "Summary: `cfg_value summary`, development package" |echo "Summary: `cfg_value summary`, development package"
@ -77,13 +79,14 @@ subpackages | grep -q devel && _cat << EOT
|echo "Development package" |echo "Development package"
|echo "" |echo ""
EOT EOT
subpackages | grep -q run && _cat << EOT
subpackages | grep -q run && _cat <<- EOT
|# --------------------------------------- |# ---------------------------------------
|echo "%prep -n \$NAME-run" |echo "%prep -n \$NAME-run"
|echo "" |echo ""
EOT EOT
_cat << EOT _cat <<- EOT
|echo "%setup -q -n \$NAME-\$V" |echo "%setup -q -n \$NAME-\$V"
|echo "" |echo ""
|echo "%build" |echo "%build"
@ -99,12 +102,13 @@ _cat << EOT
|echo "> \$INSTALL_LOG" |echo "> \$INSTALL_LOG"
|echo "make install" |echo "make install"
|echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH" |echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH"
|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$SUBPACKAGES\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`" |echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$subpackages\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
|echo "" |echo ""
EOT EOT
# -- scripts # -- scripts
for p in $SUBPACKAGES; do
for p in $subpackages; do
for stage in pre preun post postun; do for stage in pre preun post postun; do
echo "================= processing stage $stage: cfg_section pkg.$p.$stage" >&2 echo "================= processing stage $stage: cfg_section pkg.$p.$stage" >&2
cfg_section pkg.$p.$stage >&2 cfg_section pkg.$p.$stage >&2
@ -118,23 +122,28 @@ for p in $SUBPACKAGES; do
} }
done done
done done
_cat << EOT
_cat <<- EOT
|echo "" |echo ""
|echo "%clean" |echo "%clean"
|#echo 'rm -rf \$RPM_BUILD_ROOT' |#echo 'rm -rf \$RPM_BUILD_ROOT'
EOT EOT
subpackages | grep -q run && _cat << EOT
subpackages | grep -q run && _cat <<- EOT
|echo "%files -n \$NAME-run -f \$INSTALL_LOG.\$NAME-run" |echo "%files -n \$NAME-run -f \$INSTALL_LOG.\$NAME-run"
EOT EOT
if subpackages | grep -q devel; then _cat << EOT
if subpackages | grep -q devel; then _cat <<- EOT
|echo "%files -n \$NAME-devel -f \$INSTALL_LOG.\$NAME-devel" |echo "%files -n \$NAME-devel -f \$INSTALL_LOG.\$NAME-devel"
EOT EOT
cfg_section pkg.devel.post cfg_section pkg.devel.post
else else
_cat << EOT _cat <<- EOT
|echo "%exclude /opt/\$NAME/make/*.mk" |# don't remember why this was needed
|#echo "%exclude /opt/\$NAME/make/*.mk"
EOT EOT
fi fi
_cat << EOT
_cat <<- EOT
|echo '%defattr (-, root, root)' |echo '%defattr (-, root, root)'
EOT EOT