GitOrigin-RevId: e6e189a8bd110d376606070bc96b9bd16c8e6b80
This commit is contained in:
Vladimir Krivosheev
2020-02-18 07:11:33 +01:00
committed by intellij-monorepo-bot
parent 2401432bd4
commit f2cb1ab9af
2 changed files with 3 additions and 5 deletions

View File

@@ -14,7 +14,7 @@ jbrTasks(jreBuild, jreVersion, targetOs, jrePrefix)
/**
* Update this method together with:
* `setupJdk.gradle`
* `setupJdk.gradle`
* `org/jetbrains/intellij/build/impl/BundledJreManager.groovy`
*/
static def splitJbrBuild(String jreBuild, String version) {
@@ -87,7 +87,7 @@ def downloadJbrTask(String artifactName, String build) {
def untarJbrTask(File downloadOutputs, String taskName) {
Task untar
if (OperatingSystem.current().isWindows()) {
// note: tarTree extracts symlinks as 0 length files which breaks osx distributions
// note: tarTree extracts symlinks as 0 length files which breaks osx distributions
untar = task("untar$taskName", type: Copy, dependsOn: "download$taskName") {
from tarTree(downloadOutputs)
into { "${downloadOutputs.parent}/${downloadOutputs.name - '.tar.gz'}/" }

View File

@@ -1,10 +1,9 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.images.index;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.indexing.*;
import com.intellij.util.io.DataExternalizer;
@@ -19,7 +18,6 @@ import org.jetbrains.annotations.Nullable;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.util.Map;
public final class ImageInfoIndex extends SingleEntryFileBasedIndexExtension<ImageInfo> {
private static final long ourMaxImageSize = (long)(Registry.get("ide.index.image.max.size").asDouble() * 1024 * 1024);