builder: Keep track of environment

VoltLang · May 26, 2018 · 97ebd8e · 97ebd8e
1 parent 0404ebb
commit 97ebd8e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/scripts/guru.groovy b/scripts/guru.groovy
@@ -2,7 +2,7 @@
 import org.volt_lang.Builder
 import org.volt_lang.RepoConf
 
-def b = new Builder(steps, null)
+def b = new Builder(steps, null, env)
 
 stage('Setup') {
 	b.setupGuru([

diff --git a/scripts/volt.groovy b/scripts/volt.groovy
@@ -1,7 +1,7 @@
 @Library('volt-build')
 import org.volt_lang.Builder
 
-def b = new Builder(steps, null)
+def b = new Builder(steps, null, env)
 
 stage('Setup') {
 	b.setupVolta()

diff --git a/src/org/volt_lang/Builder.groovy b/src/org/volt_lang/Builder.groovy
@@ -13,6 +13,9 @@ class Builder implements Serializable
 	/// The scm object if any.
 	def scm
 
+	/// The environment
+	def env
+
 	/// Are we doing a full build aka Volta
 	def isVolta
 
@@ -38,10 +41,11 @@ class Builder implements Serializable
 		new NodeConf('x86_64', 'msvc',  true,  'ubuntu-16.04-x86_64'),
 	]
 
-	Builder(dsl, scm)
+	Builder(dsl, scm, env)
 	{
 		this.dsl = dsl
 		this.scm = scm
+		this.env = env
 	}
 
 

diff --git a/vars/voltBuildExe.groovy b/vars/voltBuildExe.groovy
@@ -3,7 +3,7 @@ import org.volt_lang.Builder
 
 
 def call(folder) {
-	def b = new Builder(steps, scm)
+	def b = new Builder(steps, scm, env)
 
 	stage('Setup') {
 		b.setupExe(folder)

diff --git a/vars/voltBuildLib.groovy b/vars/voltBuildLib.groovy
@@ -3,7 +3,7 @@ import org.volt_lang.Builder
 
 
 def call(folder) {
-	def b = new Builder(steps, scm)
+	def b = new Builder(steps, scm, env)
 
 	stage('Setup') {
 		b.setupLib(folder)

diff --git a/vars/voltBuildVolta.groovy b/vars/voltBuildVolta.groovy
@@ -3,7 +3,7 @@ import org.volt_lang.Builder;
 
 
 def call() {
-	def b = new Builder(steps, scm)
+	def b = new Builder(steps, scm, env)
 
 	stage('Setup') {
 		b.setupVolta()

diff --git a/vars/voltToolchain.groovy b/vars/voltToolchain.groovy
@@ -3,7 +3,7 @@ import org.volt_lang.Builder;
 
 def call(Map config) {
 
-	def b = new Builder(steps, scm)
+	def b = new Builder(steps, scm, env)
 
 	stage('Setup') {
 		b.setupToolchain(config)