diff --git a/build/tools/NSIS-upgrade.md b/build/tools/NSIS-upgrade.md index 8d77d7fa6b4f..b49aa630d5ef 100644 --- a/build/tools/NSIS-upgrade.md +++ b/build/tools/NSIS-upgrade.md @@ -6,8 +6,8 @@ compile the latter, and pack both together. **Note**: please make sure all archi ##### [Building](https://documentation.help/NSIS/SectionG.3.html) NSIS compiler on Linux 1. Install [SCons](https://scons.org) (standalone package is enough). -1. Unpack NSIS source archive and `cd` into that directory. -1. Build: +2. Unpack NSIS source archive and `cd` into that directory. +3. Build: ``` scons \ SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all NSIS_CONFIG_CONST_DATA_PATH=no NSIS_MAX_STRLEN=8192 PREFIX=. \ @@ -18,16 +18,16 @@ compile the latter, and pack both together. **Note**: please make sure all archi ##### Preparing the combined archive 1. [Download](https://sourceforge.net/projects/nsis/files/) and unpack zipped NSIS installation. -1. Rename NSIS top-level directory into 'NSIS' and drop unneeded stuff ('Docs', 'Examples', 'makensisw.exe', 'NSIS.*', 'Plugins/x86-ansi'). -1. Download "strlen_8192" archive and unpack it into the 'NSIS' directory (overwrite existing files). -1. Copy compiled Linux binary into 'NSIS/Bin' directory. -1. From the old NSIS.zip archive, copy the following files into corresponding subdirectories of the 'NSIS' directory: +2. Rename NSIS top-level directory into 'NSIS' and drop unneeded stuff ('Docs', 'Examples', 'makensisw.exe', 'NSIS.*', 'Plugins/x86-ansi'). +3. Download "strlen_8192" archive and unpack it into the 'NSIS' directory (overwrite existing files). +4. Copy compiled Linux binary into 'NSIS/Bin' directory. +5. From the old NSIS.zip archive, copy the following files into corresponding subdirectories of the 'NSIS' directory: - 'Include/UAC.nsh' - 'Plugins/x86-unicode/AccessControl.dll' - 'Plugins/x86-unicode/ExecDos.dll' - 'Plugins/x86-unicode/INetC.dll' - 'Plugins/x86-unicode/ShellLink.dll' - 'Plugins/x86-unicode/UAC.dll' -1. Zip the 'NSIS' directory. -1. Upload to https://jetbrains.team/p/ij/packages/files/intellij-build-dependencies/org/jetbrains/intellij/deps/nsis/. -1. Update the version of 'nsisBuild' in community/build/dependencies/dependencies.properties. +6. Zip the 'NSIS' directory. +7. Upload to https://jetbrains.team/p/ij/packages/files/intellij-build-dependencies/org/jetbrains/intellij/deps/nsis/. +8. Update the version of 'nsisBuild' in community/build/dependencies/dependencies.properties. diff --git a/build/tools/minimize.vbs b/build/tools/minimize.vbs deleted file mode 100644 index dcf3406fb584..000000000000 --- a/build/tools/minimize.vbs +++ /dev/null @@ -1 +0,0 @@ -Dim Shell : Set Shell = CreateObject("Shell.Application") : Shell.MinimizeAll \ No newline at end of file diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationManagerEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationManagerEx.java index 359911723e6b..0c8878eaa9b5 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationManagerEx.java +++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationManagerEx.java @@ -1,8 +1,7 @@ -// Copyright 2000-2021 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-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.openapi.application.ex; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.util.SystemProperties; import com.intellij.util.indexing.impl.IndexDebugProperties; import org.jetbrains.annotations.TestOnly; @@ -20,7 +19,7 @@ public final class ApplicationManagerEx extends ApplicationManager { } public static boolean isInIntegrationTest() { - return SystemProperties.getBooleanProperty("idea.is.integration.test", false); + return Boolean.getBoolean("idea.is.integration.test"); } @TestOnly @@ -28,4 +27,4 @@ public final class ApplicationManagerEx extends ApplicationManager { inStressTest = value; IndexDebugProperties.IS_IN_STRESS_TESTS = value; } -} \ No newline at end of file +} diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshSessionImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshSessionImpl.java index 1078af908ee7..03133a063362 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshSessionImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/RefreshSessionImpl.java @@ -121,7 +121,7 @@ final class RefreshSessionImpl extends RefreshSession { if (myWorkQueue.isEmpty()) return; var workQueue = myWorkQueue; myWorkQueue = new ArrayList<>(); - var forceRefresh = !myIsRecursive && !myIsAsync; // shallow sync refresh (e.g. project config files on open) + var forceRefresh = !myIsRecursive && !myIsAsync; // shallow sync refresh (e.g., project config files on open) var fs = LocalFileSystem.getInstance(); if (!forceRefresh && fs instanceof LocalFileSystemImpl) { diff --git a/platform/util/src/com/intellij/util/io/Compressor.java b/platform/util/src/com/intellij/util/io/Compressor.java index 998c98c6c028..16f9606b86f4 100644 --- a/platform/util/src/com/intellij/util/io/Compressor.java +++ b/platform/util/src/com/intellij/util/io/Compressor.java @@ -191,7 +191,7 @@ public abstract class Compressor implements Closeable { /** * Filtering entries being added to the archive. * Please note that the second parameter of a filter ({@code Path}) might be {@code null} when it is applied - * to an entry not present on a disk - e.g. via {@link #addFile(String, byte[])}. + * to an entry not present on a disk - e.g., via {@link #addFile(String, byte[])}. */ public Compressor filter(@Nullable BiPredicate filter) { myFilter = filter; @@ -264,8 +264,8 @@ public abstract class Compressor implements Closeable { } public final void addDirectory(@NotNull String prefix, @NotNull Path directory, long timestampInMillis) throws IOException { - String entryName = prefix.isEmpty() ? "" : entryName(prefix); - addRecursively(entryName, directory, timestampInMillis); + prefix = prefix.isEmpty() ? "" : entryName(prefix); + addRecursively(prefix, directory, timestampInMillis); } //