Upgrading build to Gradle 1.0m9 and phantomjs 1.5

eriwen · eriwen · commit e983a136e190 · 2012-04-06T16:40:45.000-06:00
diff --git a/build.gradle b/build.gradle
@@ -11,14 +11,14 @@ buildscript {
 apply plugin: 'js'
 
 defaultTasks 'all'
-buildDir = "../target"
+buildDir = 'target'
 
-def srcFile = "../stacktrace.js"
+def srcFile = 'stacktrace.js'
 def destFile = "${buildDir}/stacktrace-min.js"
 def testDir = 'test'
 
 repositories {
-	mavenRepo urls: 'http://repository.springsource.com/maven/bundles/release'
+	mavenRepo url: 'http://repository.springsource.com/maven/bundles/release'
 	mavenCentral()
 }
 
@@ -47,24 +47,24 @@ task jshintz(dependsOn: 'init', description: 'runs jshint on all non-test and li
 }
 
 task jsduck(type: Exec, dependsOn: 'init', description: 'Generates jsduck documentation') {
-    inputs.file file(srcFile)
-    outputs.file file("${buildDir}/docs")
+	inputs.file file(srcFile)
+	outputs.file file("${buildDir}/docs")
 
-    commandLine = ['jsduck', srcFile, '--output', "${buildDir}/docs"]
-    ignoreExitValue = true
+	commandLine = ['jsduck', srcFile, '--output', "${buildDir}/docs"]
+	ignoreExitValue = true
 }
 
 minifyJs {
 	dependsOn << 'init'
-    input = file(srcFile)
-    output = file(destFile)
-    warningLevel = 'QUIET'
+	ext.input = file(srcFile)
+	ext.output = file(destFile)
+	warningLevel = 'QUIET'
 }
 
 gzipJs {
 	dependsOn << 'minifyJs'
-    input = file(destFile)
-    output = input
+	ext.input = file(destFile)
+	ext.output = input
 }
 
 task test(dependsOn: 'init') << {
@@ -76,7 +76,8 @@ task test(dependsOn: 'init') << {
 			specs << it
 		}
 	}
-	
+
+	def phantomJsPath = "which phantomjs".execute().text.trim()
 	def startTime = new Date().time
 	def numFailures = 0
 	def testsFailed = false
@@ -85,11 +86,9 @@ task test(dependsOn: 'init') << {
 		
 		def outputFile = "${buildDir}/TEST-${spec.name.replace('-', '').replace('.html', '.xml')}"
 		ant.exec(outputproperty: 'cmdOut', errorproperty: 'cmdErr',
-				resultproperty: 'exitCode', failonerror: 'false', executable: '/usr/bin/env') {
-			arg(value: 'DISPLAY=:1')
-			arg(value: '/usr/local/bin/phantomjs')
-			arg(value: "../test/lib/phantomjs-qunit-runner.js")
-			arg(value: "${spec.canonicalPath}")
+				resultproperty: 'exitCode', failonerror: 'false', executable: phantomJsPath) {
+			arg(value: 'test/lib/phantomjs-qunit-runner.js')
+			arg(value: spec.canonicalPath)
 		}
 		// Check exit code
 		if (ant.project.properties.exitCode != '0') {
@@ -109,17 +108,17 @@ task test(dependsOn: 'init') << {
 }
 
 task jstd(type: Exec, dependsOn: 'init', description: 'runs JS tests through JsTestDriver') {
-    // Default to MacOS and check for other environments
-    def firefoxPath = '/Applications/Firefox.app/Contents/MacOS/firefox'
-    if ("uname".execute().text.trim() != 'Darwin') {
-        firefoxPath = "which firefox".execute().text
-    }
+	// Default to MacOS and check for other environments
+	def firefoxPath = '/Applications/Firefox.app/Contents/MacOS/firefox'
+	if ("uname".execute().text.trim() != 'Darwin') {
+		firefoxPath = "which firefox".execute().text.trim()
+	}
 
-    commandLine = ['/usr/bin/env', 'DISPLAY=:1', 'java', '-jar', "../test/lib/JsTestDriver-1.3.3d.jar", '--config', "../test/jsTestDriver.conf", '--port', '4224', '--browser', firefoxPath, '--tests', 'all', '--testOutput', buildDir]
+	commandLine = ['/usr/bin/env', 'DISPLAY=:1', 'java', '-jar', "test/lib/JsTestDriver-1.3.3d.jar", '--config', "test/jsTestDriver.conf", '--port', '4224', '--browser', firefoxPath, '--tests', 'all', '--testOutput', buildDir]
 }
 
 task jsCoverage(type: Exec, dependsOn: 'jstd', description: 'JS code coverage with cobertura') {
-	commandLine = ['python', "${projectDir}/test/lib/lcov-to-cobertura-xml.py", '-b', "../", '-e', 'test.lib', '-o', "${buildDir}/coverage.xml", "${buildDir}/jsTestDriver.conf-coverage.dat"]
+	commandLine = ['python', "${projectDir}/test/lib/lcov-to-cobertura-xml.py", '-e', 'test.lib', '-o', "${buildDir}/coverage.xml", "${buildDir}/jsTestDriver.conf-coverage.dat"]
 }
 
 task all(dependsOn: ['clean', 'jshintz', 'test', 'jsduck', 'minifyJs', 'gzipJs']) << {}
