summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Frei2020-03-24 18:35:18 +0100
committerJonas Frei2020-03-24 18:35:18 +0100
commit8692ea1fadddd62adabc3ba616871849e884d007 (patch)
tree8605646f91054c829bcac6ec688a52a1cf97bd3f
parent0edcdb29bcd1aaa778dcf06ab84c764c4f5934d5 (diff)
downloadaur-8692ea1fadddd62adabc3ba616871849e884d007.tar.gz
Using SCP's new versioning scheme (year numbers)
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
2 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 89213c6756c2..a0b42b294c9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = fs2_open-git
pkgdesc = An enhancement of the original Freespace 2 engine - GIT version
- pkgver = 3.8.1.54455522b
- pkgrel = 2
+ pkgver = 20.1.0.r20200319.caebad7.0
+ pkgrel = 1
url = http://scp.indiegames.us
install = fs2_open-git.install
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 1cbf4d9bbad6..c0b713a95a51 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: freijon <freijon@gmail.com>
-# Contributor: Lone_Wolf <lonewolf@xs4all.nl>, ZekeSulastin <zekesulastin@gmail.com>
+# Contributor: Lone_Wolf <lonewolf@xs4all.nl>, ZekeSulastin <zekesulastin@gmail.com>, Martin Merget <mergetmartin@gmail.com>
pkgname=fs2_open-git
-pkgver=3.8.1.54455522b
-pkgrel=2
+pkgver=20.1.0.r20200319.caebad7.0
+pkgrel=1
pkgdesc="An enhancement of the original Freespace 2 engine - GIT version"
url="http://scp.indiegames.us"
arch=('i686' 'x86_64')
@@ -21,12 +21,13 @@ sha256sums=('SKIP'
'SKIP'
'SKIP')
-version=3.8.1
+version=20.1.0
pkgver () {
cd "$srcdir/$pkgname"
- rev=`git rev-parse --short HEAD`
- echo ${version}.${rev}
+ tag=`git describe --tags $(git rev-list --tags --max-count=1) | sed 's/nightly_/r/g;s/_/./g'`
+ commits_since_tag=`git rev-list --count $(git describe --tags $(git rev-list --tags --max-count=1))..HEAD`
+ echo ${version}.${tag}.${commits_since_tag}
}
build()
@@ -50,10 +51,11 @@ package () {
cd "$srcdir/$pkgname/build/bin"
binary=`find fs2_open*`
cd ../..
- rev=`git rev-parse --short HEAD`
+ tag=`git describe --tags $(git rev-list --tags --max-count=1) | sed 's/nightly_/r/g'`
+ commits_since_tag=`git rev-list --count $(git describe --tags $(git rev-list --tags --max-count=1))..HEAD`
install -D -m644 Copying.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -D -m755 build/bin/${binary} "$pkgdir/opt/fs2_open/${binary}_${rev}"
- msg "The output binary will be called '${binary}_${rev}'"
+ install -D -m755 build/bin/${binary} "$pkgdir/opt/fs2_open/${binary}_${tag}_${commits_since_tag}"
+ msg "The output binary will be called '${binary}_${tag}_${commits_since_tag}'"
}