Skip to content
Snippets Groups Projects
Commit a938bf69 authored by anttil's avatar anttil
Browse files

SWE-22 / SP-970: Create openBIS-screening-API.zip in... 

SWE-22 / SP-970: Create openBIS-screening-API.zip in openbis_standard_technologies instead of screening

SVN: 30064
parent df9e9db2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
openbis_standard_technologies/build.gradle
+ 3
− 2
View file @ a938bf69
......@@ -12,6 +12,7 @@ evaluationDependsOn(':deep_sequencing_unit')
apply from: 'http://svncisd.ethz.ch/repos/cisd/gradle/trunk/javaproject.gradle'
apply from: 'query-api.gradle'
apply from: 'screening-api.gradle'
apply from: 'proteomics-api.gradle'
apply plugin: 'war'
......@@ -474,7 +475,7 @@ task clientsAndApis(type: Zip) {
from (project(':datastore_server').dssGuiZip.archivePath)
from (queryApiZip.archivePath)
from (proteomicsApiZip.archivePath)
from (project(':screening').screeningApiZip.archivePath)
from (screeningApiZip.archivePath)
from (project(':datastore_server').dssClientZip.archivePath) {
......@@ -492,7 +493,7 @@ clientsAndApis.dependsOn project(':datastore_server').dssClientZip
clientsAndApis.dependsOn project(':datastore_server').dssGuiZip
clientsAndApis.dependsOn queryApiZip
clientsAndApis.dependsOn proteomicsApiZip
clientsAndApis.dependsOn project(':screening').screeningApiZip
clientsAndApis.dependsOn screeningApiZip
build.dependsOn zip
build.dependsOn zipDss
......
openbis_standard_technologies/screening-api.gradle 0 → 100644
+ 118
− 0
View file @ a938bf69
configurations.create('screeningApiJarExternalLibs')
dependencies {
screeningApiJarExternalLibs 'google:gwt-user:2.4'
}
task screeningApiJar(type: Jar) {
archiveName 'openbis_screening_api.jar'
includeEmptyDirs false
from project(':common').compileJava.outputs.getFiles().getAsFileTree().plus(
project(':openbis-common').compileJava.outputs.getFiles().getAsFileTree().plus(
project(':openbis').compileJava.outputs.getFiles().getAsFileTree().plus(
project(':openbis_api').compileJava.outputs.getFiles().getAsFileTree().plus(
project(':datastore_server').compileJava.outputs.getFiles().getAsFileTree().plus(
project(':screening').compileJava.outputs.getFiles().getAsFileTree()))))).matching {
include "OpenBISScreeningML*.class"
include "ch/systemsx/cisd/common/api/**/*.class"
exclude "ch/systemsx/cisd/common/api/server/**/*.class"
include "ch/systemsx/cisd/openbis/common/api/**/*.class"
include "ch/systemsx/cisd/openbis/dss/client/api/v1/**/*.class"
include "ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/**/*.class"
include "ch/systemsx/cisd/openbis/dss/generic/shared/api/authorization/**/*.class"
include "ch/systemsx/cisd/openbis/dss/screening/shared/api/**/*.class"
include "ch/systemsx/cisd/openbis/generic/shared/basic/**/*.class"
include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.class"
include "ch/systemsx/cisd/openbis/generic/shared/authorization/annotation/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/query/shared/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/screening/shared/api/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/screening/client/api/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/screening/client/cli/**/*.class"
include "ch/systemsx/cisd/openbis/generic/client/cli/Login*.class"
include "ch/systemsx/cisd/openbis/generic/shared/api/v1/**/*.class"
include "ch/systemsx/cisd/common/**/*.class"
include "ch/systemsx/cisd/openbis/common/**/*.class"
}
from zipTree(configurations.screeningApiJarExternalLibs.files.iterator().next()).matching {
include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
include '**/com/google/gwt/user/client/rpc/SerializableException.class'
}
manifest {
attributes("Main-Class": "ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.ScreeningClientApiTest",
"Version": versionNumber,
"Build-Number": "${versionNumber} (r${revisionNumber},${cleanFlag})",
"Class-Path": "spring-ext.jar")
}
}
task screeningApiSources(type: Zip) {
archiveName 'sources-screening-api.zip'
from project(':common').files('source/java').getAsFileTree().plus(
project(':openbis-common').files('source/java').getAsFileTree().plus(
project(':openbis').files('source/java').getAsFileTree().plus(
project(':openbis_api').files('source/java').getAsFileTree().plus(
project(':datastore_server').files('source/java').getAsFileTree().plus(
project(':screening').files('source/java').getAsFileTree()))))).matching {
include "OpenBISScreeningML*.java"
include "ch/systemsx/cisd/openbis/plugin/screening/shared/api/**/*.java"
include "ch/systemsx/cisd/openbis/plugin/screening/client/api/**/*.java"
}
}
configurations.create('screeningApiJavadoc')
dependencies {
screeningApiJavadoc project(':screening')
}
task screeningApiJavaDoc(type: Javadoc) {
source screeningApiSources.inputs.getFiles().getAsFileTree().matching {
include "**/*.java"
}
classpath = configurations.screeningApiJavadoc
}
task screeningApiJavaDocZip(type: Zip, dependsOn: screeningApiJavaDoc) {
archiveName 'javadoc-screening-api.zip'
from screeningApiJavaDoc.destinationDir
}
configurations.create('batteries')
dependencies {
batteries 'cisd:cisd-base:+',
'apache:commons-httpclient:+',
'apache:log4j:+',
'springframework:spring-aop:+',
'springframework:spring-web:+',
'springframework:spring-jdbc:+',
'springframework:spring-orm:+',
'marathon:marathon-spring-util:+',
'cisd:cisd-args4j:+',
'python:jython:+'
}
task springExt(type: Jar) {
archiveName 'spring-ext.jar'
for (File f : configurations.batteries.files) {
from zipTree(f).matching {
include '**/**'
}
}
}
task screeningApiBatteriesIncluded(type: Jar, dependsOn: [screeningApiJar, springExt]) {
archiveName 'openbis_screening_api-batteries_included.jar'
from zipTree(springExt.archivePath)
from zipTree(screeningApiJar.archivePath)
}
task screeningApiZip(type: Zip, dependsOn: [screeningApiJavaDocZip, screeningApiSources, screeningApiBatteriesIncluded]) {
baseName 'openBIS-screening-API'
from screeningApiJar.archivePath
from springExt.archivePath
from screeningApiBatteriesIncluded.archivePath
from screeningApiSources.archivePath
from screeningApiJavaDocZip.archivePath
from project(':screening').files('dist/api/').getAsFileTree()
}
screening/build.gradle
+ 0
− 141
View file @ a938bf69
......@@ -55,144 +55,3 @@ task systemTestSuite(type: Test) {
test.dependsOn(systemTestSuite)
test.dependsOn(copyTestData)
configurations.create('api_partial')
dependencies {
api_partial 'google:gwt-user:2.4'
}
task screeningApiJar(type: Jar) {
archiveName 'openbis_screening_api.jar'
includeEmptyDirs false
from zipTree(project(':common').jar.archivePath).plus(
zipTree(project(':openbis-common').jar.archivePath).plus(
zipTree(project(':openbis').jar.archivePath).plus(
zipTree(project(':openbis_api').jar.archivePath).plus(
zipTree(project(':datastore_server').jar.archivePath).plus(
zipTree(jar.archivePath)))))).matching {
include "OpenBISScreeningML*.class"
include "ch/systemsx/cisd/common/api/**/*.class"
exclude "ch/systemsx/cisd/common/api/server/**/*.class"
include "ch/systemsx/cisd/openbis/common/api/**/*.class"
exclude "ch/systemsx/cisd/openbis/common/api/server/**/*.class"
include "ch/systemsx/cisd/openbis/dss/client/api/v1/**/*.class"
include "ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/**/*.class"
include "ch/systemsx/cisd/openbis/dss/generic/shared/api/authorization/**/*.class"
include "ch/systemsx/cisd/openbis/dss/screening/shared/api/**/*.class"
include "ch/systemsx/cisd/openbis/generic/shared/basic/**/*.class"
include "ch/systemsx/cisd/openbis/generic/shared/api/**/*.class"
include "ch/systemsx/cisd/openbis/generic/shared/authorization/annotation/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/query/shared/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/screening/shared/api/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/screening/client/api/**/*.class"
include "ch/systemsx/cisd/openbis/plugin/screening/client/cli/**/*.class"
include "ch/systemsx/cisd/openbis/generic/client/cli/Login*.class"
include "ch/systemsx/cisd/openbis/generic/shared/api/v1/**/*.class"
include "ch/systemsx/cisd/common/**/*.class"
include "ch/systemsx/cisd/openbis/common/**/*.class"
}
from zipTree(configurations.api_partial.files.iterator().next()).matching {
include '**/com/google/gwt/user/client/rpc/IsSerializable.class'
include '**/com/google/gwt/user/client/rpc/SerializableException.class'
}
manifest {
attributes("Main-Class": "ch.systemsx.cisd.openbis.plugin.screening.client.api.v1.ScreeningClientApiTest",
"Version": versionNumber,
"Build-Number": "${versionNumber} (r${revisionNumber},${cleanFlag})",
"Class-Path": "spring-ext.jar")
}
}
screeningApiSources = fileTree('.').matching {
include "OpenBISScreeningML.java"
include "ch/systemsx/cisd/openbis/plugin/screening/client/api/v1/**/*.java"
include "ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/dto/**/*.java"
}
allScreeningApiSources = project(':openbis').commonApiSources.plus(
project(':openbis').openBisApiApiSources.plus(
project(':openbis').openbisCommonApiSources.plus(
project(':openbis').openbisApiSources.plus(
screeningApiSources))))
task screeningApiSourcesZip(type: Zip) {
archiveName 'openbis_screening_api_source.zip'
from allScreeningApiSources
}
configurations.create('javadoc')
dependencies {
javadoc 'springframework:spring-tx:+'
}
task screeningApiJavaDoc(type: Javadoc) {
source allScreeningApiSources.matching{
include "**/*.java"
}
classpath = sourceSets.main.output + sourceSets.main.compileClasspath + configurations.javadoc
}
task screeningApiJavaDocZip(type: Zip) {
archiveName 'openbis_screening_api_javadoc.zip'
from screeningApiJavaDoc.destinationDir
}
screeningApiJavaDocZip.dependsOn screeningApiJavaDoc
build.dependsOn screeningApiJar
build.dependsOn screeningApiSourcesZip
build.dependsOn screeningApiJavaDocZip
configurations.create('batteries')
dependencies {
batteries 'cisd:cisd-base:+',
'apache:commons-httpclient:+',
'apache:log4j:+',
'springframework:spring-aop:+',
'springframework:spring-web:+',
'springframework:spring-tx:+',
'marathon:marathon-spring-util:+',
'cisd:cisd-args4j:+',
'python:jython:+'
}
task springExt(type: Jar) {
archiveName 'spring-ext.jar'
for (File f : configurations.batteries.files) {
from zipTree(f).matching {
include '**/**'
}
}
}
build.dependsOn springExt
task screeningApiBatteriesIncluded(type: Jar) {
archiveName 'openbis_screening_api-batteries_included.jar'
from zipTree(springExt.archivePath)
from zipTree(screeningApiJar.archivePath)
}
screeningApiBatteriesIncluded.dependsOn screeningApiJar
screeningApiBatteriesIncluded.dependsOn springExt
build.dependsOn screeningApiBatteriesIncluded
task screeningApiZip(type: Zip) {
baseName 'openBIS-screening-API'
from screeningApiJar.archivePath
from springExt.archivePath
from screeningApiBatteriesIncluded.archivePath
from screeningApiSourcesZip.archivePath
from screeningApiJavaDocZip.archivePath
from fileTree('./dist/api/')
}
screeningApiZip.dependsOn screeningApiBatteriesIncluded
build.dependsOn screeningApiZip
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