summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorP. Christeas <p_christ@hol.gr>2009-06-10 20:35:24 +0300
committerP. Christeas <p_christ@hol.gr>2009-06-10 20:35:24 +0300
commit9537f7b61bac1fc04f7658ee5ca7d2c1a5b642a7 (patch)
treed03ee34fd0e01542dc0e3de4a2f01cacb2d36c99
parent358924f1356de76b91960cf7397c93fb2e428f0d (diff)
Debian build: Remove all patches, have setup.py not check modules.
In build scenarios, python modules may be missing from the build machine. Then, allow setup.py to carry on. bzr revid: p_christ@hol.gr-20090610173524-fmqucmype469zm9i
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules12
-rwxr-xr-xsetup.py3
3 files changed, 10 insertions, 7 deletions
diff --git a/debian/patches/series b/debian/patches/series
index d06879374fc..e69de29bb2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-01-autobuild.patch
-02-migrate.patch
diff --git a/debian/rules b/debian/rules
index 83d9bfa54fe..f3a9000e712 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
+# include /usr/share/quilt/quilt.make
clean: clean-patched unpatch
clean-patched: patch
@@ -8,7 +8,7 @@ clean-patched: patch
dh_testroot
rm -f build-stamp
- python setup.py clean
+ NO_CHECK_MODULES=1 python setup.py clean
rm -rf build openerp-server
-find $(CURDIR) -type f -name "*.pyc" | xargs rm -f
@@ -23,7 +23,7 @@ install: patch
dh_prep
dh_installdirs
- python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
+ NO_CHECK_MODULES=1 python setup.py install --no-compile --prefix=$(CURDIR)/debian/openerp-server/usr
# Adjusting program location
sed -i -e 's|cd .*python.*/site-packages|cd /usr/lib|' debian/openerp-server/usr/bin/openerp-server
@@ -56,4 +56,8 @@ binary-indep: install
dh_md5sums
dh_builddeb
-.PHONY: clean build install binary binary-arch binary-indep
+patch:
+
+unpatch:
+
+.PHONY: clean build install binary binary-arch binary-indep patch unpatch
diff --git a/setup.py b/setup.py
index 9eb2ce631ce..69cf5de0d73 100755
--- a/setup.py
+++ b/setup.py
@@ -121,7 +121,8 @@ def data_files():
return files
-check_modules()
+if not os.getenv('NO_CHECK_MODULES',False) :
+ check_modules()
f = file('openerp-server','w')
start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """