Update patches

Open-RIO · Apr 15, 2015 · 305730c · 305730c
1 parent f4048c8
commit 305730c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,9 @@ language: java
 
 install:
   - "./gradlew wpi"
-  - "./gradlew assemble"
+  - "./gradlew build"
+  - "./gradlew generateExternalPatches"
+  - "./gradlew build"
 
 script:
   - "./gradlew verify"

diff --git a/build.gradle b/build.gradle
@@ -92,7 +92,7 @@ task genJavadoc(type: Jar, dependsOn: javadoc) {
 
 task generateExternalPatches(type: GradleBuild) {
   dir = 'patches'
-  tasks = ['genPatches']
+  tasks = ['build', 'genPatches']
 }
 
 task genPatches << {
@@ -119,7 +119,6 @@ task updateLatest << {
   ant.copy(file: "${jar.archivePath}", todir: "build/latest")
 }
 
-deletePatches.dependsOn generateExternalPatches
 genPatches.dependsOn deletePatches
 compileJava.dependsOn genPatches
 build.finalizedBy updateLatest

diff --git a/patches/build.gradle b/patches/build.gradle
@@ -22,7 +22,9 @@ dependencies {
 }
 
 task genPatches << {
-  ant.delete(dir: "build/patches")
+  try {
+	ant.delete(dir: "build/patches")
+  } catch (Exception e) {}
   ant.copy(todir: "build/patches") {
     ant.fileset(dir: "build/classes/main")
     ant.mapper(type: "glob", from: "*.class", to: "*.sim")