redundantly configure each language component subproject

psibre · psibre · commit 19e5d62110a7 · 2018-07-27T15:41:13.000+02:00
diff --git a/buildSrc/src/main/groovy/GenerateComponentXmlDescriptor.groovy b/buildSrc/src/main/groovy/GenerateComponentXmlDescriptor.groovy
@@ -1,26 +1,9 @@
-evaluationDependsOn(':marytts-runtime')
-
-configure(subprojects.findAll { it.name in childProjects }) {
-    apply from: "$rootDir/buildLogic.gradle"
-    apply from: "$rootDir/testLogic.gradle"
-    apply from: "$rootDir/publishLogic.gradle"
-
-    dependencies {
-        compile project(':marytts-runtime')
-        testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
-        integrationTestCompile project(':marytts-runtime').sourceSets.test.output
-    }
-
-    task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
-
-    rootProject.distributions.main.contents {
-        from generateComponentXmlDescriptor, {
-            into 'installed'
-        }
-    }
-}
-
-import groovy.xml.*
+import groovy.xml.StreamingMarkupBuilder
+import groovy.xml.XmlUtil
+import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.OutputFiles
+import org.gradle.api.tasks.TaskAction
 
 class GenerateComponentXmlDescriptor extends DefaultTask {
 
@@ -54,7 +37,7 @@ class GenerateComponentXmlDescriptor extends DefaultTask {
         [locales, getXmlFiles()].transpose().each { locale, xmlFile ->
             def xmlStr = new StreamingMarkupBuilder().bind {
                 'marytts-install'(xmlns: 'http://mary.dfki.de/installer') {
-                language(locale: "$locale", name: locale.toLanguageTag(), version: project.version) {
+                    language(locale: "$locale", name: locale.toLanguageTag(), version: project.version) {
                         delegate.description("${locale.getDisplayName(Locale.US)} language component")
                         license(href: 'http://www.gnu.org/licenses/lgpl-3.0-standalone.html')
                         'package'(filename: "marytts-lang-$locale-${project.version}.zip", md5sum: 'dummy', size: 0)
diff --git a/marytts-languages/marytts-lang-de/build.gradle b/marytts-languages/marytts-lang-de/build.gradle
@@ -1,3 +1,7 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
 repositories {
     ivy {
         url 'http://opennlp.sourceforge.net'
@@ -12,12 +16,23 @@ configurations {
 }
 
 dependencies {
+    compile project(':marytts-runtime')
     opennlp group: 'org.apache.opennlp', name: 'de-pos-maxent', version: '1.5', ext: 'bin'
     runtime group: 'de.dfki.mary', name: 'marytts-lexicon-de', version: '0.1.0'
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
 }
 
 processResources {
     from configurations.opennlp, {
         into "marytts/language/de/tagger"
     }
 }
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-en/build.gradle b/marytts-languages/marytts-lang-en/build.gradle
@@ -1,3 +1,7 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
 repositories {
     ivy {
         url 'http://opennlp.sourceforge.net'
@@ -12,10 +16,13 @@ configurations {
 }
 
 dependencies {
+    compile project(':marytts-runtime')
     opennlp group: 'org.apache.opennlp', name: 'en-pos-maxent', version: '1.5', ext: 'bin'
     runtime group: 'de.dfki.mary', name: 'marytts-lexicon-en_US-cmudict', version: '0.1.0'
     testCompile libs.testng
     testCompile libs.xmlunit
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
 }
 
 processResources {
@@ -28,6 +35,12 @@ test {
     useTestNG()
 }
 
-generateComponentXmlDescriptor {
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor) {
     locales = ['en-US', 'en-GB']
 }
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-fr/build.gradle b/marytts-languages/marytts-lang-fr/build.gradle
@@ -1,9 +1,24 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
 dependencies {
+    compile project(':marytts-runtime')
     runtime group: 'de.dfki.mary', name: 'marytts-lexicon-fr', version: '0.1.0'
     testCompile libs.testng
     testCompile libs.xmlunit
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
 }
 
 test {
     useTestNG()
 }
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-it/build.gradle b/marytts-languages/marytts-lang-it/build.gradle
@@ -1,8 +1,23 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
 dependencies {
+    compile project(':marytts-runtime')
     runtime group: 'de.dfki.mary', name: 'marytts-lexicon-it', version: '0.1.0'
     testCompile libs.testng
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
 }
 
 test {
     useTestNG()
 }
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-lb/build.gradle b/marytts-languages/marytts-lang-lb/build.gradle
@@ -2,15 +2,30 @@ plugins {
     id 'groovy'
 }
 
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
 dependencies {
+    compile project(':marytts-runtime')
     compile project(':marytts-languages:marytts-lang-fr')
     compile libs.groovy
     runtime group: 'de.dfki.mary', name: 'marytts-lexicon-lb', version: '0.1.0'
     testCompile libs.testng
     testCompile libs.xmlunit
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
 }
 
 test {
     useTestNG()
     systemProperty 'lb.userdict', "$rootDir/src/main/dist/user-dictionaries/userdict-lb.txt"
 }
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-ru/build.gradle b/marytts-languages/marytts-lang-ru/build.gradle
@@ -1,8 +1,23 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
 dependencies {
+    compile project(':marytts-runtime')
     runtime group: 'de.dfki.mary', name: 'marytts-lexicon-ru', version: '0.1.0'
     testCompile libs.testng
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
 }
 
 test {
     useTestNG()
 }
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-sv/build.gradle b/marytts-languages/marytts-lang-sv/build.gradle
@@ -0,0 +1,17 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
+dependencies {
+    compile project(':marytts-runtime')
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
+}
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-te/build.gradle b/marytts-languages/marytts-lang-te/build.gradle
@@ -0,0 +1,17 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
+dependencies {
+    compile project(':marytts-runtime')
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
+}
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
+}
diff --git a/marytts-languages/marytts-lang-tr/build.gradle b/marytts-languages/marytts-lang-tr/build.gradle
@@ -1,3 +1,18 @@
+apply from: "$rootDir/buildLogic.gradle"
+apply from: "$rootDir/testLogic.gradle"
+apply from: "$rootDir/publishLogic.gradle"
+
 dependencies {
+    compile project(':marytts-runtime')
     runtime group: 'de.dfki.mary', name: 'marytts-lexicon-tr', version: '0.1.0'
+    testCompile project(path: ':marytts-runtime', configuration: 'testCompile')
+    integrationTestCompile project(':marytts-runtime').sourceSets.test.output
+}
+
+task generateComponentXmlDescriptor(type: GenerateComponentXmlDescriptor)
+
+rootProject.distributions.main.contents {
+    from generateComponentXmlDescriptor, {
+        into 'installed'
+    }
 }
diff --git a/publishLogic.gradle b/publishLogic.gradle
@@ -17,12 +17,12 @@ publishing {
         maven {
             url "$rootProject.buildDir/repo"
         }
-        maven {
-            url version.endsWith('-SNAPSHOT') ? 'https://oss.jfrog.org/artifactory/oss-snapshot-local' : 'https://api.bintray.com/maven/marytts/marytts/marytts'
-            credentials {
-                username = findProperty('bintrayUser')
-                password = findProperty('bintrayApiKey')
-            }
-        }
+//        maven {
+//            url version.endsWith('-SNAPSHOT') ? 'https://oss.jfrog.org/artifactory/oss-snapshot-local' : 'https://api.bintray.com/maven/marytts/marytts/marytts'
+//            credentials {
+//                username = findProperty('bintrayUser')
+//                password = findProperty('bintrayApiKey')
+//            }
+//        }
     }
 }
