From bbc5398fa62c36e4b6827c1beabc4a11722c3809 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 8 Jun 2020 17:02:35 +0200
Subject: [PATCH] [build scripts] dropping pointless CDS generation
 (IDEA-242552)

GitOrigin-RevId: ee63d47a4a7445f009a21d47e10be73a798cbd42
---
 build/conf/nsis/idea.nsi                      | 26 +------------------
 .../resources/win/nsis/silent.config          |  6 +----
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index 6a77322d67ec..4ef9d5d9e8bf 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -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" +,,'
diff --git a/platform/build-scripts/resources/win/nsis/silent.config b/platform/build-scripts/resources/win/nsis/silent.config
index 8d5b30b73f86..2cacd06a94e7 100644
--- a/platform/build-scripts/resources/win/nsis/silent.config
+++ b/platform/build-scripts/resources/win/nsis/silent.config
@@ -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
\ No newline at end of file
+jre32=0
\ No newline at end of file