diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF index 7b601fefd20528d75c8d98cdbf98c99f830508f2..1e474117982e929dc3778e9624e9e6fa3ba450e5 100644 --- a/de.prob.core/META-INF/MANIFEST.MF +++ b/de.prob.core/META-INF/MANIFEST.MF @@ -63,4 +63,4 @@ Eclipse-BuddyPolicy: registered Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., lib/probcliparser.jar, - lib/commons-lang-2.4.jar + lib/dependencies/commons-lang-2.4.jar diff --git a/de.prob.core/build.gradle b/de.prob.core/build.gradle new file mode 100644 index 0000000000000000000000000000000000000000..a1138ade9f85e2045749254ae0a2c96f51986689 --- /dev/null +++ b/de.prob.core/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'java' + +repositories { + maven { + name "cobra" + url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo" + } +} + + +def parser_version = '2.4.8-SNAPSHOT' + +dependencies { + compile group: "de.prob", name: "answerparser", version: parser_version , changing: true + compile group: "de.prob", name: "bparser", version: parser_version , changing: true + compile group: "de.prob", name: "cliparser", version: parser_version , changing: true + compile group: "de.prob", name: "ltlparser", version: parser_version , changing: true + compile group: "de.prob", name: "parserbase", version: parser_version , changing: true + compile group: "de.prob", name: "prologlib", version: parser_version , changing: true + compile group: "de.prob", name: "unicode", version: parser_version , changing: true + compile 'jgrapht:jgrapht:0.8.3' + compile 'commons-lang:commons-lang:2.6' +} \ No newline at end of file diff --git a/de.prob.core/build.properties b/de.prob.core/build.properties index 9fb141b7cfba9f7f131f0a0a5f0521aec2927685..6e7126dbc60ac1ab2d2ecb330257bceda799b2d2 100644 --- a/de.prob.core/build.properties +++ b/de.prob.core/build.properties @@ -4,6 +4,6 @@ bin.includes = META-INF/,\ plugin.xml,\ .,\ lib/probcliparser.jar,\ - lib/commons-lang-2.4.jar,\ + lib/dependencies/commons-lang-2.4.jar,\ prob/ diff --git a/de.prob.core/lib/commons-lang-2.4.jar b/de.prob.core/lib/commons-lang-2.4.jar deleted file mode 100644 index 532939ecab6b77ccb77af3635c55ff9752b70ab7..0000000000000000000000000000000000000000 Binary files a/de.prob.core/lib/commons-lang-2.4.jar and /dev/null differ diff --git a/de.prob.releng/build.gradle b/de.prob.releng/build.gradle index 93da1c1488e669bd5e531d8280fd2fd4dad2743b..19d3cb85d13dc7a7d2c46d71dd8260786588ff99 100644 --- a/de.prob.releng/build.gradle +++ b/de.prob.releng/build.gradle @@ -1,9 +1,22 @@ targetRepositories = ["http://cobra.cs.uni-duesseldorf.de/prob_dev_target/","http://download.eclipse.org/releases/indigo/"] -apply from: 'http://cobra.cs.uni-duesseldorf.de/artifactory//plugins-snapshot-local/tycho_build-SNAPSHOT.gradle' +apply from: 'tycho_build.gradle' // Local tasks + +project(':de.prob.core') { + + repositories { + mavenCentral() + } + dependencies { + compile group: 'commons-lang', name: 'commons-lang', version: '2.4' + } + +} + + def download(address,target) { def file = new FileOutputStream(target) def out = new BufferedOutputStream(file) diff --git a/de.prob.releng/tycho_build.gradle b/de.prob.releng/tycho_build.gradle index 7870602cbacff063b4deeb8fdbbed29efdd088bb..25a3644e6f169ad9d90a7c823f30081f0b6fabe8 100644 --- a/de.prob.releng/tycho_build.gradle +++ b/de.prob.releng/tycho_build.gradle @@ -10,6 +10,13 @@ try{ workspacePath = "../" } + +try{ + dependencyFolder = dependencyFolder +}catch(MissingPropertyException e){ + dependencyFolder = "lib/dependencies/" // Folder in each subproject where +} + try{ groupID = groupID }catch(MissingPropertyException e){ @@ -114,6 +121,8 @@ def groupId(){ */ + + ///////////////////////////////////////////////////////////////////////////////////////// // -- !!! DEFINING SUB PROJECTS !!! -- // ///////////////////////////////////////////////////////////////////////////////////////// @@ -121,11 +130,22 @@ def groupId(){ subprojects { apply plugin: 'base' + apply plugin: 'java' task deleteArtifacts(type: Delete) { delete 'target','pom.xml' } - + + ///// Copy Dependencies into subprojects DependencyFolder ///// + task collectDependencies(type: Copy){ + + from configurations.compile + + into "../"+workspacePath+project.name+"/${dependencyFolder}" + + } + //////////////////////////////////////////////////////////////////////////////////////////// + task deploy() <<{ description = "\tGenerating the Tycho Poms. Please remember to add a '.qualifier' to the version numbers!" @@ -295,6 +315,12 @@ task install(dependsOn: [createPoms] , type:Exec) { commandLine 'mvn', 'install', '-f', workspacePath+parentID+'/pom.xml' } +task completeInstall(dependsOn: [subprojects.collectDependencies, createPoms], type:Exec ){ + + description = "\tCopies dependencies into dependencyFolder of each subproject and executes a 'mvn install' of the parent pom.xml and auto-generates Tycho Poms" + commandLine 'mvn', 'install', '-f', workspacePath+parentID+'/pom.xml' +} + //--- Defining Tycho POM parts --//