Index: Jenkins/Distribute
===================================================================
--- Jenkins/Distribute	(revision 782d479aaefe3dd226c200e359b9cc592adbd7f7)
+++ Jenkins/Distribute	(revision f78ead5d2225b387851dfb28a94d7b04231fda5b)
@@ -26,5 +26,5 @@
 		wrap([$class: 'TimestamperBuildWrapper']) {
 
-			(build_no, ref) = prepare_build()
+			build_id = prepare_build()
 
 			node('x64') {
@@ -32,5 +32,5 @@
 				SrcDir    = pwd tmp: false
 
-				clean()
+				Tools.clean()
 
 				// checkout()
@@ -74,12 +74,5 @@
 // Main compilation routines
 //===========================================================================================================
-def clean() {
-	build_stage('Cleanup', true) {
-		// clean the build by wipping the build directory
-		dir(BuildDir) {
-			deleteDir()
-		}
-	}
-}
+
 
 //Compilation script is done here but environnement set-up and error handling is done in main loop
@@ -125,4 +118,9 @@
 
 	currentBuild.description = "Distributing Binaries"
+
+	if (!params.Build) {
+		params.Build = Jenkins.instance.getItem('Cforall Full Build').lastSuccessfulBuild.number
+	}
+
 	echo "Distributing build ${params.Build}"
 
Index: Jenkins/tools.groovy
===================================================================
--- Jenkins/tools.groovy	(revision 782d479aaefe3dd226c200e359b9cc592adbd7f7)
+++ Jenkins/tools.groovy	(revision f78ead5d2225b387851dfb28a94d7b04231fda5b)
@@ -24,5 +24,5 @@
 //===========================================================================================================
 def clean() {
-	Tools.BuildStage('Cleanup', true) {
+	BuildStage('Cleanup', true) {
 		// clean the build by wipping the build directory
 		dir(BuildDir) {