[build scripts] dropping pointless CDS generation (IDEA-242552)

GitOrigin-RevId: ee63d47a4a7445f009a21d47e10be73a798cbd42
This commit is contained in:
Roman Shevchenko
2020-06-08 18:02:35 +03:00
committed by intellij-monorepo-bot
parent 1f258240d0
commit bbc5398fa6
2 changed files with 2 additions and 30 deletions
+1 -25
View File
@@ -44,8 +44,6 @@ Var productDir
Var silentMode
Var pathEnvVar
Var requiredDiskSpace
Var bundledJavaPath
Var regenerationSharedArchive
; position of controls for Uninstall Old Installations dialog
Var control_fields
@@ -658,18 +656,11 @@ update_context_menu:
download_jbr_x86:
ClearErrors
${ConfigRead} "$R1" "jre32=" $R3
IfErrors regeneration_shared_archive
IfErrors associations:
${LogText} " download x86 runtime: $R3"
!insertmacro INSTALLOPTIONS_WRITE "Desktop.ini" "Field $downloadJRE" "Type" "checkbox"
!insertmacro INSTALLOPTIONS_WRITE "Desktop.ini" "Field $downloadJRE" "State" $R3
regeneration_shared_archive:
ClearErrors
${ConfigRead} "$R1" "regenerationSharedArchive=" $R3
IfErrors associations
${LogText} " regenerationSharedArchive: $R3"
StrCpy $regenerationSharedArchive $R3
associations:
ClearErrors
StrCmp "${ASSOCIATION}" "NoAssociation" done
@@ -1359,21 +1350,6 @@ skip_ipr:
WriteRegDWORD SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_WITH_VER}" \
"NoRepair" 1
; Regenerating the Shared Archive
; https://docs.oracle.com/en/java/javase/11/vm/class-data-sharing.html
IfSilent 0 regeneration_shared_archive
StrCmp $regenerationSharedArchive "1" 0 skip_regeneration_shared_archive
regeneration_shared_archive:
StrCpy $bundledJavaPath "$INSTDIR\jbr\bin\javaw.exe"
IfFileExists $bundledJavaPath do_regeneration_shared_archive 0
StrCpy $bundledJavaPath "$INSTDIR\jre64\bin\javaw.exe"
IfFileExists $bundledJavaPath 0 skip_regeneration_shared_archive
do_regeneration_shared_archive:
${LogText} ""
${LogText} "Regenerating the Shared Archive using $bundledJavaPath"
ExecDos::exec /NOUNLOAD /ASYNC '"$bundledJavaPath" -Xshare:dump'
skip_regeneration_shared_archive:
SetOutPath $INSTDIR\bin
; set the current time for installation files under $INSTDIR\bin
ExecDos::exec 'copy "$INSTDIR\bin\*.*s" +,,'
@@ -13,8 +13,4 @@ updatePATH=0
updateContextMenu=0
; Download and install x86 runtime
jre32=0
; Regenerating the Shared Archive
; https://docs.oracle.com/en/java/javase/11/vm/class-data-sharing.html
regenerationSharedArchive=1
jre32=0