yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2912
committer: Rémi <remi.cailletaud@xxxxxxxxxxx>
branch nick: yade
timestamp: Tue 2011-08-30 18:34:27 +0200
message:
  modifiied buildbot configuration to fix tarball build
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	2011-06-08 12:38:01 +0000
+++ scripts/build-infrastructure/master.cfg	2011-08-30 16:34:27 +0000
@@ -127,22 +127,24 @@
 f1.addStep(FileUpload(slavesrc=texdir+"Yade.pdf",
                       masterdest="/var/www/doc/Yade.pdf"))
 f1.addStep(MasterShellCommand(command="chmod -R a-x+rX /var/www/doc"))
+
+# tarball
+f1.addStep(ShellCommand(workdir= prefix + "/build", command="/usr/bin/bzr export /tmp/yade"))
+f1.addStep(ShellCommand(workdir="/tmp",command=["tar", "cvzf", "yade-src.tgz", "yade"]))
+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"),
                                 WithProperties(prefix + "/bin/yade-bzr%(got_revision)s"),
+                                "/tmp/yade",
                                 WithProperties(prefix + "/bin/yade-bzr%(got_revision)s-batch"),
                                 WithProperties(prefix + "/lib/yade-bzr%(got_revision)s")],
                         alwaysRun=True,
                         description="cleaning", descriptionDone="clean"))
 
-tar_wdir = "/tmp/yade"
-f1.addStep(Bzr(repourl=bzrurl, mode="export", workdir=tar_wdir))
-f1.addStep(ShellCommand(workdir="/tmp",command=["tar", "cvzf", "yade-src.tgz", tar_wdir]))
-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"))
-
 
 
 b1 = {'name': "yade-full",