Commit 77e913c1 authored by dgelessus's avatar dgelessus
Browse files

Fix dubious indents and formatting in Gradle scripts

parent 012a9ec3
Pipeline #66413 passed with stages
in 4 minutes and 46 seconds
// to trigger a full tycho build please use 'gradle deleteFromClassPath completeInstall' // to trigger a full tycho build please use 'gradle deleteFromClassPath completeInstall'
import org.apache.tools.ant.taskdefs.condition.Os import org.apache.tools.ant.taskdefs.condition.Os
project.ext{ project.ext {
targetRepositories = [
targetRepositories = ["http://download.eclipse.org/releases/luna/", "http://download.eclipse.org/releases/luna/",
"http://rodin-b-sharp.sourceforge.net/updates", "http://rodin-b-sharp.sourceforge.net/updates",
"https://www3.hhu.de/stups/buildlibs/org.rodinp.dev/"] "https://www3.hhu.de/stups/buildlibs/org.rodinp.dev/",
]
groupID = "de.prob" groupID = "de.prob"
} }
...@@ -16,7 +17,6 @@ apply from: 'tycho_build.gradle' ...@@ -16,7 +17,6 @@ apply from: 'tycho_build.gradle'
/*task bMotionStudioHelpCustumBuild(type: Exec){ /*task bMotionStudioHelpCustumBuild(type: Exec){
commandLine 'ant', '-f','de.bmotionstudio.help/customBuild.xml' commandLine 'ant', '-f','de.bmotionstudio.help/customBuild.xml'
} }
...@@ -25,26 +25,23 @@ install.dependsOn bMotionStudioHelpCustumBuild ...@@ -25,26 +25,23 @@ install.dependsOn bMotionStudioHelpCustumBuild
completeInstall.dependsOn bMotionStudioHelpCustumBuild*/ completeInstall.dependsOn bMotionStudioHelpCustumBuild*/
project(':de.prob.core') { project(':de.prob.core') {
repositories { repositories {
mavenCentral() mavenCentral()
} }
def parser_version = '2.5.1'
def parser_version = '2.5.1'
dependencies { dependencies {
compile group: "de.hhu.stups", name: "answerparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "answerparser", version: parser_version, changing: true
compile group: "de.hhu.stups", name: "bparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "bparser", version: parser_version, changing: true
compile group: "de.hhu.stups", name: "cliparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "cliparser", version: parser_version, changing: true
compile group: "de.hhu.stups", name: "ltlparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "ltlparser", version: parser_version, changing: true
compile group: "de.hhu.stups", name: "parserbase", version: parser_version , changing: true compile group: "de.hhu.stups", name: "parserbase", version: parser_version, changing: true
compile group: "de.hhu.stups", name: "prologlib", version: parser_version , changing: true compile group: "de.hhu.stups", name: "prologlib", version: parser_version, changing: true
compile group: "de.hhu.stups", name: "unicode", version: parser_version , changing: true compile group: "de.hhu.stups", name: "unicode", version: parser_version, changing: true
compile group: "de.hhu.stups", name: "theorymapping", version: parser_version , changing: true compile group: "de.hhu.stups", name: "theorymapping", version: parser_version, changing: true
compile 'commons-lang:commons-lang:2.6' compile 'commons-lang:commons-lang:2.6'
} }
} }
project(':de.prob.ui') { project(':de.prob.ui') {
...@@ -52,98 +49,95 @@ project(':de.prob.ui') { ...@@ -52,98 +49,95 @@ project(':de.prob.ui') {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compile 'commons-codec:commons-codec:1.8' compile 'commons-codec:commons-codec:1.8'
} }
} }
def download(address,target) { def download(address,target) {
def file = new FileOutputStream(target) def file = new FileOutputStream(target)
def out = new BufferedOutputStream(file) def out = new BufferedOutputStream(file)
out << new URL(address).openStream() out << new URL(address).openStream()
out.close() out.close()
} }
task downloadCli { task downloadCli {
doLast{ doLast{
def dir = workspacePath+'de.prob.core/prob/' def dir = workspacePath + 'de.prob.core/prob/'
delete file(dir) delete file(dir)
new File(dir).mkdirs() new File(dir).mkdirs()
['leopard64':'macos','linux32':'linux','linux64':'linux64','win64':'windows'].each { ['leopard64':'macos','linux32':'linux','linux64':'linux64','win64':'windows'].each {
def n = it.getKey() def n = it.getKey()
def targetdir = dir+it.getValue() def targetdir = dir + it.getValue()
def targetzip = dir+"probcli_${n}.zip" def targetzip = dir + "probcli_${n}.zip"
def url = "https://www3.hhu.de/stups/downloads/prob/cli/nightly/probcli_${n}.zip" def url = "https://www3.hhu.de/stups/downloads/prob/cli/nightly/probcli_${n}.zip"
download(url,targetzip) download(url, targetzip)
FileTree zip = zipTree(targetzip) FileTree zip = zipTree(targetzip)
copy { copy {
from zip from zip
into targetdir into targetdir
} }
delete file(targetzip)
}
def targetdir = dir + "windows/"
def targetzip = targetdir + "windowslib64.zip"
download("https://www3.hhu.de/stups/downloads/prob/cli/nightly/windowslib64.zip",targetzip)
FileTree zip = zipTree(targetzip)
copy {
from zip
into targetdir
}
delete file(targetzip) delete file(targetzip)
} }
def targetdir = dir+"windows/"
def targetzip = targetdir+"windowslib64.zip"
download("https://www3.hhu.de/stups/downloads/prob/cli/nightly/windowslib64.zip",targetzip)
FileTree zip = zipTree(targetzip)
copy {
from zip
into targetdir
}
delete file(targetzip)
}
} }
task downloadCli2 (type: Exec) {
def dir = workspacePath + 'de.prob.core/prob/'
delete file(dir)
new File(dir).mkdirs()
task downloadCli2 ( type: Exec ) { ['leopard64':'macos','linux32':'linux','linux64':'linux64','win64':'windows'].each {
def dir = workspacePath+'de.prob.core/prob/'
delete file(dir)
new File(dir).mkdirs()
['leopard64':'macos','linux32':'linux','linux64':'linux64','win64':'windows'].each {
def n = it.getKey() def n = it.getKey()
def targetdir = dir+it.getValue() def targetdir = dir + it.getValue()
def targetzip = dir+"probcli_${n}.zip" def targetzip = dir + "probcli_${n}.zip"
def url = "https://www3.hhu.de/stups/downloads/prob/cli/nightly//probcli_${n}.zip" def url = "https://www3.hhu.de/stups/downloads/prob/cli/nightly//probcli_${n}.zip"
download(url,targetzip) download(url, targetzip)
FileTree zip = zipTree(targetzip) FileTree zip = zipTree(targetzip)
copy { copy {
from zip from zip
into targetdir into targetdir
} }
delete file(targetzip) delete file(targetzip)
} }
def targetdir = dir+"windows/" def targetdir = dir + "windows/"
def targetzip = targetdir+"windowslib64.zip" def targetzip = targetdir + "windowslib64.zip"
download("https://www3.hhu.de/stups/downloads/prob/cli/nightly/windowslib64.zip",targetzip) download("https://www3.hhu.de/stups/downloads/prob/cli/nightly/windowslib64.zip", targetzip)
FileTree zip = zipTree(targetzip) FileTree zip = zipTree(targetzip)
copy { copy {
from zip from zip
into targetdir into targetdir
} }
delete file(targetzip) delete file(targetzip)
} }
completeInstall.dependsOn downloadCli completeInstall.dependsOn downloadCli
completeInstall.dependsOn subprojects.setClassPath completeInstall.dependsOn subprojects.setClassPath
task deleteOldArtifacts(type: Delete) { task deleteOldArtifacts(type: Delete) {
String updateSite = workspacePath+'updatesite' String updateSite = workspacePath + 'updatesite'
delete updateSite delete updateSite
} }
task collectArtifacts(type:Copy) { task collectArtifacts(type: Copy) {
from workspacePath + groupID+'.repository/target/repository/' from workspacePath + groupID + '.repository/target/repository/'
into workspacePath + 'updatesite' into workspacePath + 'updatesite'
from workspacePath + "index.html" from workspacePath + "index.html"
into workspacePath + 'updatesite' into workspacePath + 'updatesite'
} }
...@@ -3,17 +3,17 @@ apply plugin: 'java' ...@@ -3,17 +3,17 @@ apply plugin: 'java'
def parser_version = '2.5.1' def parser_version = '2.5.1'
dependencies { dependencies {
compile group: "de.hhu.stups", name: "answerparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "answerparser", version: parser_version , changing: true
compile group: "de.hhu.stups", name: "bparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "bparser", version: parser_version , changing: true
compile group: "de.hhu.stups", name: "cliparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "cliparser", version: parser_version , changing: true
compile group: "de.hhu.stups", name: "ltlparser", version: parser_version , changing: true compile group: "de.hhu.stups", name: "ltlparser", version: parser_version , changing: true
compile group: "de.hhu.stups", name: "parserbase", version: parser_version , changing: true compile group: "de.hhu.stups", name: "parserbase", version: parser_version , changing: true
compile group: "de.hhu.stups", name: "prologlib", version: parser_version , changing: true compile group: "de.hhu.stups", name: "prologlib", version: parser_version , changing: true
compile group: "de.hhu.stups", name: "unicode", version: parser_version , changing: true compile group: "de.hhu.stups", name: "unicode", version: parser_version , changing: true
compile group: "de.hhu.stups", name: "theorymapping", version: parser_version , changing: true compile group: "de.hhu.stups", name: "theorymapping", version: parser_version , changing: true
compile 'commons-lang:commons-lang:2.6' compile 'commons-lang:commons-lang:2.6'
compile 'commons-codec:commons-codec:1.8' compile 'commons-codec:commons-codec:1.8'
compile 'com.thoughtworks.xstream:xstream:1.4.7' compile 'com.thoughtworks.xstream:xstream:1.4.7'
compile group: 'net.java.dev.jna', name: 'jna', version: '3.4.0' compile group: 'net.java.dev.jna', name: 'jna', version: '3.4.0'
compile group: 'de.hhu.stups', name: 'ptolemy-jfmi', version: '1.1.0' compile group: 'de.hhu.stups', name: 'ptolemy-jfmi', version: '1.1.0'
} }
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment