allpy
changeset 607:cc1ed3a62673
Fixed installation of geometrical-core since it requires some local modules imported
| author | Daniil Alexeyevsky <dendik@kodomo.fbb.msu.ru> |
|---|---|
| date | Fri, 15 Apr 2011 21:54:35 +0400 |
| parents | af89511a78ff |
| children | 4605ead733d8 |
| files | .hgignore debian/changelog debian/geometrical-core.install debian/rules |
| diffstat | 4 files changed, 17 insertions(+), 1 deletions(-) [+] |
line diff
1.1 --- a/.hgignore Fri Apr 15 21:42:08 2011 +0400 1.2 +++ b/.hgignore Fri Apr 15 21:54:35 2011 +0400 1.3 @@ -28,6 +28,7 @@ 1.4 debian/blocks3d-wt/ 1.5 debian/geometrical-core/ 1.6 1.7 +debian/bin/ 1.8 debian/*.substvars 1.9 debian/*.debhelper* 1.10 debian/*stamp*
2.1 --- a/debian/changelog Fri Apr 15 21:42:08 2011 +0400 2.2 +++ b/debian/changelog Fri Apr 15 21:54:35 2011 +0400 2.3 @@ -3,6 +3,9 @@ 2.4 * New allpy release. 2.5 Version tracking an compact history starts with this version. The question 2.6 of related programs and utils versioning is yet undecided. 2.7 + * New geometrical-core requires two packages with local install. 2.8 + Added sed script to add /usr/share/geometrical-core to sys.path. 2.9 + The required packages go there. 2.10 2.11 -- Danya Alexeyevsky <dendik@kodomo.fbb.msu.ru> Fri, 15 Apr 2011 21:21:40 +0400 2.12
3.1 --- a/debian/geometrical-core.install Fri Apr 15 21:42:08 2011 +0400 3.2 +++ b/debian/geometrical-core.install Fri Apr 15 21:54:35 2011 +0400 3.3 @@ -1,1 +1,2 @@ 3.4 -geometrical_core/geometrical-core usr/bin 3.5 +debian/bin/geometrical-core usr/bin 3.6 +geometrical_core/*.py usr/share/geometrical-core
4.1 --- a/debian/rules Fri Apr 15 21:42:08 2011 +0400 4.2 +++ b/debian/rules Fri Apr 15 21:54:35 2011 +0400 4.3 @@ -11,6 +11,17 @@ 4.4 build/python-allpy:: 4.5 make -C docs html 4.6 4.7 +build/geometrical-core:: 4.8 + -mkdir debian/bin 4.9 + fix_path='import sys\nsys.path.append("/usr/share/geometrical-core")'; \ 4.10 + cat geometrical_core/geometrical-core \ 4.11 + | sed "1 { x; s@^@\n$${fix_path}\n@; x }; /^$$/ x" \ 4.12 + > debian/bin/geometrical-core 4.13 + chmod +x debian/bin/geometrical-core 4.14 + 4.15 +clean:: 4.16 + rmdir debian/bin 4.17 + 4.18 # Manually build blocks3d-wt to avoid build-dependency on qmake 4.19 b3dwt = blocks3d/wt 4.20 b3dwt_cpp = $(wildcard $(b3dwt)/*.C)