summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Jacobs2015-08-02 15:00:29 -0400
committerJustin Jacobs2015-08-02 15:51:24 -0400
commitb8090f37d5252567c6f75333a9abc610591eb200 (patch)
tree6e0e5a85800b2961a3313d72563c39eb4eb476d9
parentb9d9c96b8d0e4f4a0c4687ad63508e1a5d6a7b71 (diff)
downloadaur-b8090f37d5252567c6f75333a9abc610591eb200.tar.gz
Add git repo to sources, add pkgver(), remove unnecessary git commands
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD46
2 files changed, 15 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..131ae4a32ec8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+flare-engine/
+pkg/
+src/
+flare-engine-git*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index 911a2686b2de..84ca38030ffc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: dorkster <jajdorkster@gmail.com>
pkgname=flare-engine-git
-pkgver=20141113
+pkgver=v0.19.r1126.g54f2e80
pkgrel=1
pkgdesc="Free/Libre Action Roleplaying Engine - Git version"
url="http://www.flarerpg.org/"
@@ -11,50 +11,26 @@ makedepends=('git>=1.7.10-1' 'cmake')
depends=('sdl2_image' 'sdl2_mixer' 'sdl2_ttf' 'hicolor-icon-theme' 'python')
conflicts=('flare-engine')
replaces=('flare-engine')
-install=flare-engine-git.install
-source=('flare-engine-git.install')
-sha1sums=('f1399479b57f5948fb07b188c7599c1f04d2989b')
+install="flare-engine-git.install"
+source=("git://github.com/clintbellanger/flare-engine.git" 'flare-engine-git.install')
+sha1sums=('SKIP' 'f1399479b57f5948fb07b188c7599c1f04d2989b')
-_gitroot="git://github.com/clintbellanger/"
-_gitname="flare-engine"
-_repo="flare-engine"
+pkgver() {
+ cd $srcdir/flare-engine
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
build() {
- cd $srcdir
- msg "Connecting to the GIT server..."
-
- if [[ -d $srcdir/$_repo ]] ; then
- msg "Updating flare-game"
- cd $_repo
- msg "Removing build files..."
- git clean -dfx
- msg "Updating..."
- git pull --no-tags
- msg "Updating flare"
- else
- msg "Cloning..."
- git clone $_gitroot$_repo --depth 1 --single-branch
+ cd $srcdir/flare-engine
- msg "Clone done."
- fi
-
- cd $srcdir/$_repo
- msg "Starting compile..."
- msg "Creating and moving to build directory..."
- mkdir build
- cd build
msg "Running cmake..."
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=bin -DDATADIR=share/flare
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DBINDIR=bin -DDATADIR=share/flare
msg "Compiling..."
make
}
package() {
- cd $srcdir/$_repo
+ cd $srcdir/flare-engine
msg "Installing..."
- cd build
make install DESTDIR=$pkgdir
-
- # HACK: this file is essentially empty and conflicts with the same file in flare-game
- rm -vf $pkgdir/usr/share/flare/mods/mods.txt
}