remove unnecessary underTeamCity and change to context.options.isInDevelopmentMode

This commit is contained in:
Aleksey Rostovskiy
2018-10-29 09:54:44 +03:00
parent 2640a796eb
commit 8911248ba0

View File

@@ -45,10 +45,8 @@ abstract class PyCharmPropertiesBase extends ProductProperties {
new PyPrebuiltIndicesGenerator().generateResources(context)
def underTeamCity = System.getProperty("teamcity.buildType.id") != null
context.ant.copy(todir: "$targetDirectory/index", failonerror: underTeamCity) {
fileset(dir: "$context.paths.temp/index", erroronmissingdir: underTeamCity) {
context.ant.copy(todir: "$targetDirectory/index", failonerror: !context.options.isInDevelopmentMode) {
fileset(dir: "$context.paths.temp/index", erroronmissingdir: !context.options.isInDevelopmentMode) {
include(name: "**")
}
}
@@ -68,13 +66,11 @@ class PyPrebuiltIndicesGenerator implements ResourcesGenerator {
def zipPath = "$context.paths.temp/zips"
def underTeamCity = System.getProperty("teamcity.buildType.id") != null
context.ant.copy(todir: "$zipPath", failonerror: underTeamCity) {
fileset(dir: "$context.paths.projectHome/python-distributions", erroronmissingdir: underTeamCity) {
context.ant.copy(todir: "$zipPath", failonerror: !context.options.isInDevelopmentMode) {
fileset(dir: "$context.paths.projectHome/python-distributions", erroronmissingdir: !context.options.isInDevelopmentMode) {
include(name: "*.zip")
}
fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: underTeamCity) {
fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: !context.options.isInDevelopmentMode) {
include(name: "*.zip")
}
}