Depend on mbed-os-tools + support to Python2

3 files changed, 68 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b44224b1534..c20bd213d64d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,26 @@
 pkgbase = python-mbed-cli
 	pkgdesc = ARM mbed Command Line Interface
 	pkgver = 1.10.3
-	pkgrel = 1
-	url = https://developer.mbed.org
+	pkgrel = 2
+	url = https://os.mbed.org
 	arch = any
 	license = Apache
 	makedepends = python-setuptools
-	depends = python
-	depends = python-colorama
-	depends = python-pyserial
-	depends = python-intelhex
-	depends = python-jinja
-	depends = python-beautifulsoup4
-	depends = python-fuzzywuzzy
-	depends = python-prettytable
-	depends = python-requests
-	depends = python-yaml
-	depends = python-pyelftools
-	depends = python-jsonschema
-	optdepends = git: support git-based mbed projects
-	optdepends = mercurial: support mercurial-based mbed projects
-	optdepends = python-mbed-host-tests: Flash, reset and supervise tool
-	optdepends = python-mbed-greentea: Test automation
-	optdepends = python-mbed-ls: Automatic device detection
-	options = !emptydirs
-	source = https://github.com/ARMmbed/mbed-cli/archive/1.10.3.tar.gz
+	makedepends = python2-setuptools
+	source = python-mbed-cli-1.10.3.tar.gz::https://github.com/ARMmbed/mbed-cli/archive/1.10.3.tar.gz
 	sha256sums = 8a95093a89aa8fb7a911775155cdb4b9d124ef6af74393dfc1b0bb79c3e33327
 
 pkgname = python-mbed-cli
+	depends = python
+	depends = python-pyserial
+	depends = python-mbed-os-tools
+	depends = git
+	depends = mercurial
+
+pkgname = python2-mbed-cli
+	depends = python
+	depends = python-pyserial
+	depends = python-mbed-os-tools
+	depends = git
+	depends = mercurial
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..57fa220ae7de
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/pkg/
+/src/
+/*.tar.*
+/*.zip
diff --git a/PKGBUILD b/PKGBUILD
index 85622ef56523..5ff0b7cdadd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,59 @@
-# Maintainer: Jimmy Stelzer <jimmy.stelzer@gmail.com>
+# Maintainer: Lorenzo Cappelletti <lorenzo.cappelletti gmail.com>
+# Contributor: Jimmy Stelzer <jimmy.stelzer@gmail.com>
 # Contributor: Daniel Maslowski <info@orangecms.org>
-# Contributor: Lorenzo Cappelletti <lorenzo.cappelletti gmail.com>
 
-_pyname=mbed-cli
-pkgname=python-${_pyname}
+pkgbase=python-mbed-cli
+pkgname=('python-mbed-cli' 'python2-mbed-cli')
 pkgver=1.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc="ARM mbed Command Line Interface"
 arch=('any')
-url="https://developer.mbed.org"
+url="https://os.mbed.org"
 license=('Apache')
-depends=('python' 'python-colorama' 'python-pyserial' 'python-intelhex' 'python-jinja' 'python-beautifulsoup4' 'python-fuzzywuzzy' 'python-prettytable' 'python-requests' 'python-yaml' 'python-pyelftools' 'python-jsonschema')
-optdepends=(
-  'git: support git-based mbed projects'
-  'mercurial: support mercurial-based mbed projects'
-  'python-mbed-host-tests: Flash, reset and supervise tool'
-  'python-mbed-greentea: Test automation'
-  'python-mbed-ls: Automatic device detection'
-)
-makedepends=('python-setuptools')
-options=(!emptydirs)
-source=("https://github.com/ARMmbed/mbed-cli/archive/$pkgver.tar.gz")
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ARMmbed/mbed-cli/archive/${pkgver}.tar.gz")
 sha256sums=('8a95093a89aa8fb7a911775155cdb4b9d124ef6af74393dfc1b0bb79c3e33327')
 
-package() {
-  cd "$srcdir/${_pyname}-${pkgver}"
-  python setup.py install --root="$pkgdir/" --optimize=1
+check_python-mbed-cli() {
+  checkdepends=('python-pytest')
+
+  cd "mbed-cli-${pkgver}"
+  pytest test
+}
+
+package_python-mbed-cli() {
+  depends=(
+    'python'
+    'python-pyserial'
+    'python-mbed-os-tools'
+    'git'
+    'mercurial'
+  )
+
+  cd "mbed-cli-${pkgver}"
+  python setup.py install --root="${pkgdir}/" --optimize=1
+  install -Dm 0644 tools/bash_completion/mbed "${pkgdir}/etc/bash_completion.d/mbed-cli.sh"
+}
+
+check_python2-mbed-cli() {
+  checkdepends=('python-pytest')
+
+  cd "mbed-cli-${pkgver}"
+  pytest2 test
+}
+
+package_python2-mbed-cli() {
+  depends=(
+    'python'
+    'python-pyserial'
+    'python-mbed-os-tools'
+    'git'
+    'mercurial'
+  )
+
+  cd "mbed-cli-${pkgver}"
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
+  install -Dm 0644 tools/bash_completion/mbed "${pkgdir}/etc/bash_completion.d/mbed-cli.sh"
 }
 
 # vim:set ts=2 sw=2 et: