Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean up and complete gradle script

Browse source
This commit is contained in:
Gabriel Calero 2018-06-20 11:32:03 -03:00
parent 730e14c9d9
commit d5e2362ee2
2 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/build.gradle
View file

@ -48,8 +48,8 @@ android {
buildTypes { buildTypes {
debug { debug {
buildConfigField "String", "BACKTRACE_URL", "\"https://gcalero999.sp.backtrace.io:6098\"" buildConfigField "String", "BACKTRACE_URL", "\"" + (System.getenv("CMAKE_BACKTRACE_URL") ? System.getenv("CMAKE_BACKTRACE_URL") : '') + "\""
buildConfigField "String", "BACKTRACE_TOKEN", "\"4ff1f957cd6c357e6e5d5b2fe076f9ca46379a19b7d6baea1707cefb70e7ed15\"" buildConfigField "String", "BACKTRACE_TOKEN", "\"" + (System.getenv("CMAKE_BACKTRACE_TOKEN") ? System.getenv("CMAKE_BACKTRACE_TOKEN") : '') + "\""
} }
release { release {
minifyEnabled false minifyEnabled false
@ -76,9 +76,7 @@ android {
variant.mergeResources.dependsOn(task) variant.mergeResources.dependsOn(task)
def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first() def uploadDumpSymsTask = rootProject.getTasksByName("uploadBreakpadDumpSyms${variant.name.capitalize()}", false).first()
def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first() def runDumpSymsTask = rootProject.getTasksByName("runBreakpadDumpSyms${variant.name.capitalize()}", false).first()
println (runDumpSymsTask.name + " dependsOn " + task.name)
runDumpSymsTask.dependsOn(task) runDumpSymsTask.dependsOn(task)
println (variant.assemble.name + " dependsOn " + uploadDumpSymsTask.name)
variant.assemble.dependsOn(uploadDumpSymsTask) variant.assemble.dependsOn(uploadDumpSymsTask)
} }

68
android/build.gradle
View file

@ -556,8 +556,9 @@ def runBreakpadDumpSyms = { buildType ->
def objDir = new File("${appDir}/build/intermediates/cmake/${buildType}/obj/arm64-v8a") def objDir = new File("${appDir}/build/intermediates/cmake/${buildType}/obj/arm64-v8a")
def stripDebugSymbol = "${appDir}/build/intermediates/transforms/stripDebugSymbol/${buildType}/0/lib/arm64-v8a/" def stripDebugSymbol = "${appDir}/build/intermediates/transforms/stripDebugSymbol/${buildType}/0/lib/arm64-v8a/"
if (!breakpadDumpSymsDir.exists()) { def outputDir = new File(breakpadDumpSymsDir, buildType)
breakpadDumpSymsDir.mkdirs() if (!outputDir.exists()) {
outputDir.mkdirs()
} }
objDir.eachFileRecurse (FileType.FILES) { file -> objDir.eachFileRecurse (FileType.FILES) { file ->
@ -567,65 +568,76 @@ def runBreakpadDumpSyms = { buildType ->
file.toString(), file.toString(),
stripDebugSymbol stripDebugSymbol
] ]
println ("Running dump_syms with arguments " + cmdArgs)
def result = exec { def result = exec {
workingDir HIFI_ANDROID_PRECOMPILED + '/breakpad/bin' workingDir HIFI_ANDROID_PRECOMPILED + '/breakpad/bin'
commandLine './dump_syms' commandLine './dump_syms'
args cmdArgs args cmdArgs
ignoreExitValue true ignoreExitValue true
standardOutput = new BufferedOutputStream(new FileOutputStream(new File(breakpadDumpSymsDir, output))) standardOutput = new BufferedOutputStream(new FileOutputStream(new File(outputDir, output)))
} }
} }
} }
} }
task runBreakpadDumpSymsRelease() {
doLast {
runBreakpadDumpSyms("release");
}
}
task runBreakpadDumpSymsDebug() { task runBreakpadDumpSymsDebug() {
doLast { doLast {
runBreakpadDumpSyms("debug"); runBreakpadDumpSyms("debug");
} }
} }
task zipDumpSymsDebug(type: Zip, dependsOn: runBreakpadDumpSymsDebug) { task runBreakpadDumpSymsRelease() {
doFirst {
println ("Zipping " + breakpadDumpSymsDir.absolutePath + " into " + breakpadDumpSymsDir)
}
from (breakpadDumpSymsDir.absolutePath)
archiveName "symbols-${RELEASE_NUMBER}.zip"
destinationDir(new File("${appDir}/build/tmp/"))
doLast { doLast {
println ("Zipped " + breakpadDumpSymsDir.absolutePath + " into " + breakpadDumpSymsDir) runBreakpadDumpSyms("release");
} }
} }
task uploadBreakpadDumpSymsRelease(dependsOn: runBreakpadDumpSymsRelease) { task zipDumpSymsDebug(type: Zip, dependsOn: runBreakpadDumpSymsDebug) {
doLast { from (new File(breakpadDumpSymsDir, "debug").absolutePath)
//uploadDumpSyms("release") archiveName "symbols-${RELEASE_NUMBER}-debug.zip"
} destinationDir(new File("${appDir}/build/tmp/"))
}
task zipDumpSymsRelease(type: Zip, dependsOn: runBreakpadDumpSymsRelease) {
from (new File(breakpadDumpSymsDir, "release").absolutePath)
archiveName "symbols-${RELEASE_NUMBER}-release.zip"
destinationDir(new File("${appDir}/build/tmp/"))
} }
task uploadBreakpadDumpSymsDebug(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsDebug) { task uploadBreakpadDumpSymsDebug(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsDebug) {
onlyIf {
System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
}
config { config {
request.uri = 'https://gcalero998.sp.backtrace.io:6098' request.uri = System.getenv("CMAKE_BACKTRACE_URL")
} }
post { post {
request.uri.path = '/post' request.uri.path = '/post'
request.uri.query = [format: 'symbols', token: 'd65d0d184789ac40c121952001fd91dfba7e149899b1eeccd68ccffe91dd2fd0'] request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}.zip").bytes request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-debug.zip").bytes
request.contentType = 'application/octet-stream' request.contentType = 'application/octet-stream'
response.success { response.success {
println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}.zip uploaded") println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-debug.zip uploaded")
} }
} }
} }
task uploadBreakpadDumpSymsRelease(type:io.github.httpbuilderng.http.HttpTask, dependsOn: zipDumpSymsRelease) {
onlyIf {
System.getenv("CMAKE_BACKTRACE_URL") && System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")
}
config {
request.uri = System.getenv("CMAKE_BACKTRACE_URL")
}
post {
request.uri.path = '/post'
request.uri.query = [format: 'symbols', token: System.getenv("CMAKE_BACKTRACE_SYMBOLS_TOKEN")]
request.body = new File("${appDir}/build/tmp/", "symbols-${RELEASE_NUMBER}-release.zip").bytes
request.contentType = 'application/octet-stream'
response.success {
println ("${appDir}/build/tmp/symbols-${RELEASE_NUMBER}-release.zip uploaded")
}
}
}
// FIXME this code is prototyping the desired functionality for doing build time binary dependency resolution. // FIXME this code is prototyping the desired functionality for doing build time binary dependency resolution.
// See the comment on the qtBundle task above // See the comment on the qtBundle task above