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
This commit is contained in:
parent
358924f135
commit
9537f7b61b
|
@ -1,2 +0,0 @@
|
||||||
01-autobuild.patch
|
|
||||||
02-migrate.patch
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/make -f
|
#!/usr/bin/make -f
|
||||||
|
|
||||||
include /usr/share/quilt/quilt.make
|
# include /usr/share/quilt/quilt.make
|
||||||
|
|
||||||
clean: clean-patched unpatch
|
clean: clean-patched unpatch
|
||||||
clean-patched: patch
|
clean-patched: patch
|
||||||
|
@ -8,7 +8,7 @@ clean-patched: patch
|
||||||
dh_testroot
|
dh_testroot
|
||||||
rm -f build-stamp
|
rm -f build-stamp
|
||||||
|
|
||||||
python setup.py clean
|
NO_CHECK_MODULES=1 python setup.py clean
|
||||||
|
|
||||||
rm -rf build openerp-server
|
rm -rf build openerp-server
|
||||||
-find $(CURDIR) -type f -name "*.pyc" | xargs rm -f
|
-find $(CURDIR) -type f -name "*.pyc" | xargs rm -f
|
||||||
|
@ -23,7 +23,7 @@ install: patch
|
||||||
dh_prep
|
dh_prep
|
||||||
dh_installdirs
|
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
|
# Adjusting program location
|
||||||
sed -i -e 's|cd .*python.*/site-packages|cd /usr/lib|' debian/openerp-server/usr/bin/openerp-server
|
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_md5sums
|
||||||
dh_builddeb
|
dh_builddeb
|
||||||
|
|
||||||
.PHONY: clean build install binary binary-arch binary-indep
|
patch:
|
||||||
|
|
||||||
|
unpatch:
|
||||||
|
|
||||||
|
.PHONY: clean build install binary binary-arch binary-indep patch unpatch
|
||||||
|
|
3
setup.py
3
setup.py
|
@ -121,7 +121,8 @@ def data_files():
|
||||||
|
|
||||||
return files
|
return files
|
||||||
|
|
||||||
check_modules()
|
if not os.getenv('NO_CHECK_MODULES',False) :
|
||||||
|
check_modules()
|
||||||
|
|
||||||
f = file('openerp-server','w')
|
f = file('openerp-server','w')
|
||||||
start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """
|
start_script = """#!/bin/sh\necho "OpenERP Setup - The content of this file is generated at the install stage\n" """
|
||||||
|
|
Loading…
Reference in New Issue