release: v0.8.15 + python2

* Use tags
* Add python2 build

2 files changed, 41 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 661fe5fc8bea..3c63daa111aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Wed May  4 17:20:26 UTC 2016
 pkgbase = project-generator
 	pkgdesc = Project generators for various embedded tools (IDE)
-	pkgver = 0.7.8
+	pkgver = 0.8.15
 	pkgrel = 1
 	url = https://github.com/project-generator/project_generator
 	arch = any
@@ -11,8 +13,10 @@ pkgbase = project-generator
 	depends = python-jinja
 	depends = python-xmltodict
 	depends = project-generator-definitions
-	source = https://github.com/project-generator/project_generator/archive/526cb5beab1eee4c18311d860f16080c26f75b66.tar.gz
-	sha512sums = 78083fb121d06112e9dc1f53754be497bdf555d22f8e203791a1711fde2eca3219a17e4de3e9b4dad5e3aed52ec937828a2132f808f6ef6fc240329e08ee9b2b
+	source = https://github.com/project-generator/project-generator/archive/v0.8.15.tar.gz
+	sha512sums = 8eaf11a278d7c62e8ae7118e684e3cd6f4a859acd4e117fca6b980132923b5aebdabbb2ff2f42781e980749e7168989eda645d895644c34adc7de84ea349f369
 
 pkgname = project-generator
 
+pkgname = python2-project-generator
+
diff --git a/PKGBUILD b/PKGBUILD
index aaa2f09cf043..de762f8b39fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Kyle Manna <kyle[at]kylemanna[d0t]com>
-pkgname=project-generator
-_pkgname=${pkgname/-/_}
-pkgver=0.7.8
+_pkgname=project-generator
+pkgname=(${_pkgname} python2-${_pkgname})
+pkgver=0.8.15
 pkgrel=1
 pkgdesc="Project generators for various embedded tools (IDE)"
 url="https://github.com/project-generator/project_generator"
 depends=('python'
-         'python-pip'
+         'python-setuptools'
          'python-yaml'
          'python-jinja'
          'python-xmltodict'
@@ -15,21 +15,44 @@ depends=('python'
 optdepends=()
 license=('Apache')
 arch=('any')
-_pkgver='526cb5beab1eee4c18311d860f16080c26f75b66'
-source=("https://github.com/project-generator/${_pkgname}/archive/${_pkgver}.tar.gz")
-sha512sums=('78083fb121d06112e9dc1f53754be497bdf555d22f8e203791a1711fde2eca3219a17e4de3e9b4dad5e3aed52ec937828a2132f808f6ef6fc240329e08ee9b2b')
+source=("https://github.com/project-generator/${_pkgname/_/-}/archive/v${pkgver}.tar.gz")
+sha512sums=('8eaf11a278d7c62e8ae7118e684e3cd6f4a859acd4e117fca6b980132923b5aebdabbb2ff2f42781e980749e7168989eda645d895644c34adc7de84ea349f369')
+
+prepare() {
+    mv "${srcdir}/${_pkgname//-/_}-${pkgver}" "${srcdir}/${_pkgname}-${pkgver}"
+    cp -a "${srcdir}/${_pkgname}-${pkgver}"{,-py2}
+}
 
 build() {
-    cd "$srcdir/$_pkgname-$_pkgver"
+    cd "${srcdir}/${_pkgname}-${pkgver}"
 
     # Python3 has argparse
     sed -i -e '/argparse/d' requirements.txt
 
     python setup.py build
+
+    # Build python2 library
+    cd "${srcdir}/${_pkgname}-${pkgver}-py2"
+    python2 setup.py build
 }
 
-package() {
-    cd "$srcdir/$_pkgname-$_pkgver"
-    python setup.py install --root="$pkgdir" --optimize=1 
+package_project-generator() {
+    cd "${srcdir}/${_pkgname}-${pkgver}"
+    python  setup.py install --root="${pkgdir}" --optimize=1
 }
 
+package_python2-project-generator() {
+    depends=('python2'
+             'python2-setuptools'
+             'python2-yaml'
+             'python2-jinja'
+             'python2-xmltodict'
+             'python2-project-generator-definitions'
+            )
+
+    cd "${srcdir}/${_pkgname}-${pkgver}-py2"
+    python2 setup.py install --root="${pkgdir}" --optimize=1
+
+    # Python3 package provides files under /usr/bin
+    rm -rf "${pkgdir}/usr/bin"
+}