Commit 72a09d71 authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko

Merge branch 'feature-build-params' into 'V3.7'

Build desktop params

See merge request !758
parents f1e0116f 69dff9ed
...@@ -47,7 +47,7 @@ release-debug: ...@@ -47,7 +47,7 @@ release-debug:
only: only:
- tags - tags
script: script:
- ./gradlew clean assemble -PTABLEXIA_ASSETS_UPLOAD=true -PTABLEXIA_HD_ASSETS=true - ./gradlew clean assemble -PTABLEXIA_ASSETS_UPLOAD=true -PTABLEXIA_HD_ASSETS=true -PTABLEXIA_DESKTOP_ARTEFACTS=true
artifacts: artifacts:
paths: paths:
- android/build/outputs/apk/*debug*.apk - android/build/outputs/apk/*debug*.apk
...@@ -64,7 +64,7 @@ release: ...@@ -64,7 +64,7 @@ release:
only: only:
- tags - tags
script: script:
- ./gradlew clean assemble -PTABLEXIA_ASSETS_UPLOAD=true -PTABLEXIA_HD_ASSETS=true -PTABLEXIA_RELEASE_BUILD=true -PTABLEXIA_ASSETS_OPTIMIZE=true - ./gradlew clean assemble -PTABLEXIA_ASSETS_UPLOAD=true -PTABLEXIA_HD_ASSETS=true -PTABLEXIA_RELEASE_BUILD=true -PTABLEXIA_ASSETS_OPTIMIZE=true -PTABLEXIA_DESKTOP_ARTEFACTS=true
artifacts: artifacts:
paths: paths:
- android/build/outputs/apk/*release*.apk - android/build/outputs/apk/*release*.apk
......
...@@ -567,8 +567,12 @@ task cleanMacAppDir(dependsOn: [debugMac, releaseMac]) { ...@@ -567,8 +567,12 @@ task cleanMacAppDir(dependsOn: [debugMac, releaseMac]) {
} }
} }
if (project.hasProperty('TABLEXIA_DESKTOP_ARTEFACTS') && Boolean.valueOf(project.property('TABLEXIA_DESKTOP_ARTEFACTS')).booleanValue()) {
assemble.dependsOn([debugJar, debugDeb, debugExe, debugMac, releaseJar, releaseDeb, releaseExe, releaseMac, iTestJar, cleanMacAppDir]) assemble.dependsOn([debugJar, debugDeb, debugExe, debugMac, releaseJar, releaseDeb, releaseExe, releaseMac, iTestJar, cleanMacAppDir])
}
else {
assemble.dependsOn([debugJar, releaseJar, iTestJar])
}
jar.enabled = false jar.enabled = false
eclipse { 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