More build fixes

This commit is contained in:
Georgy Litvinov 2020-11-25 13:54:28 +01:00
parent 0510ea8601
commit 0d0432d8d8

View file

@ -29,7 +29,6 @@ dependencies{
bundledLibs group: 'org.apache.jena', name: 'jena-arq', version: '3.15.0'
bundledLibs group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
bundledLibs group: 'com.opencsv', name: 'opencsv', version: '5.1'
bundledLibs files('idl')
configurations.compile.extendsFrom(configurations.bundledLibs)
}
jar {
@ -72,6 +71,7 @@ task xhtml(type: Jar) {
}
}
from sourceSets.main.output
exclude '.gradle'
exclude '**/*Test.class'
exclude '**/AllTests.class'
exclude '**/*.java'
@ -107,6 +107,15 @@ task xhtml2(type: Jar) {
baseName = "writer2phtml"
from {
configurations.bundledLibs.collect {
exclude 'module-info.class'
exclude '.gradle'
exclude '**/LICENSE*'
exclude '**/DEPENDENCIES'
exclude '**/NOTICE*'
exclude '**/pom.xml'
exclude 'steps.txt'
exclude 'META-INF/services'
it.isDirectory() ? it : zipTree(it)
}
}
@ -114,13 +123,13 @@ task xhtml2(type: Jar) {
exclude '**/*Test.class'
exclude '**/AllTests.class'
exclude '**/*.java'
include '**/*.classes'
include 'etc/*'
include 'com/*'
include 'com/**'
include 'com/**/*'
include 'w2phtml/pageSplitters/**/*.class'
include 'pro/litvinovg/**/*.class'
include 'pro/litvinovg/**/*.png'
include 'pro/litvinovg/**/*.classes'
include 'w2phtml/api/**/*.class'
include 'w2phtml/*.class'
include 'w2phtml/*.properties'
@ -132,20 +141,24 @@ task xhtml2(type: Jar) {
include 'w2phtml/xhtml/**/*.class'
include 'w2phtml/xhtml/**/*.xml'
include 'w2phtml/xmerge/**/*.class'
}
from ('src/main/java'){
include 'w2phtml/xhtml/**/*.properties'
include 'w2phtml/xhtml/**/**/*.properties'
exclude 'w2phtml/project.properties'
}
from (sourceSets.main.output){
include 'org/**/*'
include 'net/**/*'
include 'logback.xml'
include 'ch/**/*'
include '**/*.properties'
exclude '.gradle'
}
from ('src/main/java'){
exclude '.gradle'
include 'w2phtml/xhtml/**/*.properties'
include 'w2phtml/xhtml/**/**/*.properties'
include 'pro/litvinovg/**/*.classes'
include 'logback.xml'
include '**/*.png'
exclude 'w2phtml/project.properties'
}
from('src/main/tmp') {
exclude '.gradle'
include 'w2phtml/project.properties'
}
}