yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #07678
[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-67-g608c086
The following commit has been merged in the master branch:
commit 608c086308bdb6154e4100bf477d1d4f134da09c
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date: Sat May 28 22:45:14 2011 +0200
Fix generation manpage error on powerpc and sparc
diff --git a/debian/rules b/debian/rules
index 5e06ec0..5dfbeec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,16 +33,16 @@ override_dh_auto_build:
-cat /proc/meminfo
-cat /proc/cpuinfo
# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
- export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=${tmpInstallDbg} variant='' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
+ export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}$; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=${tmpInstallDbg} variant='' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
#optimized build
- export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=${tmpInstall} variant='' -j1 optimize=1 debug=0
+ export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=${tmpInstall} variant='' -j1 optimize=1 debug=0
# generate manpages
- export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
- export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
+ export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
+ export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
override_dh_auto_test:
- export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --test
- export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstallDbg} ${tmpInstall}/bin/yade${_VERSION} --debug --test
+ export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --test
+ export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstallDbg} ${tmpInstall}/bin/yade${_VERSION} --debug --test
#Delete all pyc files
find . -name '*.pyc' -print0 | xargs -0 rm -f
@@ -61,7 +61,7 @@ override_dh_compress:
binary-indep:
dh --until dh_auto_build $@
#Generate docs
- export MPLCONFIGDIR=${tmpDirMatplotLib}; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
+ export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
dh --after dh_auto_build $@
binary-arch:
--
Yet Another Dynamic Engine. Platform for discrete element modeling.