Tags: patch
Hi,
here is a suggested patch to fix tutorials.
There is a patch for the patches section which updates the *.pro files
in tutorials section
The other concern rules file which need to be patched to get sofa.cfg in
the tutorials dir too.
I could test the tutorials compilation, those are generated in the bin
directory of sofa.
Olivier
--
gpg key id: 4096R/326D8438 (pgp.mit.edu)
Key fingerprint = 5FB4 6F83 D3B9 5204 6335 D26D 78DC 68DB 326D 8438
Subject: tutorials do not compile due to bad path
Description: pro files in tutorials refer to wrong path
e.g. not debian package paths.
Last-Updated: 29/12/11
Author: Olivier Sallou <olivier.sal...@irisa.fr>
--- a/applications/tutorials/tutorials.pro
+++ b/applications/tutorials/tutorials.pro
@@ -1,7 +1,7 @@
-SOFA_DIR=../..
+SOFA_DIR=/usr/share/sofa
TEMPLATE = subdirs
-include($${SOFA_DIR}/sofa.cfg)
+include($${SOFA_DIR}/tutorials/sofa.cfg)
SUBDIRS -= ordered
--- a/tutorials/chainHybrid/chainHybrid.pro
+++ b/tutorials/chainHybrid/chainHybrid.pro
@@ -1,7 +1,7 @@
-SOFA_DIR=../../..
+SOFA_DIR=/usr/share/sofa
TEMPLATE = app
-include($${SOFA_DIR}/sofa.cfg)
+include($${SOFA_DIR}/tutorials/sofa.cfg)
TARGET = chainHybrid$$SUFFIX
DESTDIR = $$SOFA_DIR/bin
--- a/tutorials/mixedPendulum/mixedPendulum.pro
+++ b/tutorials/mixedPendulum/mixedPendulum.pro
@@ -1,7 +1,7 @@
-SOFA_DIR=../../..
+SOFA_DIR=/usr/share/sofa
TEMPLATE = app
-include($${SOFA_DIR}/sofa.cfg)
+include($${SOFA_DIR}/tutorials/sofa.cfg)
TARGET = mixedPendulum$$SUFFIX
DESTDIR = $$SOFA_DIR/bin
--- a/tutorials/oneParticule/oneParticule.pro
+++ b/tutorials/oneParticule/oneParticule.pro
@@ -1,7 +1,7 @@
-SOFA_DIR=../../..
+SOFA_DIR=/usr/share/sofa
TEMPLATE = app
-include($${SOFA_DIR}/sofa.cfg)
+include($${SOFA_DIR}/tutorials/sofa.cfg)
TARGET = oneParticule$$SUFFIX
DESTDIR = $$SOFA_DIR/bin
--- a/tutorials/oneTetrahedron/oneTetrahedron.pro
+++ b/tutorials/oneTetrahedron/oneTetrahedron.pro
@@ -1,7 +1,7 @@
-SOFA_DIR=../../..
+SOFA_DIR=/usr/share/sofa
TEMPLATE = app
-include($${SOFA_DIR}/sofa.cfg)
+include($${SOFA_DIR}/tutorials/sofa.cfg)
TARGET = oneTetrahedron$$SUFFIX
DESTDIR = $$SOFA_DIR/bin
--- rules.orig 2011-12-29 09:46:42.701353237 +0100
+++ rules 2011-12-28 18:16:46.272620910 +0100
@@ -97,6 +97,7 @@
# install the source code of the example applications
dh_install -psofa-tutorials tutorials usr/share/sofa
+ dh_install -psofa-tutorials sofa.cfg usr/share/sofa/tutorials/
find share -type f -exec chmod 644 \{\} \;
find share -name "*.sh" | xargs chmod 755
