pygos/build
1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-11-25 04:20:41 +01:00
Code Issues Releases Wiki Activity

Remove "-dev" prefix for development files

Browse source 
Instead of adding a prefix, move development files to a different
deploy directory.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-02-17 02:03:39 +01:00
parent 93ade05725
commit 2147fbb3b2
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mk.sh
View file

@ -19,12 +19,13 @@ TCDIR="$BUILDROOT/$BOARD/toolchain"
PKGBUILDDIR="$BUILDROOT/$BOARD/build" PKGBUILDDIR="$BUILDROOT/$BOARD/build"
PKGSRCDIR="$BUILDROOT/src" PKGSRCDIR="$BUILDROOT/src"
PKGDEPLOYDIR="$BUILDROOT/$BOARD/deploy" PKGDEPLOYDIR="$BUILDROOT/$BOARD/deploy"
PKGDEVDEPLOYDIR="$BUILDROOT/$BOARD/deploy-dev"
PKGLOGDIR="$BUILDROOT/$BOARD/log" PKGLOGDIR="$BUILDROOT/$BOARD/log"
PKGDOWNLOADDIR="$BUILDROOT/download" PKGDOWNLOADDIR="$BUILDROOT/download"
PACKAGELIST="$BUILDROOT/$BOARD/pkglist" PACKAGELIST="$BUILDROOT/$BOARD/pkglist"
mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR" mkdir -p "$PKGDOWNLOADDIR" "$PKGSRCDIR" "$PKGLOGDIR"
mkdir -p "$PKGDEPLOYDIR" "$TCDIR/bin" mkdir -p "$PKGDEPLOYDIR" "$PKGDEVDEPLOYDIR" "$TCDIR/bin"
export PATH="$TCDIR/bin:$PATH" export PATH="$TCDIR/bin:$PATH"

4
pkg/tc-gcc2/build
View file

@ -28,7 +28,7 @@ deploy() {
for f in $(ls ${TCDIR}/${TARGET}/include); do for f in $(ls ${TCDIR}/${TARGET}/include); do
for dep in $DEPENDS; do for dep in $DEPENDS; do
if [ -e ${PKGDEPLOYDIR}/${dep}-dev/include/$f ]; then if [ -e ${PKGDEVDEPLOYDIR}/${dep}/include/$f ]; then
rm -rf "$TCDIR/$TARGET/include/$f" rm -rf "$TCDIR/$TARGET/include/$f"
fi fi
done done
@ -36,7 +36,7 @@ deploy() {
for f in $(ls ${TCDIR}/${TARGET}/lib); do for f in $(ls ${TCDIR}/${TARGET}/lib); do
for dep in $DEPENDS; do for dep in $DEPENDS; do
if [ -e ${PKGDEPLOYDIR}/${dep}-dev/lib/$f ]; then if [ -e ${PKGDEVDEPLOYDIR}/${dep}/lib/$f ]; then
rm -rf "$TCDIR/$TARGET/lib/$f" rm -rf "$TCDIR/$TARGET/lib/$f"
continue continue
fi fi

7
util/pkgcmd.sh
View file

@ -1,6 +1,7 @@
run_pkg_command() { run_pkg_command() {
local FUNCTION="$1" local FUNCTION="$1"
local DEPLOYDIR="$PKGDEPLOYDIR/$PKGNAME" local DEPLOYDIR="$PKGDEPLOYDIR/$PKGNAME"
local DEVDEPLOYDIR="$PKGDEVDEPLOYDIR/$PKGNAME"
local CHECKFILE="$PKGLOGDIR/.${PKGNAME}-${FUNCTION}" local CHECKFILE="$PKGLOGDIR/.${PKGNAME}-${FUNCTION}"
echo "$PKGNAME - $FUNCTION" echo "$PKGNAME - $FUNCTION"
@ -12,14 +13,14 @@ run_pkg_command() {
local LOGFILE="$PKGLOGDIR/${PKGNAME}-${FUNCTION}.log" local LOGFILE="$PKGLOGDIR/${PKGNAME}-${FUNCTION}.log"
local SRC="$PKGSRCDIR/$SRCDIR" local SRC="$PKGSRCDIR/$SRCDIR"
mkdir -p "$DEPLOYDIR" "$PKGBUILDDIR" "${DEPLOYDIR}-dev" mkdir -p "$PKGBUILDDIR" "$DEPLOYDIR" "$DEVDEPLOYDIR"
pushd "$PKGBUILDDIR" > /dev/null pushd "$PKGBUILDDIR" > /dev/null
$FUNCTION "$SRC" "$DEPLOYDIR" "${DEPLOYDIR}-dev" &>> "$LOGFILE" < /dev/null $FUNCTION "$SRC" "$DEPLOYDIR" "$DEVDEPLOYDIR" &>> "$LOGFILE" < /dev/null
popd > /dev/null popd > /dev/null
(rmdir "$DEPLOYDIR" || true) 2> /dev/null ; (rmdir "$DEPLOYDIR" || true) 2> /dev/null ;
(rmdir "${DEPLOYDIR}-dev" || true) 2> /dev/null ; (rmdir "$DEVDEPLOYDIR" || true) 2> /dev/null ;
touch "$CHECKFILE" touch "$CHECKFILE"
} }

2
util/toolchain.sh
View file

@ -21,7 +21,7 @@ install_build_deps() {
fi fi
for deppkg in $DEPENDS; do for deppkg in $DEPENDS; do
local devdir="$PKGDEPLOYDIR/${deppkg}-dev" local devdir="$PKGDEVDEPLOYDIR/$deppkg"
if [ -d "$devdir/include" ]; then if [ -d "$devdir/include" ]; then
cp -R "$devdir/include" "$TCDIR/$TARGET" cp -R "$devdir/include" "$TCDIR/$TARGET"