summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/conf/nsis/DeleteSettings.ini30
-rw-r--r--build/conf/nsis/UninstallOldVersions.ini114
-rw-r--r--build/conf/nsis/idea.nsi84
-rw-r--r--build/conf/nsis/idea_en.nsi11
-rw-r--r--build/scripts/common_tests.gant1
-rw-r--r--build/scripts/layouts.gant15
-rw-r--r--build/scripts/libLicenses.gant4
-rw-r--r--build/scripts/tests.gant1
-rw-r--r--build/scripts/utils.gant19
9 files changed, 143 insertions, 136 deletions
diff --git a/build/conf/nsis/DeleteSettings.ini b/build/conf/nsis/DeleteSettings.ini
index 2c93ebfede7e..c43b9124fd78 100644
--- a/build/conf/nsis/DeleteSettings.ini
+++ b/build/conf/nsis/DeleteSettings.ini
@@ -1,26 +1,40 @@
[Settings]
-NumFields=3
+NumFields=5
[Field 1]
Type=label
-Left=0
+Left=5
Right=-1
Top=0
-Bottom=40
+Bottom=10
[Field 2]
-Type=checkbox
+Type=label
Left=5
Right=-1
+Top=15
+Bottom=35
+
+[Field 3]
+Type=GroupBox
+Left=0
+Right=-1
Top=40
-Bottom=50
+Bottom=90
+
+[Field 4]
+Type=checkbox
+Left=5
+Right=-1
+Top=55
+Bottom=65
State=0
-[Field 3]
+[Field 5]
Type=checkbox
Left=5
Right=-1
-Top=60
-Bottom=70
+Top=70
+Bottom=80
State=0
diff --git a/build/conf/nsis/UninstallOldVersions.ini b/build/conf/nsis/UninstallOldVersions.ini
index 0a8f760498c6..f8444c383a8a 100644
--- a/build/conf/nsis/UninstallOldVersions.ini
+++ b/build/conf/nsis/UninstallOldVersions.ini
@@ -1,5 +1,5 @@
[Settings]
-NumFields=10
+NumFields=13
[Field 1]
Type=label
@@ -7,94 +7,112 @@ Text=List of JB products
Left=5
Right=-1
Top=0
-Bottom=15
+Bottom=10
[Field 2]
Type=checkbox
-Text=Uninstall old version
-Left=12
-Right=200
-Top=25
-Bottom=35
+Text=Uninstall silently (settings and configuration from old versions will not be deleted)
+Left=5
+Right=-1
+Top=123
+Bottom=133
State=0
-Flags=NOTIFY
[Field 3]
Type=checkbox
-Text=Quick uninstallation
+Text=An old installation
Left=12
-Right=200
-Top=123
-Bottom=133
+Right=-1
+Top=12
+Bottom=22
State=0
-Flags=DISABLED
[Field 4]
Type=checkbox
Text=An old installation
-Left=20
-Right=300
-Top=39
-Bottom=49
+Left=12
+Right=-1
+Top=22
+Bottom=32
State=0
-Flags=DISABLED
[Field 5]
Type=checkbox
Text=An old installation
-Left=20
-Right=300
-Top=51
-Bottom=61
+Left=12
+Right=-1
+Top=32
+Bottom=42
State=0
-Flags=DISABLED
[Field 6]
Type=checkbox
Text=An old installation
-Left=20
-Right=300
-Top=63
-Bottom=73
+Left=12
+Right=-1
+Top=42
+Bottom=52
State=0
-Flags=DISABLED
[Field 7]
Type=checkbox
Text=An old installation
-Left=20
-Right=300
-Top=75
-Bottom=85
+Left=12
+Right=-1
+Top=52
+Bottom=62
State=0
-Flags=DISABLED
[Field 8]
Type=checkbox
Text=An old installation
-Left=20
-Right=300
-Top=87
-Bottom=97
+Left=12
+Right=-1
+Top=62
+Bottom=72
State=0
-Flags=DISABLED
[Field 9]
Type=checkbox
Text=An old installation
-Left=20
-Right=300
-Top=99
-Bottom=109
+Left=12
+Right=-1
+Top=72
+Bottom=82
State=0
-Flags=DISABLED
[Field 10]
Type=checkbox
Text=An old installation
-Left=20
-Right=300
-Top=111
-Bottom=121
+Left=12
+Right=-1
+Top=82
+Bottom=92
+State=0
+
+[Field 11]
+Type=checkbox
+Text=An old installation
+Left=12
+Right=-1
+Top=92
+Bottom=102
+State=0
+
+[Field 12]
+Type=checkbox
+Text=An old installation
+Left=12
+Right=-1
+Top=102
+Bottom=112
+State=0
+
+[Field 13]
+Type=checkbox
+Text=An old installation
+Left=12
+Right=-1
+Top=112
+Bottom=122
State=0
-Flags=DISABLED \ No newline at end of file
diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index 5f31dc3c9f3f..e9f4b49f101c 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -342,7 +342,7 @@ FunctionEnd
!insertmacro MUI_PAGE_WELCOME
-Page custom uninstallOldVersionDialog leaveUninstallOldVersionDialog
+Page custom uninstallOldVersionDialog
Var control_fields
Var max_fields
@@ -367,7 +367,7 @@ Page custom ConfirmDesktopShortcut
!insertmacro MUI_PAGE_FINISH
!define MUI_UNINSTALLER
-!insertmacro MUI_UNPAGE_CONFIRM
+;!insertmacro MUI_UNPAGE_CONFIRM
UninstPage custom un.ConfirmDeleteSettings
!insertmacro MUI_UNPAGE_INSTFILES
@@ -473,10 +473,10 @@ remove_previous_installation:
CopyFiles "$3\bin\${PRODUCT_EXE_FILE}_copy" "$3\bin\${PRODUCT_EXE_FILE}"
Delete "$3\bin\${PRODUCT_EXE_FILE}_copy"
IfErrors 0 +3
- MessageBox MB_YESNOCANCEL|MB_ICONQUESTION|MB_TOPMOST "$(application_running)" IDYES remove_previous_installation IDNO complete
+ MessageBox MB_OKCANCEL|MB_ICONQUESTION|MB_TOPMOST "$(application_running)" IDOK remove_previous_installation IDCANCEL complete
goto complete
; uninstallation mode
- !insertmacro INSTALLOPTIONS_READ $9 "UninstallOldVersions.ini" "Field 3" "State"
+ !insertmacro INSTALLOPTIONS_READ $9 "UninstallOldVersions.ini" "Field 2" "State"
${If} $9 == "1"
ExecWait '"$3\bin\Uninstall.exe" /S'
${else}
@@ -518,8 +518,8 @@ FunctionEnd
Function uninstallOldVersionDialog
- StrCpy $control_fields 3
- StrCpy $max_fields 10
+ StrCpy $control_fields 2
+ StrCpy $max_fields 13
StrCpy $0 "HKLM"
StrCpy $4 0
ReserveFile "UninstallOldVersions.ini"
@@ -562,10 +562,11 @@ ${If} $8 > $control_fields
StrCpy $2 ""
!insertmacro MUI_HEADER_TEXT "$(uninstall_previous_installations_title)" "$(uninstall_previous_installations)"
!insertmacro INSTALLOPTIONS_WRITE "UninstallOldVersions.ini" "Field 1" "Text" "$(uninstall_previous_installations_prompt)"
+ !insertmacro INSTALLOPTIONS_WRITE "UninstallOldVersions.ini" "Field 3" "Flags" "FOCUS"
!insertmacro INSTALLOPTIONS_DISPLAY "UninstallOldVersions.ini"
;uninstall chosen installation(s)
- StrCmp $2 "OK" loop finish
+ ;no disabled controls. StrCmp $2 "OK" loop finish
loop:
!insertmacro INSTALLOPTIONS_READ $0 "UninstallOldVersions.ini" "Field $8" "State"
!insertmacro INSTALLOPTIONS_READ $3 "UninstallOldVersions.ini" "Field $8" "Text"
@@ -579,65 +580,6 @@ finish:
FunctionEnd
-Function leaveUninstallOldVersionDialog
- Push $1
- Push $4
- !insertmacro INSTALLOPTIONS_READ $2 "UninstallOldVersions.ini" "Settings" "State"
- StrCmp $2 2 enable_disable
- Goto done
-
-enable_disable:
- !insertmacro INSTALLOPTIONS_READ $0 "UninstallOldVersions.ini" "Field 2" "State"
- StrCmp $0 1 enable disable
-enable:
- StrCpy $1 ""
- Goto setFlag
-disable:
- Call setState
- StrCpy $1 "DISABLED"
-
-setFlag:
- Push $1
- Call setFlags
-done:
- Pop $4
- Pop $1
- StrCmp $2 0 skip_abort
- Pop $2
- Abort
-skip_abort:
- StrCpy $2 "OK"
-FunctionEnd
-
-Function setFlags
- Pop $1
- !insertmacro INSTALLOPTIONS_READ $max_fields "UninstallOldVersions.ini" "Settings" "NumFields"
- StrCpy $4 3
- ; change flags of fields in according of master checkbox
-loop:
- !insertmacro INSTALLOPTIONS_READ $1 "UninstallOldVersions.ini" "Field $4" "HWND"
- EnableWindow $1 $0
- !insertmacro INSTALLOPTIONS_WRITE "UninstallOldVersions.ini" "Field $4" "Flags" "$1"
- IntOp $4 $4 + 1
- ${If} $4 <= $max_fields
- Goto loop
- ${EndIf}
-FunctionEnd
-
-Function setState
- !insertmacro INSTALLOPTIONS_READ $max_fields "UninstallOldVersions.ini" "Settings" "NumFields"
- StrCpy $4 3
- ; change state of fields in according of master checkbox
-loop:
- !insertmacro INSTALLOPTIONS_READ $1 "UninstallOldVersions.ini" "Field $4" "HWND"
- SendMessage $1 ${BM_SETCHECK} 0 "0"
- !insertmacro INSTALLOPTIONS_WRITE "UninstallOldVersions.ini" "Field $4" "State" 0
- IntOp $4 $4 + 1
- ${If} $4 <= $max_fields
- Goto loop
- ${EndIf}
-FunctionEnd
-
Function getInstallationPath
Push $1
Push $2
@@ -1054,8 +996,10 @@ FunctionEnd
Function un.ConfirmDeleteSettings
!insertmacro MUI_HEADER_TEXT "$(uninstall_options)" "$(uninstall_options_prompt)"
!insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 1" "Text" "$(prompt_delete_settings)"
- !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 2" "Text" "$(confirm_delete_caches)"
- !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 3" "Text" "$(confirm_delete_settings)"
+ !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 2" "Text" $INSTDIR
+ !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 3" "Text" "$(text_delete_settings)"
+ !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 4" "Text" "$(confirm_delete_caches)"
+ !insertmacro INSTALLOPTIONS_WRITE "DeleteSettings.ini" "Field 5" "Text" "$(confirm_delete_settings)"
!insertmacro INSTALLOPTIONS_DISPLAY "DeleteSettings.ini"
FunctionEnd
@@ -1133,7 +1077,7 @@ Section "Uninstall"
; Uninstaller is in the \bin directory, we need upper level dir
StrCpy $INSTDIR $INSTDIR\..
- !insertmacro INSTALLOPTIONS_READ $R2 "DeleteSettings.ini" "Field 2" "State"
+ !insertmacro INSTALLOPTIONS_READ $R2 "DeleteSettings.ini" "Field 4" "State"
DetailPrint "Data: $DOCUMENTS\..\${PRODUCT_SETTINGS_DIR}\"
StrCmp $R2 1 "" skip_delete_caches
;find the path to caches (system) folder
@@ -1147,7 +1091,7 @@ Section "Uninstall"
; RmDir /r $DOCUMENTS\..\${PRODUCT_SETTINGS_DIR}\system
skip_delete_caches:
- !insertmacro INSTALLOPTIONS_READ $R3 "DeleteSettings.ini" "Field 3" "State"
+ !insertmacro INSTALLOPTIONS_READ $R3 "DeleteSettings.ini" "Field 5" "State"
StrCmp $R3 1 "" skip_delete_settings
;find the path to settings (config) folder
StrCpy $0 "config"
diff --git a/build/conf/nsis/idea_en.nsi b/build/conf/nsis/idea_en.nsi
index 65d9171c881f..1cb4408d1143 100644
--- a/build/conf/nsis/idea_en.nsi
+++ b/build/conf/nsis/idea_en.nsi
@@ -7,15 +7,16 @@ LangString install_for_current_user_only ${LANG_ENGLISH} "Install for current us
; Uninstall options page
LangString uninstall_options ${LANG_ENGLISH} "Uninstall ${MUI_PRODUCT}"
-LangString uninstall_options_prompt ${LANG_ENGLISH} "Remove ${MUI_PRODUCT} from your computer"
-LangString prompt_delete_settings ${LANG_ENGLISH} "Please confirm if you would like to delete the caches and settings of ${MUI_PRODUCT}."
+LangString uninstall_options_prompt ${LANG_ENGLISH} ""
+LangString prompt_delete_settings ${LANG_ENGLISH} "${MUI_PRODUCT} will be uninstalled from the following folder:"
+LangString text_delete_settings ${LANG_ENGLISH} "Please confirm if you would like to delete the caches and settings:"
LangString confirm_delete_caches ${LANG_ENGLISH} "Delete ${MUI_PRODUCT} ${MUI_VERSION_MAJOR} caches and local history"
LangString confirm_delete_settings ${LANG_ENGLISH} "Delete ${MUI_PRODUCT} ${MUI_VERSION_MAJOR} settings and installed plugins"
; Installation message boxes
LangString current_version_already_installed ${LANG_ENGLISH} "Current version of ${MUI_PRODUCT} is already installed. Do you wish to continue?"
LangString uninstall_previous_installations_title ${LANG_ENGLISH} "Uninstall old versions"
-LangString uninstall_previous_installations ${LANG_ENGLISH} "Installation found old versions of ${MUI_PRODUCT}. You can see list of the installations below."
-LangString uninstall_previous_installations_prompt ${LANG_ENGLISH} "Please select the version$2 of ${MUI_PRODUCT} which you would like to uninstall and mode of uninstallation."
+LangString uninstall_previous_installations ${LANG_ENGLISH} ""
+LangString uninstall_previous_installations_prompt ${LANG_ENGLISH} "Select the ${MUI_PRODUCT} version$2 that you want to uninstall."
LangString empty_or_upgrade_folder ${LANG_ENGLISH} "Please select an empty folder or a folder where ${MUI_PRODUCT} ${UPGRADE_VERSION} is installed as the target for installing ${MUI_PRODUCT}."
-LangString application_running ${LANG_ENGLISH} "Installation detects that $3 is running. Can you stop the application and then continue uninstallation please?"
+LangString application_running ${LANG_ENGLISH} "$3 is running. Close the application and retry the installation."
diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index a74f7d43a0b3..eb21bac9d8a4 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -55,6 +55,7 @@ target('run_tests': 'Run java tests') {
pass("idea.test.group")
pass("idea.test.patterns")
pass("idea.fast.only")
+ pass("idea.coverage.enabled.build")
pass("teamcity.build.tempDir")
pass("teamcity.tests.recentlyFailedTests.file")
jvmarg(value: "-Didea.platform.prefix=Idea")
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index 626095994a8b..4c04f9d339bb 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -345,6 +345,10 @@ public def layoutCommunityPlugins(String home) {
}
layoutPlugin("gradle") {
+ jar("gradle-jps-plugin.jar") {
+ module("gradle-jps-plugin")
+ }
+
jar("gradle-tooling-extension-api.jar") {
module("gradle-tooling-extension-api")
}
@@ -353,6 +357,13 @@ public def layoutCommunityPlugins(String home) {
module("gradle-tooling-extension-impl")
}
fileset(dir: "$home/plugins/gradle/lib") { include(name: "*.jar") }
+ // add kryo lib
+ fileset(dir: "$home/lib/") {
+ include(name: "kryo-*.jar")
+ include(name: "reflectasm-*.jar")
+ include(name: "objenesis-*.jar")
+ include(name: "minlog-*.jar")
+ }
}
layoutPlugin("git4idea") {
@@ -893,6 +904,7 @@ def layoutJps(String home, String targetDir, String buildNumber, Closure additio
jar("maven-jps-plugin.jar") { module("maven-jps-plugin") }
+ jar("gradle-jps-plugin.jar") { module("gradle-jps-plugin") }
fileset(dir: "$home/plugins/maven/maven3-server-impl/lib/maven3/lib") {include(name: "plexus-utils-*.jar")}
jar("eclipse-jps-plugin.jar") {
@@ -945,8 +957,9 @@ def layout_core(String home, String target) {
module("annotations")
}
- jar("intellij-core-analysis-api.jar") {
+ jar("intellij-core-analysis.jar") {
analysisApiModules.each { module it; }
+ analysisImplModules.each { module it; }
}
fileset(dir: "$home/lib") {
diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index eaeb82e1c4b4..d495f952b7a8 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -50,7 +50,8 @@ def String getLibraryName(JpsLibrary lib) {
def name = lib.name
if (name.startsWith("#")) {
if (lib.getRoots(JpsOrderRootType.COMPILED).size() != 1) {
- projectBuilder.warning("Non-single entry module library $name: $lib.classpath");
+ def urls = lib.getRoots(JpsOrderRootType.COMPILED).collect {it.url}
+ projectBuilder.warning("Non-single entry module library $name: $urls");
}
File file = lib.getFiles(JpsOrderRootType.COMPILED)[0]
return file.name
@@ -213,6 +214,7 @@ libraryLicense(name: "maven-core", version: "3.0.5", libraryNames: ["maven-core-
libraryLicense(name: "plexus-component-annotations", version: "1.5.5", libraryNames: ["plexus-component-annotations-1.5.5.jar"], license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
libraryLicense(name: "Maven3", libraryNames: ["Maven3", "maven-dependency-tree-1.2.jar", "archetype-catalog-2.2.jar", "archetype-common-2.2.jar"], version: "3.0.5", license: "Apache 2.0", url: "http://maven.apache.org/", licenseUrl: "http://maven.apache.org/license.html")
libraryLicense(name: "Gradle", version: "1.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "gradle-tooling-api-2.0.jar", version: "2.0", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt")
libraryLicense(name: "Slf4j", version: "1.7.2", license: "MIT License", url: "http://slf4j.org/", licenseUrl: "http://slf4j.org/license.html")
libraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/", licenseUrl: "http://apache.org/licenses/LICENSE-2.0")
diff --git a/build/scripts/tests.gant b/build/scripts/tests.gant
index d10d72b14112..03b740ccf434 100644
--- a/build/scripts/tests.gant
+++ b/build/scripts/tests.gant
@@ -9,6 +9,7 @@ def isMac = System.getProperty("os.name").toLowerCase().startsWith("mac")
def args = [
"-Xmx1024m",
"-XX:MaxPermSize=630m",
+ "-XX:ReservedCodeCacheSize=96m"
]
if (isMac) args << "-d32";
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index e5eb3eb90c25..f30d8a2c7af2 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -53,12 +53,12 @@ binding.setVariable("isEap", {
return "true" == p("component.version.eap")
})
-binding.setVariable("mem32", "-server -Xms128m -Xmx512m -XX:MaxPermSize=250m -XX:ReservedCodeCacheSize=64m")
-binding.setVariable("mem64", "-Xms128m -Xmx750m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=96m")
+binding.setVariable("mem32", "-server -Xms128m -Xmx512m -XX:MaxPermSize=250m -XX:ReservedCodeCacheSize=150m")
+binding.setVariable("mem64", "-Xms128m -Xmx750m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=225m")
binding.setVariable("common_vmoptions", "-ea -Dsun.io.useCanonCaches=false -Djava.net.preferIPv4Stack=true " +
"-Didea.project.structure.max.errors.to.show=0 " +
"-Djsse.enableSNIExtension=false " +
- "-XX:+UseCodeCacheFlushing -XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50")
+ "-XX:+UseConcMarkSweepGC -XX:SoftRefLRUPolicyMSPerMB=50")
binding.setVariable("vmOptions", { "$common_vmoptions ${isEap() ? '-XX:+HeapDumpOnOutOfMemoryError' : ''}".trim() })
binding.setVariable("vmOptions32", { "$mem32 ${vmOptions()}".trim() })
@@ -942,3 +942,16 @@ binding.setVariable("analysisApiModules", [
"xml-psi-api",
"xml-structure-view-api",
])
+binding.setVariable("analysisImplModules", [
+ "analysis-impl",
+ "core-impl",
+ "indexing-impl",
+ "java-analysis-impl",
+ "java-indexing-impl",
+ "java-psi-impl",
+ "projectModel-impl",
+ "structure-view-impl",
+ "xml-analysis-impl",
+ "xml-psi-impl",
+ "xml-structure-view-impl",
+])
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 02:36:41 +0000