changeset 4043:2cd003d9ec88

Gradle build: fix bug where when PULL_CLOSED, we weren't getting all of the antlr jars we needed for the IDEs to be happy. Funny that the compilation succeeded anyway. Also cleaned up the name for the plugin jar.
author Richard Bair <richard.bair@oracle.com>
date Mon, 24 Jun 2013 12:03:11 -0700
parents 35ed9cc8cfb0
children 2984d0ecac37
files build.gradle
diffstat 1 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Mon Jun 24 11:38:25 2013 -0700
+++ b/build.gradle	Mon Jun 24 12:03:11 2013 -0700
@@ -871,6 +871,8 @@
         stubCompile group: "junit", name: "junit", version: "4.8.2",
         project(":base").sourceSets.test.output, sourceSets.main.output
         antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
+        antlr3 group: "org.antlr", name: "antlr-runtime",  version: "3.1.3"
+        antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
     }
 
     // Add tasks for native compilation
@@ -1120,6 +1122,9 @@
                     include "**/antlr-runtime-3.1.3.jar"
                     includeEmptyDirs = false
                 }
+                // Have to rename the swt jar because it is some platform specific name but
+                // for the sake of the IDEs we need to have a single stable name that works
+                // on every platform
                 copy {
                     into libsDir
                     from f.getParentFile()
@@ -1127,6 +1132,17 @@
                     includeEmptyDirs = false
                     rename ".*swt.*jar", "swt\\.jar"
                 }
+                // For some reason (queue twilight zone) the plugin jar is sometimes
+                // named plugin.jar and sometimes plugin-.jar, but we need to rename
+                // it to plugin.jar in all cases.
+                copy {
+                    into libsDir
+                    from f.getParentFile()
+                    include "**/plugin.jar"
+                    include "**/plugin-.jar"
+                    includeEmptyDirs = false
+                    rename ".*plugin.*jar", "plugin\\.jar"
+                }
             }
         }
     }