summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian 'Swift Geek' Grzywna2016-12-20 05:10:31 +0100
committerSebastian 'Swift Geek' Grzywna2016-12-20 05:10:31 +0100
commitbf5033094f0579b247523b721ea4014dfd3dad4c (patch)
tree1d1ca255a55dc97934f32e6f47d631a1fb122ea1
parentfc58c39774b2f71cd93f5e458a1faabea3b2245b (diff)
downloadaur-bf5033094f0579b247523b721ea4014dfd3dad4c.tar.gz
Move most of pkgver() to prepare() as it is run before pkgver() now
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD37
2 files changed, 22 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0250a6c2dbcc..9401a823d0b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Thu Apr 21 03:49:53 UTC 2016
+# Tue Dec 20 04:09:20 UTC 2016
pkgbase = slic3r-git
pkgdesc = Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge.
pkgver = a
- pkgrel = 15
+ pkgrel = 16
url = http://slic3r.org/
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index da9672f4c971..d9f71f47cc25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=slic3r-git
pkgver=a
-pkgrel=15
+pkgrel=16
pkgdesc="Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge."
arch=('i686' 'x86_64' 'armv6' 'armv6h' 'armv7h')
url="http://slic3r.org/"
@@ -47,7 +47,24 @@ countdown() {
pkgver() {
export _src_dir="$srcdir/$_gitname"
- # Disable detached head warning
+ cd "$_src_dir"
+ #
+ ### Now figure out PKGVER
+ #
+ if grep -sq '#define SLIC3R_VERSION' ./xs/src/libslic3r/libslic3r.h; then
+ # 6adc3477c9d08d2cfa0e6902b3d241a9193e50d4 intruduces libslic3r.h in that directory BUT
+ # 8b6a8e63079978646cd98a96d6ad178b28f3067c introduces version in that header
+ _pkgver="$(awk '/#define SLIC3R_VERSION/ {gsub(/"/, "", $3); print $3 }' ./xs/src/libslic3r/libslic3r.h).$(git rev-parse --short HEAD)"
+ else
+ _pkgver="$(awk 'BEGIN{FS="\""}/VERSION/{gsub(/-dev/,"",$2); print $2 }' ./lib/Slic3r.pm).$(git rev-parse --short HEAD)"
+ fi
+ _pkgver="${_pkgver//-/_}"
+ echo "${_pkgver}"
+}
+
+prepare() {
+ export _src_dir="$srcdir/$_gitname"
+# Disable detached head warning
( cd ${_src_dir} ; git config advice.detachedHead false )
# TODO: After all done ramp up pkgver++
# TODO: Remind user about stable branch and others
@@ -109,22 +126,8 @@ pkgver() {
git checkout "${_gitfragment}" -f
fi
} 1>&2
- #
- ### Now figure out PKGVER
- #
- if grep -sq '#define SLIC3R_VERSION' ./xs/src/libslic3r/libslic3r.h; then
- # 6adc3477c9d08d2cfa0e6902b3d241a9193e50d4 intruduces libslic3r.h in that directory BUT
- # 8b6a8e63079978646cd98a96d6ad178b28f3067c introduces version in that header
- _pkgver="$(awk '/#define SLIC3R_VERSION/ {gsub(/"/, "", $3); print $3 }' ./xs/src/libslic3r/libslic3r.h).$(git rev-parse --short HEAD)"
- else
- _pkgver="$(awk 'BEGIN{FS="\""}/VERSION/{gsub(/-dev/,"",$2); print $2 }' ./lib/Slic3r.pm).$(git rev-parse --short HEAD)"
- fi
- _pkgver="${_pkgver//-/_}"
- echo "${_pkgver}"
-}
-prepare() {
- export _src_dir="$srcdir/$_gitname"
+### OLD PREPARE
# Setting these env variables overwrites any command-line-options we don't want...
export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps \
PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \