Author: ivomaintz-guest
Date: 2011-12-12 13:04:23 +0000 (Mon, 12 Dec 2011)
New Revision: 8914
Removed:
trunk/packages/cellprofiler/branches/experimental/debian/postinst
trunk/packages/cellprofiler/branches/experimental/debian/prerm
Modified:
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
trunk/packages/cellprofiler/branches/experimental/debian/rules
Log:
build javabridge.c and other binaries during the normal build
Modified:
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
===================================================================
---
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
2011-12-12 12:43:58 UTC (rev 8913)
+++
trunk/packages/cellprofiler/branches/experimental/debian/patches/Makefile.patch
2011-12-12 13:04:23 UTC (rev 8914)
@@ -26,31 +26,35 @@
Index: cellprofiler-2.0~svn11691/Makefile
===================================================================
---- cellprofiler-2.0~svn11691.orig/Makefile 2011-12-09 16:24:29.000000000
+0100
-+++ cellprofiler-2.0~svn11691/Makefile 2011-12-09 17:33:06.272000498 +0100
-@@ -1,3 +1,4 @@
-+TARFILE=cellprofiler_2.0~svn11691.orig.tar.gz
-
+--- cellprofiler-2.0~svn11691.orig/Makefile 2011-12-12 12:25:02.000000000
+0100
++++ cellprofiler-2.0~svn11691/Makefile 2011-12-12 13:37:34.440002432 +0100
+@@ -1,4 +1,3 @@
+-
TEST_MODULES = cellprofiler
-@@ -8,7 +9,7 @@
+ ifeq ($(OS),Windows_NT)
+@@ -8,7 +7,7 @@
PYTHON_COMPILER=unix
endif
-all: exts tests
-+all: exts
++all: exts javabridge
build:
mkdir build
-@@ -32,3 +33,11 @@
+@@ -30,5 +29,15 @@
+ cellprofiler/cpmath/_filter.pyd: cellprofiler/cpmath/_filter.pyx
+ python cellprofiler/cpmath/setup.py build_ext -i
--compiler=$(PYTHON_COMPILER)
++javabridge:
++ export JAVA_HOME=`readlink -f /usr/bin/java | cut -d/ -f1-5` && echo
$(JAVA_HOME) && export LD_LIBRARY_PATH=$(JAVA_HOME):$(LD_LIBRARY_PATH) &&
python CellProfiler.py --build-and-exit
++
tests:
python -m nose.core --exe --with-nosexunit
--core-target=target/xml-report $(TEST_MODULES)
+
+clean:
-+# rm -rf cellprofiler/utilities
-+# rm -rf cellprofiler/cpmath
-+# find . -name "*.pyc" -exec rm -f {} +
-+# tar xzf ../$(TARFILE) --exclude=Makefile
++ find . -name "*.pyc" -exec rm -f {} +
+ find . -name "*.so" -exec rm -f {} +
+ rm -f cellprofiler/cpmath/*.c
++ rm -rf cellprofiler/*/build
++ rm -f cellprofiler/utilities/javabridge.c
Deleted: trunk/packages/cellprofiler/branches/experimental/debian/postinst
===================================================================
--- trunk/packages/cellprofiler/branches/experimental/debian/postinst
2011-12-12 12:43:58 UTC (rev 8913)
+++ trunk/packages/cellprofiler/branches/experimental/debian/postinst
2011-12-12 13:04:23 UTC (rev 8914)
@@ -1,3 +0,0 @@
-#!/bin/sh
-set -e
-/usr/bin/cellprofiler --build-and-exit
Deleted: trunk/packages/cellprofiler/branches/experimental/debian/prerm
===================================================================
--- trunk/packages/cellprofiler/branches/experimental/debian/prerm
2011-12-12 12:43:58 UTC (rev 8913)
+++ trunk/packages/cellprofiler/branches/experimental/debian/prerm
2011-12-12 13:04:23 UTC (rev 8914)
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-INSTALL_DIR="/usr/share/cellprofiler"
-rm -rf $INSTALL_DIR/cellprofiler/utilities || true
-rm -rf $INSTALL_DIR/cellprofiler/cpmath || true
-find $INSTALL_DIR/ -name "*.pyc" -exec rm -f {} +
Modified: trunk/packages/cellprofiler/branches/experimental/debian/rules
===================================================================
--- trunk/packages/cellprofiler/branches/experimental/debian/rules
2011-12-12 12:43:58 UTC (rev 8913)
+++ trunk/packages/cellprofiler/branches/experimental/debian/rules
2011-12-12 13:04:23 UTC (rev 8914)
@@ -6,17 +6,11 @@
# dh-make output file, you may use that output file without restriction.
# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+get-orig-source:
+ ./debian/get-orig-source
-DEB_COMPRESS_EXCLUDE := .pdf
+DEB_COMPRESS_EXCLUDE =: .pdf
%:
dh $@ --with python2
-### this should be run after the installation, it's now in postinst ###
-#override_dh_auto_configure:
-# python CellProfiler.py --build-and-exit
-
-get-orig-source:
- ./debian/get-orig-source
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
