summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorradioxoma2014-05-24 13:25:56 +0300
committerradioxoma2014-05-24 13:25:56 +0300
commit6bae171ffd7489d9b7e30e84a95119f17f53eacd (patch)
tree199df5222c16e69594176e06b9ba78f9105b81dd
parent8973461d7b362aa01f792e9abdd1d223b6b5fab7 (diff)
downloadaur-6bae171ffd7489d9b7e30e84a95119f17f53eacd.tar.gz
Updated micromanager MMCorePy installation
-rw-r--r--.SRCINFO1
-rw-r--r--ChangeLog16
-rw-r--r--PKGBUILD13
3 files changed, 26 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a70c751e3e01..b13b00eb784f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -4,6 +4,7 @@ pkgbase = micromanager-git
pkgrel = 1
url = http://www.micro-manager.org
install = mm.install
+ changelog = ChangeLog
arch = x86_64
arch = i686
license = LGPL-2.1 BSD GPL-3
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000000..acd8268ff2ec
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,16 @@
+2014-05-24 Eugene Dvoretsky <radioxoma at gmail com>
+
+ 1.4.13.r3204.g13250d0 (newer than 1.4.17 released in April 30, 2014)
+ * Micromanager devs switched to pure autotools, so previous patches
+ were removed.
+ * Python distutils install function replaced by own PKGBUILD commands.
+ * With MMCore, device adapters, Python 2 wrapper (MMCorePy).
+ * Without Java wrapper (MMCoreJ), MMStudio (Java GUI)
+ and closed-source device adapters.
+
+2014-01-25 Eugene Dvoretsky <radioxoma at gmail com>
+
+ 1.4.13.r2306.gf5e50bd
+ Initial Micromanager PKGBUILD release.
+ * Patches for distutils and Autotools.
+ * CMMCore, MMCorePy (python 2).
diff --git a/PKGBUILD b/PKGBUILD
index 4dd651dc5756..139d5f1eb7e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ replaces=()
backup=()
options=()
install=mm.install
-changelog=
+changelog=ChangeLog
source=($pkgname::git+https://github.com/mdcurtis/micromanager-upstream.git#commit=13250d0
'micromanager-lib.conf')
noextract=()
@@ -58,9 +58,14 @@ package() {
mkdir -p "$pkgdir/usr/lib/micro-manager"
make install DESTDIR="$pkgdir"
- mkdir -p "$pkgdir/usr/lib/python2.7/site-packages"
- mv "$pkgdir/usr/lib/micro-manager/MMCorePy.py" "$pkgdir/usr/lib/python2.7/site-packages"
- mv "$pkgdir/usr/lib/micro-manager/_MMCorePy.so" "$pkgdir/usr/lib/python2.7/site-packages"
+ # Install MMCorePy
+ SPDIR="$pkgdir/usr/lib/python2.7/site-packages"
+ mkdir -p "$SPDIR"
+ mv "$pkgdir/usr/lib/micro-manager/MMCorePy.py" "$SPDIR"
+ mv "$pkgdir/usr/lib/micro-manager/_MMCorePy.so" "$SPDIR"
+ python2 -m compileall "$SPDIR"
+ python2 -O -m compileall "$SPDIR"
+
# We need to update ldconfig cache with new libs.
install -D -m644 "$srcdir/micromanager-lib.conf" "$pkgdir/etc/ld.so.conf.d/micromanager-lib.conf"
}