changeset 4045:cb44813e4ee6

Gradle Build: Moved supplementalPropertyFile include to be after the definition of STUB_RUNTIME. Adjusted location of plugin.jar to be relative to STUB_RUNTIME. Removed plugin renaming step since it is no longer needed (fixed in closed build the cause of the plugin-.jar name).
author Richard Bair <richard.bair@oracle.com>
date Mon, 24 Jun 2013 13:25:48 -0700
parents 2984d0ecac37
children a0988e006f08
files build.gradle
diffstat 1 files changed, 10 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/build.gradle	Mon Jun 24 15:05:23 2013 -0400
+++ b/build.gradle	Mon Jun 24 13:25:48 2013 -0700
@@ -229,14 +229,6 @@
 }
 ext.BUILD_CLOSED = buildClosed
 
-def closedDir = file("../rt-closed");
-def supplementalPropertyFile = file("$closedDir/closed-properties.gradle");
-def supplementalBuildFile = file("$closedDir/closed-build.gradle");
-
-if (BUILD_CLOSED) {
-    apply from: supplementalPropertyFile
-}
-
 // These variables indicate what platform is running the build. Is
 // this build running on a Mac, Windows, or Linux machine? 32 or 64 bit?
 ext.OS_NAME = System.getProperty("os.name").toLowerCase()
@@ -275,6 +267,14 @@
                                cygpath("$STUB_RUNTIME/lib/$OS_ARCH"))
 ext.BINARY_STUB = "".equals(BINARY_STUB) ? null : files(BINARY_STUB)
 
+def closedDir = file("../rt-closed");
+def supplementalPropertyFile = file("$closedDir/closed-properties.gradle");
+def supplementalBuildFile = file("$closedDir/closed-build.gradle");
+
+if (BUILD_CLOSED) {
+    apply from: supplementalPropertyFile
+}
+
 // COMPILE_WEBKIT specifies whether to build all of webkit. COMPILE_GSTREAMER
 // specifies whether to build GStreamer. Both of these can be set by a
 // command line property
@@ -759,8 +759,9 @@
                     artifact "[artifact].[ext]"
                 }
             }
+            // We have this repo for getting the plugin.jar from the existing JRE
             flatDir {
-                dir "$JDK_HOME/jre/lib/"
+                dir "$STUB_RUNTIME/lib/"
             }
         }
     }
@@ -1132,17 +1133,6 @@
                     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"
-                }
             }
         }
     }