Mercurial > vanilla

changeset 13:6639623adb59

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: simplify packages
author David Demelier <markand@malikania.fr>
date Fri, 22 Feb 2019 19:36:06 +0100
parents ba6aaa8845c9
children 9a1981080a45
files lib/libcddb/libcddb.sh lib/libogg/libogg.sh lib/libzip/libzip.sh lib/zlib/zlib.sh templates/autotools.sh templates/cmake.sh
diffstat 6 files changed, 51 insertions(+), 116 deletions(-) [+]
line wrap: on
line diff
--- a/lib/libcddb/libcddb.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/lib/libcddb/libcddb.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,38 +15,26 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./libcddb.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./libcddb.info
 
 case $(uname -m) in
 x86_64)
-	ARCH="amd64"
 	CFLAGS="-O2 -fPIC"
 	;;
 *)
-	ARCH="$(uname -m)"
 	CFLAGS="-O2"
 	;;
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvaf $CWD/$PKGNAME-$PKGVERSION.tar.bz2
-cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.bz2
+pushd $PKGNAME-$PKGVERSION
 
 CFLAGS="$CFLAGS" ./configure --prefix=/usr
 make
-make install DESTDIR=$DSTDIR
+make install DESTDIR=$DESTDIR
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libogg/libogg.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/lib/libogg/libogg.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,41 +15,29 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./libogg.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./libogg.info
 
 case $(uname -m) in
 x86_64)
-	ARCH="amd64"
 	CFLAGS="-O2 -fPIC"
 	;;
 *)
-	ARCH="$(uname -m)"
 	CFLAGS="-O2"
 	;;
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvaf $CWD/$PKGNAME-$PKGVERSION.tar.xz
-cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+pushd $PKGNAME-$PKGVERSION
 
 CFLAGS="$CFLAGS" \
 	./configure \
 	--prefix=/usr \
 	--docdir=/usr/share/doc/$PKGNAME-$PKGVERSION
 make
-make install DESTDIR=$DSTDIR
+make install DESTDIR=$DESTDIR
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/libzip/libzip.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/lib/libzip/libzip.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,47 +15,37 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./libzip.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./libzip.info
 
 case $(uname -m) in
 x86_64)
-	ARCH="amd64"
 	CFLAGS="-O2 -fPIC"
 	;;
 *)
-	ARCH="$(uname -m)"
 	CFLAGS="-O2"
 	;;
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
+
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.xz
+pushd $PKGNAME-$PKGVERSION
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvaf $CWD/$PKGNAME-$PKGVERSION.tar.xz
-cd $PKGNAME-$PKGVERSION
+# no option to disable documentation yet.
+if [ "${MAN:-yes}" = "no" ]; then
+	sed -i -e 's/ADD_SUBDIRECTORY(man)//' CMakeLists.txt
+fi
 
-
-mkdir build && cd build
+mkdir build && pushd build
 cmake .. \
 	-DCMAKE_C_FLAGS="$CFLAGS" \
 	-DCMAKE_INSTALL_LIBDIR=/usr/lib \
 	-DDOCUMENTATION_FORMAT="man" \
 	-DCMAKE_INSTALL_PREFIX=/usr
 make
-make install DESTDIR=$DSTDIR
-
-# no option to disable documentation yet.
-[ "${MAN:-yes}" == "no" ] && rm -rf $DSTDIR/usr/share/man
+make install DESTDIR=$DESTDIR
+popd
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION
--- a/lib/zlib/zlib.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/lib/zlib/zlib.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,38 +15,26 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./zlib.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./zlib.info
 
 case $(uname -m) in
 x86_64)
-	ARCH="amd64"
 	CFLAGS="-O2 -fPIC"
 	;;
 *)
-	ARCH="$(uname -m)"
 	CFLAGS="-O2"
 	;;
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvzf $CWD/$PKGNAME-$PKGVERSION.tar.gz
-cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+pushd $PKGNAME-$PKGVERSION
 
 CFLAGS="$CFLAGS" ./configure --prefix=/usr
 make
-make install DESTDIR=$DSTDIR
+make install DESTDIR=$DESTDIR
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION
--- a/templates/autotools.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/templates/autotools.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,14 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./template.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./template.info
 
 case $(uname -m) in
 x86_64)
@@ -36,17 +29,14 @@
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvaf $CWD/$PKGNAME-$PKGVERSION.tar.gz
-cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+pushd $PKGNAME-$PKGVERSION
 
 CFLAGS="$CFLAGS" ./configure --prefix=/usr
 make
-make install DESTDIR=$DSTDIR
+make install DESTDIR=$DESTDIR
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION
--- a/templates/cmake.sh	Fri Feb 22 16:10:37 2019 +0100
+++ b/templates/cmake.sh	Fri Feb 22 19:36:06 2019 +0100
@@ -15,14 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-. ./template.info
-
-CWD=$(pwd)
-TMP=${TMP:-/tmp/vpk}
-
-OBJDIR=$TMP/${PKGNAME}.work
-DSTDIR=$TMP/${PKGNAME}.install
-OUTDIR=$TMP/pkg
+source ./template.info
 
 case $(uname -m) in
 x86_64)
@@ -36,21 +29,19 @@
 esac
 
 set -e
-rm -rf $DSTDIR $OBJDIR
 
-mkdir -p $DSTDIR $OBJDIR $OUTDIR && cd $OBJDIR
-tar xvaf $CWD/$PKGNAME-$PKGVERSION.tar.gz
-cd $PKGNAME-$PKGVERSION
+rm -rf $PKGNAME-$PKGVERSION
+tar xvaf $PKGNAME-$PKGVERSION.tar.gz
+pushd $PKGNAME-$PKGVERSION
 
-mkdir build && cd build
+mkdir build && pushd build
 cmake .. \
 	-DCMAKE_C_FLAGS="$CFLAGS" \
 	-DCMAKE_CXX_FLAGS="$CFLAGS" \
 	-DCMAKE_INSTALL_PREFIX=/usr
 make
-make install DESTDIR=$DSTDIR
+make install DESTDIR=$DESTDIR
+popd
 
-cd $DSTDIR
-vpk package $OUTDIR/$PKGNAME-$PKGVERSION-$ARCH.txz
-
-rm -rf $DSTDIR $OBJDIR
+popd
+rm -rf $PKGNAME-$PKGVERSION