Commit 3d32ac20 authored by Lukas Marik's avatar Lukas Marik

#782 prepare release and debug, add jar to app package by buildtype

parent 1fd77f30
......@@ -39,12 +39,6 @@ project.ext.mainLauncherClassName = "cz.nic.tablexia.desktop.DesktopLauncher"
project.ext.iTestLauncherClassName = "cz.nic.tablexia.desktop.DesktopITestLauncher"
project.ext.assetsDir = new File("../android/assets");
macAppBundle {
mainClassName = project.mainLauncherClassName
icon = '../ios/data/Tablexia_Icon_release.icns'
bundleJRE = true
}
task run(dependsOn: classes, type: JavaExec) {
main = project.mainLauncherClassName
classpath = sourceSets.main.runtimeClasspath
......@@ -289,6 +283,39 @@ task debugExe(dependsOn: debugJar, type: SetupExeTask) {
setBuildTypeInput('debug')
}
macAppBundle {
mainClassName = project.mainLauncherClassName
icon = '../ios/data/Tablexia_Icon_release.icns'
bundleJRE = true
}
task debugMac(dependsOn: debugJar){
createMacApp('debug','debugJar')
}
task releaseMac(dependsOn: releaseJar){
// createMacApp('release','releaseJar')
}
def createMacApp(String buildType, String jarTaskPath){
macAppBundle{
setAppName(project.tablexiaAppName + '-' + buildType + '-' + project.tablexiaVersionName)
setJarTask(jarTaskPath)
}
createApp
def outPutReleaseFile = new File(project.buildDir.absolutePath + "/outputsApp")
if(!outPutReleaseFile.exists()) outPutReleaseFile.mkdir()
copy {
from project.buildDir.absolutePath + '/macApp/' + project.tablexiaAppName + '-' + buildType + '-' + project.tablexiaVersionName
into outPutReleaseFile
}
}
debugJar.dependsOn classes
debugJar.dependsOn(':util:checksum:runChecksum')
debugExe.dependsOn handleJreTask
......@@ -303,7 +330,7 @@ iTestJar.dependsOn classes
iTestJar.dependsOn iTestClasses
iTestJar.dependsOn(':util:checksum:runChecksum')
assemble.dependsOn([handleJreTask, debugJar, debugExe, releaseJar, releaseExe, iTestJar, createApp])
assemble.dependsOn([handleJreTask, debugJar, /*debugExe,*/ debugMac, releaseJar, /*releaseExe,*/ releaseMac ,iTestJar])
jar.enabled = false
eclipse {
......
Markdown is supported
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