tomprince

diff --git a/master/buildbot/steps/trigger.py b/master/buildbot/steps/trigger.py
index e754270..b069bd9 100644
--- a/master/buildbot/steps/trigger.py
+++ b/master/buildbot/steps/trigger.py
@@ -193,3 +193,6 @@ class Trigger(LoggingBuildStep):
             d.addCallbacks(cb, eb)
 
         d.addErrback(log.err, '(ignored) while triggering builds:')
+
+        if not self.waitForFinish:

tomprince

diff --git a/mailer_and_ciabot b/mailer_and_ciabot
index 9ff240a..a29f227 100755
--- a/mailer_and_ciabot
+++ b/mailer_and_ciabot
@@ -21,10 +21,10 @@ else
 		echo "X: $oldrev $newrev $ref"
 		refname=${ref#refs/heads/}
 		[ "$refname" = "master" ] && refname=
-		(echo $oldrev $newrev $ref) | $MAILER
+		(echo $oldrev $newrev $ref) | $MAILER &

tomprince

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a52c538..eab017b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,18 +6,6 @@ endif(COMMAND cmake_policy)
 # allow empty else and endif constructs (available by default since 2.6.0)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
-# prevent in-source builds
-IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})

tomprince

commit 74d6b5415714124466278754fdbfbcc19c2a2c72
Author: Tom Prince <[email protected]>
Date:   Tue Apr 5 10:47:31 2011 -0400

    BIFImporter: Overwrite files in cache, when extracting save game.
    
    Signed-off-by: Tom Prince <[email protected]>

diff --git a/gemrb/core/FileCache.cpp b/gemrb/core/FileCache.cpp
index 4d3724f..0be598d 100644

tomprince

diff --git a/src/categories/cat.v b/src/categories/cat.v
index 6a5ef1e..65d38e7 100644
--- a/src/categories/cat.v
+++ b/src/categories/cat.v
@@ -11,12 +11,7 @@ Record Object := object
   ; Category_inst: Category obj }.
 
 Implicit Arguments object [[Arrows_inst] [Equiv_inst] [CatId_inst] [CatComp_inst] [Category_inst]].
-Existing Instance Arrows_inst.
-Existing Instance Equiv_inst.

tomprince

from buildbot.steps.slave import FileExists
from buildbot.status.builder import SUCCESS

class SkipIfFileExists(FileExists):
	def __init__(self, **kwargs):
		FileExists.__init__(self, **kwargs)
	def finished(self, results):
		if results == SUCCESS:
			self.build.terminate = True
		FileExists.finished(self, SUCCESS)

tomprince

from buildbot.steps.slave import FileExists
from buildbot.status.builder import SUCCESS

class SkipIfFileExists(FileExists):
	def __init__(self, **kwargs):
		FileExists.__init__(self, **kwargs)
	def finished(self, results):
		if results == SUCCESS:
			self.build.terminate = True
		FileExists.finished(self, SUCCESS)

tomprince

def BuildMathClasses():
	f = factory.BuildFactory()
	f.addStep(EnsureCoqVersion())
	f.addStep(ExtractCoq())
	f.addStep(Git(repourl=repo(rk_mathclasses_url), mode="update"))
	f.addStep(GitClean())
	f.addStep(Compile(workdir="build/src", command=['scons']))
	return f

def BuildRippling():

tomprince

from steps import SkipIfFileExists

def BuildMathClasses():
	f = factory.BuildFactory()
	f.addStep(EnsureCoqVersion())
	f.addStep(ExtractCoq())
	f.addStep(Git(repourl=repo(rk_mathclasses_url), mode="update"))
	f.addStep(GitClean())
	f.addStep(Compile(workdir="build/src", command=['scons']))
	return f

tomprince

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60c6909..51757ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ endif(COMMAND cmake_policy)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
 # prevent in-source builds
-IF(NOT ${INSOURCEBUILD} AND ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+IF(NOT INSOURCEBUILD AND ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})