trunk instead of git

This commit is contained in:
Gwenhael Le Moine 2021-06-15 10:21:32 +02:00
parent 01c7e912b2
commit 52265bd942
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
2 changed files with 10 additions and 6 deletions

View file

@ -1,10 +1,12 @@
#!/bin/sh #!/bin/bash
set -e
# variables # variables
CWD=$(pwd) CWD=$(pwd)
PRGNAM=$(basename $CWD) PRGNAM=$(basename $CWD)
VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} VERSION=${VERSION:-"trunk"}
ARCH=${ARCH:-$(uname -m)} ARCH=${ARCH:-$(uname -m)}
BUILD=1 BUILD=1
@ -27,12 +29,14 @@ mkdir -p $PKG
# mise en place # mise en place
cd $TMP cd $TMP
[ ! -e $REPOSITORY ] && git clone https://github.com/HowardHinnant/date.git $REPOSITORY [ ! -e $REPOSITORY ] && git clone https://github.com/HowardHinnant/date.git $REPOSITORY
cd $REPOSITORY
git pull --all
VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )"
cp -R $REPOSITORY $TMP/$PRGNAM cp -R $REPOSITORY $TMP/$PRGNAM
cd $TMP/$PRGNAM cd $TMP/$PRGNAM
[ "x$VERSION" == "xtrunk" ] && VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" || git checkout $VERSION
# configuration # configuration
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_INSTALL_PREFIX=$PREFIX \

View file

@ -3,7 +3,7 @@
set -e set -e
# variables # variables
VERSION=${VERSION:-"git"} VERSION=${VERSION:-"trunk"}
BUILD=1 BUILD=1
TAG=gwh TAG=gwh
@ -32,7 +32,7 @@ git pull --all
cp -R $REPOSITORY $TMP/ cp -R $REPOSITORY $TMP/
cd $TMP/$PRGNAM/ cd $TMP/$PRGNAM/
[ "x$VERSION" == "xgit" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION [ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION
meson setup --prefix /usr --mandir /usr/man/ build/ meson setup --prefix /usr --mandir /usr/man/ build/
ninja -C build/ ninja -C build/