changeset 4028:e8ece2a01adb

Partial RT-31067: Gradle: gradle.generator is missing some files
author kcr
date Fri, 21 Jun 2013 09:58:54 -0700
parents 4c80b614717f
children 7ba42dc66b10
files generator.gradle
diffstat 1 files changed, 44 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/generator.gradle	Fri Jun 21 16:33:28 2013 +0100
+++ b/generator.gradle	Fri Jun 21 09:58:54 2013 -0700
@@ -33,8 +33,8 @@
 }
 
 task generate << {
-    def excludeFromSource = ["META-INF/**", "**/doc-files/**/*", "**/*.properties", "**/*.stg", "**/*.g", "**/*.css", "**/*.png", "**/*.jpg", "nbproject", "*.iml", "**/*.txt", "**/*.fxml", "**/*.bak", "**/*.orig", "**/*.js", "**/*.frag", "**/*.vert"]
-    def includeInResources = ["META-INF/**", "**/*.properties", "**/*.stg", "**/*.css", "**/*.png", "**/*.jpg", "**/*.txt", "**/*.fxml", "**/*.js", "**/*.frag", "**/*.vert"]
+    def excludeFromSource = ["META-INF/**", "**/doc-files/**/*", "**/*.properties", "**/*.stg", "**/*.g", "**/*.css", "**/*.png", "**/*.jpg", "**/*.gif", "nbproject", "*.iml", "**/*.txt", "**/*.fxml", "**/*.bak", "**/*.orig", "**/*.js", "**/*.frag", "**/*.vert"]
+    def includeInResources = ["META-INF/**", "**/*.properties", "**/*.stg", "**/*.css", "**/*.png", "**/*.jpg", "**/*.gif", "**/*.txt", "**/*.fxml", "**/*.js", "**/*.frag", "**/*.vert"]
     def excludeFromResources = ["**/doc-files/**/*"]
 
     // Copy over the new gradle build files, LICENSE, and README
@@ -326,11 +326,15 @@
         }
     }
     copy {
-        from "${RTDir}/javafx-concurrent/test",
+        from "${RTDir}/decora-runtime/test",
+             "${RTDir}/javafx-concurrent/test",
              "${RTDir}/javafx-geom/test",
+             "${RTDir}/javafx-iio/test",
              "${RTDir}/javafx-sg-common/test",
              "${RTDir}/javafx-sg-prism/test",
-             "${RTDir}/javafx-ui-quantum/test"
+             "${RTDir}/javafx-ui-quantum/test",
+             "${RTDir}/prism-common/test",
+             "${RTDir}/prism-ps/test"
         into "${FXDir}/modules/graphics/src/test/java"
         exclude excludeFromSource
         eachFile { f ->
@@ -338,11 +342,15 @@
         }
     }
     copy {
-        from "${RTDir}/javafx-concurrent/test",
+        from "${RTDir}/decora-runtime/test",
+             "${RTDir}/javafx-concurrent/test",
              "${RTDir}/javafx-geom/test",
+             "${RTDir}/javafx-iio/test",
              "${RTDir}/javafx-sg-common/test",
              "${RTDir}/javafx-sg-prism/test",
-             "${RTDir}/javafx-ui-quantum/test"
+             "${RTDir}/javafx-ui-quantum/test",
+             "${RTDir}/prism-common/test",
+             "${RTDir}/prism-ps/test"
         into "${FXDir}/modules/graphics/src/test/resources"
         include includeInResources
         exclude excludeFromResources
@@ -389,6 +397,26 @@
     }
 
     copy {
+        from "${RTDir}/javafx-beans-dt/test",
+             "${RTDir}/javafx-designtime/test"
+        into "${FXDir}/modules/designTime/src/test/java"
+        exclude excludeFromSource
+        eachFile { f ->
+            fileList.add(f.file);
+        }
+    }
+    copy {
+        from "${RTDir}/javafx-beans-dt/test",
+             "${RTDir}/javafx-designtime/test"
+        into "${FXDir}/modules/designTime/src/test/resources"
+        include includeInResources
+        exclude excludeFromResources
+        eachFile { f ->
+            fileList.add(f.file);
+        }
+    }
+
+    copy {
         from "${RTDir}/prism-ps/jsl",
              "${RTDir}/prism-ps/shadergen"
         into "${FXDir}/modules/graphics/src/main/jsl-prism"
@@ -742,6 +770,16 @@
     }
 
     copy {
+        from "${RTDir}/webview/src"
+        into "${FXDir}/modules/web/src/main/resources"
+        include includeInResources
+        exclude excludeFromResources
+        eachFile { f ->
+            fileList.add(f.file);
+        }
+    }
+
+    copy {
         from "${RTDir}/webview/test"
         into "${FXDir}/modules/web/src/test/java"
         exclude excludeFromSource