Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > db7933464f4758b5e41d62c3e2ab09f9 > files > 19

java-1.8.0-openjfx-1.8.0.172-1.b11.1.mga6.src.rpm

--- java-1.8.0-openjfx-1.8.0.172/build.gradle	2018-06-14 11:55:14.532497327 +0200
+++ java-1.8.0-openjfx-1.8.0.172/build.gradle.new	2018-06-18 11:03:23.173127435 +0200
@@ -3225,36 +3225,6 @@
 
     ant.importBuild 'build.xml'
 
-    // Download the Lucene libraries needed for the Ensemble8 app
-    getConfigurations().create("lucene");
-    dependencies {
-        lucene group: "org.apache.lucene", name: "lucene-core", version: "7.1.0"
-        lucene group: "org.apache.lucene", name: "lucene-grouping", version: "7.1.0"
-        lucene group: "org.apache.lucene", name: "lucene-queryparser", version: "7.1.0"
-    }
-
-    // Copy Lucene libraries into the Ensemble8/lib directory
-    File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib");
-    def libNames = [ "lucene-core-7.1.0.jar",
-                     "lucene-grouping-7.1.0.jar",
-                     "lucene-queryparser-7.1.0.jar" ]
-
-
-    task getLucene(type: Copy) {
-        doFirst {
-            ensembleLibDir.mkdirs();
-        }
-        into ensembleLibDir
-        includeEmptyDirs = false
-        configurations.lucene.files.each { f ->
-            libNames.each { name ->
-                if (name == f.getName()) {
-                    from f.getPath()
-                }
-            }
-        }
-    }
-
     compileTargets { t ->
         // The apps build is Ant based, and gradle lets us "import" ant apps/build.xml
         // into our configuration.
@@ -3264,7 +3234,6 @@
         def jfxrtJar = "${rootProject.buildDir}/${sdkDirName}/rt/lib/ext/jfxrt.jar"
 
         def appsJar = project.task("appsJar${t.capital}") {
-            dependsOn(sdk, getLucene)
             doLast() {
               ant.properties['targetBld'] = "$t.name"
               if (!rootProject.ext[t.upper].compileSwing) {
@@ -3290,7 +3259,6 @@
               if (!t.name.startsWith("arm")) {
                 ant.project.executeTarget("scenebuilderAppClean")
               }
-              delete(ensembleLibDir);
             }
         }
         rootProject.clean.dependsOn(appsClean)