getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
getdownLauncher = jalviewDir + '/' + getdown_launcher
- getdownFilesDir = jalviewDir + '/' + getdown_files_dir
+ getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
getdownLib1 = jalviewDir + '/' + getdown_lib1
def getdownChannel = getdown_channel_name
if (getdown_channel_name.equals("COMMIT")) {
}
}
+ // NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
+ /*
if (JAVA_VERSION.equals("11")) {
def j11libFiles = fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"]).getFiles()
j11libFiles.sort().each{f ->
}
}
}
+ */
- getdownTextString += "code = " + file(getdownLauncher).getName() + "\n"
+ //moved getdown_launcher into dist
+ //getdownTextString += "code = " + packageDir + '/' + file(getdownLauncher).getName() + "\n"
getdownTextString += "class = " + mainClass + "\n"
def getdown_txt = file(project.ext.getdownWebsiteDir + "/getdown.txt")
copy {
from getdownLauncher
- into project.ext.getdownWebsiteDir
- }
-
- copy {
- from getdownLauncher
- into project.ext.getdownFilesDir
- }
-
- copy {
- from getdownLib1
- into project.ext.getdownFilesDir
+ into project.ext.getdownFilesDir + '/' + packageDir
}
copy {
from getdownLib1
- into project.ext.getdownWebsiteDir
+ into project.ext.getdownFilesDir + '/' + packageDir
}
copy {
include install4jTemplate
rename (install4jTemplate, install4jConfFile)
filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['9999999999': JAVA_VERSION])
- filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
+ filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['JAVA_VERSION': JAVA_VERSION, 'VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
}
into install4jDir
inputs.files("$install4jDir/$install4jTemplate")