yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Anton Gladky (gladky-anton)
  Christian Jakob (jakob-ifgt)
------------------------------------------------------------
revno: 3408 [merge]
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Thu 2014-02-20 18:13:07 +0100
message:
  Merge github.com:yade/trunk into chaoUnsat
modified:
  CMakeLists.txt
  pkg/common/InsertionSortCollider.hpp
  pkg/dem/RungeKuttaCashKarp54Integrator.cpp
  pkg/dem/RungeKuttaCashKarp54Integrator.hpp
  scripts/ppa/buildppa.py


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-07 07:32:51 +0000
+++ CMakeLists.txt	2014-02-18 12:02:35 +0000
@@ -129,6 +129,19 @@
 INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
 SET(LINKLIBS  "${LINKLIBS};${BZIP2_LIBRARIES};${ZLIB_LIBRARIES};")
 #===========================================================
+IF((Boost_MAJOR_VERSION EQUAL 1) OR (Boost_MAJOR_VERSION GREATER 1) AND
+  ((Boost_MINOR_VERSION EQUAL 53) OR (Boost_MINOR_VERSION GREATER 53)))
+  SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} Odeint")
+  ADD_DEFINITIONS("-DYADE_ODEINT")
+ELSE((Boost_MAJOR_VERSION EQUAL 1) OR (Boost_MAJOR_VERSION GREATER 1) AND
+    ((Boost_MINOR_VERSION EQUAL 53) OR (Boost_MINOR_VERSION GREATER 53)))
+  SET(DISABLED_FEATS "${DISABLED_FEATS} Odeint")
+  MESSAGE(STATUS "Boost Odeint can be enabled, only if Boost>=1.53 is used")
+  MESSAGE(STATUS ${Boost_MAJOR_VERSION})
+  MESSAGE(STATUS ${Boost_MINOR_VERSION})
+ENDIF((Boost_MAJOR_VERSION EQUAL 1) OR (Boost_MAJOR_VERSION GREATER 1) AND
+     ((Boost_MINOR_VERSION EQUAL 53) OR (Boost_MINOR_VERSION GREATER 53)))
+#===========================================================
 IF(ENABLE_VTK)
   FIND_PACKAGE(VTK) 
   IF(VTK_FOUND)

=== modified file 'pkg/common/InsertionSortCollider.hpp'
--- pkg/common/InsertionSortCollider.hpp	2014-02-17 14:31:35 +0000
+++ pkg/common/InsertionSortCollider.hpp	2014-02-20 16:49:26 +0000
@@ -88,7 +88,7 @@
 
 class InsertionSortCollider: public Collider{
 
-	friend GeneralIntegratorInsertionSortCollider;
+	friend class GeneralIntegratorInsertionSortCollider;
 
 	//! struct for storing bounds of bodies
 	struct Bounds{

=== modified file 'pkg/dem/RungeKuttaCashKarp54Integrator.cpp'
--- pkg/dem/RungeKuttaCashKarp54Integrator.cpp	2014-02-17 14:31:35 +0000
+++ pkg/dem/RungeKuttaCashKarp54Integrator.cpp	2014-02-18 12:02:35 +0000
@@ -1,3 +1,4 @@
+#ifdef YADE_ODEINT
 #include<yade/pkg/dem/RungeKuttaCashKarp54Integrator.hpp>
 #include<yade/core/Scene.hpp>
 
@@ -30,4 +31,4 @@
 
 	scene->time=scene->time-dt;//Scene move next time step function already increments the time so we have to decrement it just before it.
 }
-
+#endif

=== modified file 'pkg/dem/RungeKuttaCashKarp54Integrator.hpp'
--- pkg/dem/RungeKuttaCashKarp54Integrator.hpp	2014-02-17 14:31:35 +0000
+++ pkg/dem/RungeKuttaCashKarp54Integrator.hpp	2014-02-18 12:02:35 +0000
@@ -1,3 +1,4 @@
+#ifdef YADE_ODEINT
 #pragma once
 #include <yade/core/Scene.hpp>
 #include<yade/pkg/dem/Integrator.hpp>
@@ -45,6 +46,4 @@
 	);
 };
 REGISTER_SERIALIZABLE(RungeKuttaCashKarp54Integrator);
-
-
-
+#endif

=== modified file 'scripts/ppa/buildppa.py'
--- scripts/ppa/buildppa.py	2014-01-10 20:03:14 +0000
+++ scripts/ppa/buildppa.py	2014-02-18 13:14:09 +0000
@@ -104,15 +104,20 @@
             os.system('sed -i.bak -e s/VERSIONYADEREPLACE/%s/ %s/debian/rules'%(versiondebian,builddirdeb))
             os.system('cd %s; dpkg-source -b -I build'%(builddirup))
             os.mkdir(builddirres)
+            
+            buildarch = ''
+            if (len(archs)>1 and a != archs[0]):
+              buildarch = '--binary-arch'     #Build only arch-packages
+            
             print "Building package %s_%s"%(sourcePackName, versiondebian)
-            buildPackage = ('sudo pbuilder --build --architecture %s --basetgz %s %s --logfile %s/pbuilder.log --debbuildopts "-j%d" --buildresult %s %s/*.dsc'%
-                (a, tarball, addAllowuntrusted, builddirup, jobsNumber, builddirres, builddirup))
+            buildPackage = ('sudo pbuilder --build --architecture %s --basetgz %s %s --logfile %s/pbuilder.log --debbuildopts "-j%d" --buildresult %s %s %s/*.dsc'%
+                (a, tarball, addAllowuntrusted, builddirup, jobsNumber, builddirres, buildarch, builddirup))
             print buildPackage
             os.system(buildPackage)
             os.system('sudo chown %s:%s %s * -R'%(userg, groupg, builddirup))
             os.system('sudo chown %s:%s %s * -R'%(userg, groupg, gitdebdir))
             os.system('sudo chown %s:%s %s * -R'%(userg, groupg, gitupsdir))
-        os.system('cd %s ; su %s -c \'dput %s *.changes\''%(builddirres, userg, dputg))
+            os.system('cd %s ; su %s -c \'dput %s *.changes\''%(builddirres, userg, dputg))
 
 for branch in repodeb.branches:
     branchstr = str(branch)