MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail local build on missing indices and skeletons (PY-26650)

Browse Source
This commit is contained in:
Dmitry Trofimov
2017-11-18 22:34:59 +01:00
parent c5f79ef3b2
commit 65072d3d75
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmMacDistributionCustomizer.groovy
+4 -2
View File
@@ -25,8 +25,10 @@ import org.jetbrains.intellij.build.MacDistributionCustomizer
class PyCharmMacDistributionCustomizer extends MacDistributionCustomizer {
@Override
void copyAdditionalFiles(BuildContext context, String targetDirectory) {
context.ant.copy(todir: "$targetDirectory/skeletons") {
fileset(dir: "$context.paths.projectHome/skeletons") {
def underTeamCity = System.getProperty("teamcity.buildType.id") != null
context.ant.copy(todir: "$targetDirectory/skeletons", failonerror: underTeamCity) {
fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: underTeamCity) {
include(name: "skeletons-mac*.zip")
}
}
python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.groovy
+9 -5
View File
@@ -45,8 +45,10 @@ abstract class PyCharmPropertiesBase extends ProductProperties {
new PyPrebuiltIndicesGenerator().generateResources(context)
context.ant.copy(todir: "$targetDirectory/index", failonerror: true) {
fileset(dir: "$context.paths.temp/index", erroronmissingdir: true) {
def underTeamCity = System.getProperty("teamcity.buildType.id") != null
context.ant.copy(todir: "$targetDirectory/index", failonerror: underTeamCity) {
fileset(dir: "$context.paths.temp/index", erroronmissingdir: underTeamCity) {
include(name: "**")
}
}
@@ -66,11 +68,13 @@ class PyPrebuiltIndicesGenerator implements ResourcesGenerator {
def zipPath = "$context.paths.temp/zips"
context.ant.copy(todir: "$zipPath", failonerror: true) {
fileset(dir: "$context.paths.projectHome/python-distributions", erroronmissingdir: true) {
def underTeamCity = System.getProperty("teamcity.buildType.id") != null
context.ant.copy(todir: "$zipPath", failonerror: underTeamCity) {
fileset(dir: "$context.paths.projectHome/python-distributions", erroronmissingdir: underTeamCity) {
include(name: "*.zip")
}
fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: true) {
fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: underTeamCity) {
include(name: "*.zip")
}
}
python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmWindowsDistributionCustomizer.groovy
+4 -2
View File
@@ -24,8 +24,10 @@ import org.jetbrains.intellij.build.WindowsDistributionCustomizer
class PyCharmWindowsDistributionCustomizer extends WindowsDistributionCustomizer {
@Override
void copyAdditionalFiles(BuildContext context, String targetDirectory) {
context.ant.copy(todir: "$targetDirectory/skeletons") {
fileset(dir: "$context.paths.projectHome/skeletons") {
def underTeamCity = System.getProperty("teamcity.buildType.id") != null
context.ant.copy(todir: "$targetDirectory/skeletons", failonerror: underTeamCity) {
fileset(dir: "$context.paths.projectHome/skeletons", erroronmissingdir: underTeamCity) {
include(name: "skeletons-win*.zip")
}
}