Commit 31add15c authored by Lukas Marik's avatar Lukas Marik

#782 create output directory with release and debug .app, prepare debug and release icons

parent adc65cad
......@@ -286,7 +286,7 @@ task debugExe(dependsOn: debugJar, type: SetupExeTask) {
macAppBundle {
mainClassName = project.mainLauncherClassName
icon = '../ios/data/Tablexia_Icon_release.icns'
icon = project.projectDir.absolutePath + '/assets/icons/Tablexia_Icon_release.icns'
bundleJRE = true
appName = 'Tablexia'
}
......@@ -298,27 +298,28 @@ task debugMac(dependsOn: createApp){
}
task releaseMac(dependsOn: createApp){
/*doLast{
logger.lifecycle("COPY JAR TO MAC")
project.copy {
from project.buildDir.absolutePath + '/libs/' + project.tablexiaAppName + '-' + 'debug' + '-' + project.tablexiaVersionName + '.jar'
into project.buildDir.absolutePath + '/macApp/Tablexia.app/Contents/Java'
}
}*/
doLast{
setupMacApp('release')
}
}
def setupMacApp(String buildType){
def outputDit = new File(project.buildDir.absolutePath + '/outputApp')
if(!outputDit.exists()) outputDit.mkdir()
def appFolderName = project.tablexiaAppName + '-' + buildType + '-' + project.tablexiaVersionName + '.app'
logger.lifecycle("COPY JAR TO MAC")
// create output directory
def outputDir = new File(project.buildDir.absolutePath + '/outputApp')
if(!outputDir.exists()) outputDir.mkdir()
// copy default app to output app build directory
project.copy {
from project.buildDir.absolutePath + '/macApp/Tablexia.app'
into project.buildDir.absolutePath + '/outputApp/' + appFolderName
}
// copy jar file to app
project.copy {
from project.buildDir.absolutePath + '/libs/' + project.tablexiaAppName + '-' + buildType + '-' + project.tablexiaVersionName + '.jar'
into project.buildDir.absolutePath + '/macApp/Tablexia.app/Contents/Java'
into project.buildDir.absolutePath+ '/outputApp/' + appFolderName + '/Contents/Java'
}
}
......@@ -338,7 +339,7 @@ iTestJar.dependsOn classes
iTestJar.dependsOn iTestClasses
iTestJar.dependsOn(':util:checksum:runChecksum')
assemble.dependsOn([handleJreTask, debugJar, /*debugExe,*/ debugMac, releaseJar,/* releaseExe,*/ releaseMac, iTestJar])
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