pygos/build
1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-11-22 19:19:46 +01:00
Code Issues Releases Wiki Activity

cleanup: move actual package build to helper function

Browse source 
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-03-09 17:15:58 +01:00
parent 01256c6ab9
commit b77f8892bb
2 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mk.sh
View file

@ -45,6 +45,7 @@ source "$SCRIPTDIR/util/pkgcmd.sh"
source "$SCRIPTDIR/util/misc.sh" source "$SCRIPTDIR/util/misc.sh"
source "$SCRIPTDIR/util/override.sh" source "$SCRIPTDIR/util/override.sh"
source "$SCRIPTDIR/util/autotools.sh" source "$SCRIPTDIR/util/autotools.sh"
source "$SCRIPTDIR/util/build_package.sh"
############################## toolchain config ############################## ############################## toolchain config ##############################
include_merge "TOOLCHAIN" include_merge "TOOLCHAIN"
@ -90,40 +91,7 @@ echo "--- building packages ---"
while read pkg; do while read pkg; do
include_pkg "$pkg" include_pkg "$pkg"
build_package
found="yes"
for f in $SUBPKG; do
if [ ! -f "$REPODIR/${f}.pkg" ]; then
found="no"
break
fi
done
[ "x$found" == "xno" ] || continue;
for f in $SUBPKG; do
rm -f "$REPODIR/${f}.pkg"
done
rm -rf "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
mkdir -p "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
if [ ! -z "$DEPENDS" ]; then
pkg install -omD -r "$TCDIR/$TARGET" -R "$REPODIR" $DEPENDS
fi
run_pkg_command "build"
run_pkg_command "deploy"
deploy_dev_cleanup
strip_files ${PKGDEPLOYDIR}/{bin,lib}
for f in $SUBPKG; do
pkg pack -r "$REPODIR" -d "$PKGDEPLOYDIR/${f}.desc" \
-l "$PKGDEPLOYDIR/${f}.files"
done
rm -rf "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
done < "$PACKAGELIST" done < "$PACKAGELIST"
echo "--- done ---" echo "--- done ---"

37
util/build_package.sh Normal file
View file

@ -0,0 +1,37 @@
build_package() {
found="yes"
for f in $SUBPKG; do
if [ ! -f "$REPODIR/${f}.pkg" ]; then
found="no"
break
fi
done
if [ "x$found" == "xyes" ]; then
return
fi
for f in $SUBPKG; do
rm -f "$REPODIR/${f}.pkg"
done
rm -rf "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
mkdir -p "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
if [ ! -z "$DEPENDS" ]; then
pkg install -omD -r "$TCDIR/$TARGET" -R "$REPODIR" $DEPENDS
fi
run_pkg_command "build"
run_pkg_command "deploy"
deploy_dev_cleanup
strip_files ${PKGDEPLOYDIR}/{bin,lib}
for f in $SUBPKG; do
pkg pack -r "$REPODIR" -d "$PKGDEPLOYDIR/${f}.desc" \
-l "$PKGDEPLOYDIR/${f}.files"
done
rm -rf "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"
}