yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3020
committer: Rémi <remi.cailletaud@xxxxxxxxxxx>
branch nick: yade
timestamp: Tue 2012-02-07 17:05:13 +0100
message:
  buildbot now builds two times, with eigen2 and eigen3
modified:
  scripts/build-infrastructure/master.cfg


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

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

=== modified file 'scripts/build-infrastructure/master.cfg'
--- scripts/build-infrastructure/master.cfg	2012-02-03 16:59:03 +0000
+++ scripts/build-infrastructure/master.cfg	2012-02-07 16:05:13 +0000
@@ -103,18 +103,28 @@
 bzrurl = "lp:yade"
 
 f1 = factory.BuildFactory()
+
+# EIGEN3
 prefix = "/var/lib/buildbot/yade/yade-full"
 f1.addStep(Bzr(repourl=bzrurl, mode="update"))
-f1.addStep(Compile(command=["scons", "features=opengl,gts,openmp,vtk,qt4,cgal",
+f1.addStep(Compile(description="Compiling with eigen3", command=["scons", "features=opengl,gts,openmp,vtk,qt4,cgal",
             "chunkSize=20", "jobs=4", "PREFIX=" + prefix]))
 f1.addStep(Test(command=[WithProperties(prefix + "/bin/yade-bzr%(got_revision)s"), "--test"]))
 f1.addStep(Test(command=[WithProperties(prefix + "/bin/yade-bzr%(got_revision)s"), "--checks"], 
-			description="checking", descriptionDone="checks done"))
+			description="checking eigen3 build", descriptionDone="checking eigen3 build done"))
+
+# EIGEN2
+f1.addStep(Compile(description="Compiling with eigen2", command=["scons", "features=opengl,gts,openmp,vtk,qt4,cgal",
+            "chunkSize=20", "jobs=4", "PREFIX=" + prefix, "eigen2=true"]))
+f1.addStep(Test(command=[WithProperties(prefix + "/bin/yade-bzr%(got_revision)s"), "--test"]))
+f1.addStep(Test(command=[WithProperties(prefix + "/bin/yade-bzr%(got_revision)s"), "--checks"], 
+			description="checking eigen2 build", descriptionDone="checks eigen2 build done"))
+
 # doc
 wdir = prefix + "/build/doc/sphinx/"
 texdir = wdir+"_build/latex/"
 f1.addStep(ShellCommand(workdir=wdir, env={'PYTHONPATH':wdir},
-                        command=[WithProperties(prefix + "/bin/yade-bzr%(got_revision)s"), "yadeSphinx.py"],
+                        command=[WithProperties(prefix + "/bin/yade-bzr%(got_revision)s"), "-n", "yadeSphinx.py"],
                        description="compiling html doc", descriptionDone="html doc", haltOnFailure=True))
 f1.addStep(ShellCommand(workdir= texdir, command=["xelatex", "Yade.tex"],
                         description="compiling pdf doc 1st pass", descriptionDone="pdf doc", haltOnFailure=True))
@@ -134,7 +144,6 @@
 f1.addStep(FileUpload(slavesrc="/tmp/yade-src.tgz",
                       masterdest=WithProperties("/var/www/source/yade_r%(got_revision)s.tgz")))
 f1.addStep(MasterShellCommand(command=["ln", "-sf", WithProperties("/var/www/source/yade_r%(got_revision)s.tgz") ,"/var/www/source/yade_latest_trunk.tgz"]))
-f1.addStep(MasterShellCommand(command="chmod -R a-x+rX /var/www/source"))
 
 # clean
 f1.addStep(ShellCommand(command=["rm","-rf", WithProperties(prefix + "/build-bzr%(got_revision)s"),