git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
[jalview.git]
/
build.gradle
diff --git
a/build.gradle
b/build.gradle
index
72baea1
..
789aaea
100644
(file)
--- a/
build.gradle
+++ b/
build.gradle
@@
-111,7
+111,7
@@
ext {
}
////
// Set JALVIEW_VERSION if it is not already set
}
////
// Set JALVIEW_VERSION if it is not already set
- if (findProperty(JALVIEW_VERSION)==null || "".equals(JALVIEW_VERSION)) {
+ if (findProperty("JALVIEW_VERSION")==null || "".equals(JALVIEW_VERSION)) {
JALVIEW_VERSION = releaseProps.get("jalview.version")
}
JALVIEW_VERSION = releaseProps.get("jalview.version")
}
@@
-1093,9
+1093,10
@@
task copyDocs(type: Copy) {
def inputDir = "${jalviewDir}/${doc_dir}"
def outputDir = "${docBuildDir}/${doc_dir}"
from(inputDir) {
def inputDir = "${jalviewDir}/${doc_dir}"
def outputDir = "${docBuildDir}/${doc_dir}"
from(inputDir) {
- exclude '**/*.gif'
- exclude '**/*.jpg'
- exclude '**/*.png'
+ include('**/*.txt')
+ include('**/*.md')
+ include('**/*.html')
+ include('**/*.xml')
filter(ReplaceTokens,
beginToken: '$$',
endToken: '$$',
filter(ReplaceTokens,
beginToken: '$$',
endToken: '$$',
@@
-1106,14
+1107,14
@@
task copyDocs(type: Copy) {
)
}
from(inputDir) {
)
}
from(inputDir) {
- include '**/*.gif'
- include '**/*.jpg'
- include '**/*.png'
+ exclude('**/*.txt')
+ exclude('**/*.md')
+ exclude('**/*.html')
+ exclude('**/*.xml')
}
into outputDir
inputs.dir(inputDir)
}
into outputDir
inputs.dir(inputDir)
- outputs.files(helpFile)
outputs.dir(outputDir)
}
outputs.dir(outputDir)
}
@@
-1143,9
+1144,12
@@
task copyHelp(type: Copy) {
def inputDir = helpSourceDir
def outputDir = "${helpBuildDir}/${help_dir}"
from(inputDir) {
def inputDir = helpSourceDir
def outputDir = "${helpBuildDir}/${help_dir}"
from(inputDir) {
- exclude '**/*.gif'
- exclude '**/*.jpg'
- exclude '**/*.png'
+ include('**/*.txt')
+ include('**/*.md')
+ include('**/*.html')
+ include('**/*.hs')
+ include('**/*.xml')
+ include('**/*.jhm')
filter(ReplaceTokens,
beginToken: '$$',
endToken: '$$',
filter(ReplaceTokens,
beginToken: '$$',
endToken: '$$',
@@
-1156,9
+1160,12
@@
task copyHelp(type: Copy) {
)
}
from(inputDir) {
)
}
from(inputDir) {
- include '**/*.gif'
- include '**/*.jpg'
- include '**/*.png'
+ exclude('**/*.txt')
+ exclude('**/*.md')
+ exclude('**/*.html')
+ exclude('**/*.hs')
+ exclude('**/*.xml')
+ exclude('**/*.jhm')
}
into outputDir
}
into outputDir
@@
-1172,9
+1179,10
@@
task copyResources(type: Copy) {
def inputDir = resourceDir
def outputDir = resourcesBuildDir
from(inputDir) {
def inputDir = resourceDir
def outputDir = resourcesBuildDir
from(inputDir) {
- exclude '**/*.gif'
- exclude '**/*.jpg'
- exclude '**/*.png'
+ include('**/*.txt')
+ include('**/*.md')
+ include('**/*.html')
+ include('**/*.xml')
filter(ReplaceTokens,
beginToken: '$$',
endToken: '$$',
filter(ReplaceTokens,
beginToken: '$$',
endToken: '$$',
@@
-1185,9
+1193,10
@@
task copyResources(type: Copy) {
)
}
from(inputDir) {
)
}
from(inputDir) {
- include '**/*.gif'
- include '**/*.jpg'
- include '**/*.png'
+ exclude('**/*.txt')
+ exclude('**/*.md')
+ exclude('**/*.html')
+ exclude('**/*.xml')
}
into outputDir
}
into outputDir