update to 1.4.5 and add -lib

2 files changed, 57 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c3ee1fe5a5e..b442d476853f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = micropython
-	pkgdesc = Python3 for microcontrollers, unix version.
-	pkgver = 1.4.4
+	pkgdesc = Python3 for microcontrollers, with stdlib. (unix version)
+	pkgver = 1.4.5
 	pkgrel = 1
 	url = http://micropython.org/
 	arch = i686
@@ -9,8 +9,13 @@ pkgbase = micropython
 	makedepends = python
 	depends = readline
 	depends = libffi
-	source = https://github.com/micropython/micropython/archive/v1.4.4.tar.gz
-	md5sums = 77c76aa236f0720b70a0fe593f72172c
+	options = !emptydirs
+	source = https://github.com/micropython/micropython/archive/v1.4.5.tar.gz
+	source = https://github.com/micropython/micropython-lib/archive/v0.5.tar.gz
+	md5sums = 90fed884e60693770b6a1c6b66005444
+	md5sums = 35e72a1885b61daf391279fd1dc3c7a8
 
 pkgname = micropython
 
+pkgname = micropython-lib
+
diff --git a/PKGBUILD b/PKGBUILD
index 147bf8085793..c6f18ae86ad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,66 @@
 # Maintainer: Kyle Keen <keenerd@gmail.com>
-pkgname=micropython
-pkgver=1.4.4
+pkgbase=micropython
+pkgname=(micropython micropython-lib)
+pkgver=1.4.5
+_libver=0.5
 pkgrel=1
-pkgdesc="Python3 for microcontrollers, unix version."
+pkgdesc="Python3 for microcontrollers, with stdlib.  (unix version)"
 arch=('i686' 'x86_64')
 url="http://micropython.org/"
 license=('MIT')
 depends=('readline' 'libffi')
 makedepends=('python')
-source=(https://github.com/micropython/micropython/archive/v$pkgver.tar.gz)
-md5sums=('77c76aa236f0720b70a0fe593f72172c')
+options=('!emptydirs')
+source=("https://github.com/micropython/micropython/archive/v$pkgver.tar.gz"
+        "https://github.com/micropython/micropython-lib/archive/v$_libver.tar.gz")
+md5sums=('90fed884e60693770b6a1c6b66005444'
+         '35e72a1885b61daf391279fd1dc3c7a8')
+
+# todo:
+# fix 'imported as namespace package' warnings from stdlib
 
 build() {
-  cd "$pkgname-$pkgver/unix"
+  cd "$srcdir/micropython-$pkgver/unix"
+  sed -i 's|/local||' Makefile
+  make
+  cd "$srcdir/micropython-lib-$_libver"
   make
 }
 
 check() {
-  cd "$pkgname-$pkgver/unix"
+  cd "$srcdir/micropython-$pkgver/unix"
   #make test
 }
 
-package() {
-  cd "$pkgname-$pkgver/unix"
-  install -Dm755 micropython "$pkgdir/usr/bin/micropython"
-  install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+package_micropython() {
+  cd "$srcdir/micropython-$pkgver/unix"
+  make DESTDIR="$pkgdir" install
+
+  cd "$srcdir/micropython-$pkgver"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_micropython-lib() {
+  cd "$srcdir/micropython-lib-$_libver"
+  for _d in $(find -mindepth 1 -maxdepth 1 -type d); do
+    # todo, figure out what provides this
+    if grep -qr 'import metadata' ./$_d/*; then
+      error "Skipping $_d (bad import)"
+      continue
+    fi
+    if [[ ! -f $_d/setup.py ]]; then
+      error "Skipping $_d (no setup)"
+      continue
+    fi
+    msg "Installing $_d"
+    cd $_d
+    python3 setup.py install --prefix=/usr --root="$pkgdir" --install-lib='/usr/lib/micropython'
+    cd ..
+  done
+
+  # micropython doesn't support pyc
+  find "$pkgdir" -name '*.pyc' -delete
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }