From e5bb1f3f286cb97efde638fb81ae7500d096ba02 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 27 Nov 2018 11:48:04 +0100 Subject: [PATCH] IDEA-CR-40529 remove unnecessary icon-robots.txt --- java/openapi/compatibilityResources/icon-robots.txt | 1 - .../jetbrains/intellij/build/images/ImageCollector.kt | 9 +++++++++ .../compatibilityResources/icon-robots.txt | 1 - platform/icons/compatibilityResources/icon-robots.txt | 1 - .../impl/compatibilityResources/icon-robots.txt | 1 - .../compatibilityResources/icon-robots.txt | 1 - plugins/ant/compatibilityResources/icon-robots.txt | 1 - .../editorconfig/compatibilityResources/icon-robots.txt | 1 - plugins/git4idea/compatibilityResources/icon-robots.txt | 1 - .../groovy-psi/compatibilityResources/icon-robots.txt | 1 - .../src/main/compatibilityResources/icon-robots.txt | 1 - .../compatibilityResources/icon-robots.txt | 1 - plugins/testng/compatibilityResources/icon-robots.txt | 1 - .../xpath-lang/compatibilityResources/icon-robots.txt | 1 - .../xslt-debugger/compatibilityResources/icon-robots.txt | 1 - spellchecker/compatibilityResources/icon-robots.txt | 1 - 16 files changed, 9 insertions(+), 15 deletions(-) delete mode 100644 java/openapi/compatibilityResources/icon-robots.txt delete mode 100644 platform/external-system-impl/compatibilityResources/icon-robots.txt delete mode 100644 platform/icons/compatibilityResources/icon-robots.txt delete mode 100644 platform/remote-servers/impl/compatibilityResources/icon-robots.txt delete mode 100644 platform/tasks-platform-impl/compatibilityResources/icon-robots.txt delete mode 100644 plugins/ant/compatibilityResources/icon-robots.txt delete mode 100644 plugins/editorconfig/compatibilityResources/icon-robots.txt delete mode 100644 plugins/git4idea/compatibilityResources/icon-robots.txt delete mode 100644 plugins/groovy/groovy-psi/compatibilityResources/icon-robots.txt delete mode 100644 plugins/maven/src/main/compatibilityResources/icon-robots.txt delete mode 100644 plugins/properties/properties-psi-api/compatibilityResources/icon-robots.txt delete mode 100644 plugins/testng/compatibilityResources/icon-robots.txt delete mode 100644 plugins/xpath/xpath-lang/compatibilityResources/icon-robots.txt delete mode 100644 plugins/xslt-debugger/compatibilityResources/icon-robots.txt delete mode 100644 spellchecker/compatibilityResources/icon-robots.txt diff --git a/java/openapi/compatibilityResources/icon-robots.txt b/java/openapi/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/java/openapi/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/ImageCollector.kt b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/ImageCollector.kt index b11d9fd5bc70..4ca88c16327c 100644 --- a/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/ImageCollector.kt +++ b/platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/ImageCollector.kt @@ -4,6 +4,7 @@ package org.jetbrains.intellij.build.images import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtilRt import com.intellij.openapi.util.text.StringUtil +import com.intellij.util.SystemProperties import com.intellij.util.containers.ContainerUtil import org.jetbrains.jps.model.java.JavaResourceRootType import org.jetbrains.jps.model.module.JpsModule @@ -77,6 +78,14 @@ internal class ImageCollector(private val projectHome: Path, private val iconsOn if (rootDir.fileName.toString() != "compatibilityResources") { processRoot(sourceRoot, rootDir) } + else if (SystemProperties.getBooleanProperty("remove.extra.icon.robots.files", false)) { + // under flag because not required for regular usage (to avoid FS call) + try { + Files.delete(rootDir.resolve("icon-robots.txt")) + } + catch (ignored: NoSuchFileException) { + } + } } } diff --git a/platform/external-system-impl/compatibilityResources/icon-robots.txt b/platform/external-system-impl/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/platform/external-system-impl/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/platform/icons/compatibilityResources/icon-robots.txt b/platform/icons/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/platform/icons/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/platform/remote-servers/impl/compatibilityResources/icon-robots.txt b/platform/remote-servers/impl/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/platform/remote-servers/impl/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/platform/tasks-platform-impl/compatibilityResources/icon-robots.txt b/platform/tasks-platform-impl/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/platform/tasks-platform-impl/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/ant/compatibilityResources/icon-robots.txt b/plugins/ant/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/ant/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/editorconfig/compatibilityResources/icon-robots.txt b/plugins/editorconfig/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/editorconfig/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/git4idea/compatibilityResources/icon-robots.txt b/plugins/git4idea/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/git4idea/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/groovy/groovy-psi/compatibilityResources/icon-robots.txt b/plugins/groovy/groovy-psi/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/groovy/groovy-psi/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/maven/src/main/compatibilityResources/icon-robots.txt b/plugins/maven/src/main/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/maven/src/main/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/properties/properties-psi-api/compatibilityResources/icon-robots.txt b/plugins/properties/properties-psi-api/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/properties/properties-psi-api/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/testng/compatibilityResources/icon-robots.txt b/plugins/testng/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/testng/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/xpath/xpath-lang/compatibilityResources/icon-robots.txt b/plugins/xpath/xpath-lang/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/xpath/xpath-lang/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/plugins/xslt-debugger/compatibilityResources/icon-robots.txt b/plugins/xslt-debugger/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/plugins/xslt-debugger/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file diff --git a/spellchecker/compatibilityResources/icon-robots.txt b/spellchecker/compatibilityResources/icon-robots.txt deleted file mode 100644 index 62421f433af6..000000000000 --- a/spellchecker/compatibilityResources/icon-robots.txt +++ /dev/null @@ -1 +0,0 @@ -skip: /**/* \ No newline at end of file