From 16e2a4af17ecc22de082310a96db1e221bb86c74 Mon Sep 17 00:00:00 2001
From: "Vladimir.Orlov" <Vladimir.Orlov@jetbrains.com>
Date: Mon, 27 Feb 2017 09:02:31 +0300
Subject: [PATCH] JRE bundled folder structure changed: jre/jre/.. -> jre/..
 IDEA-166909 Compiling 1.5 with JDK9 problem

---
 bin/scripts/unix/idea.sh                                   | 2 +-
 build/conf/nsis/idea.nsi                                   | 2 +-
 .../jetbrains/intellij/build/WinInstallerBuilder.groovy    | 7 +++----
 .../jetbrains/intellij/build/impl/BundledJreManager.groovy | 2 ++
 .../intellij/build/impl/LinuxDistributionBuilder.groovy    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh
index 0e840e5649df..7423be11caa6 100755
--- a/bin/scripts/unix/idea.sh
+++ b/bin/scripts/unix/idea.sh
@@ -68,7 +68,7 @@ elif [ -s "$HOME/.@@system_selector@@/config/@@vm_options@@.jdk" ]; then
   if [ ! -d "$JDK" ]; then
     JDK="$IDE_HOME/$JDK"
   fi
-elif [ "$OS_TYPE" = "Linux" ] && [ -x "$IDE_HOME/jre/jre/bin/java" ] && "$IDE_HOME/jre/jre/bin/java" -version > /dev/null 2>&1 ; then
+elif [ "$OS_TYPE" = "Linux" ] && [ -x "$IDE_HOME/jre/bin/java" ] && "$IDE_HOME/jre/bin/java" -version > /dev/null 2>&1 ; then
   JDK="$IDE_HOME/jre"
 elif [ -n "$JDK_HOME" -a -x "$JDK_HOME/bin/java" ]; then
   JDK="$JDK_HOME"
diff --git a/build/conf/nsis/idea.nsi b/build/conf/nsis/idea.nsi
index d1e261155e82..f1680e84f67b 100644
--- a/build/conf/nsis/idea.nsi
+++ b/build/conf/nsis/idea.nsi
@@ -382,7 +382,7 @@ Function downloadJre
     inetc::get ${LINK_TO_JRE} "$TEMP\jre.tar.gz" /END
     Pop $0
     ${If} $0 == "OK"
-      untgz::extract "-d" "$INSTDIR\jre" "$TEMP\jre.tar.gz"
+      untgz::extract "-d" "$INSTDIR" "$TEMP\jre.tar.gz"
       StrCmp $R0 "success" removeTempJre
       DetailPrint "Failed to extract jre.tar.gz"
       MessageBox MB_OK|MB_ICONEXCLAMATION|MB_DEFBUTTON1 "Failed to extract $TEMP\jre.tar.gz"
diff --git a/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy
index fa49d5b3d872..7e7d954bbd18 100644
--- a/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/WinInstallerBuilder.groovy
@@ -88,12 +88,11 @@ class WinInstallerBuilder {
     ant.mkdir(dir: "$box/nsiconf")
 
     if (winJDKZipPath != null) {
-      ant.mkdir(dir: "$box/jre")
-      ant.unzip(dest: "$box/jre", src: winJDKZipPath)
+      ant.unzip(dest: "$box", src: winJDKZipPath)
 
       ant.copy(todir: "$box/bin") {
-        fileset(dir: "$box/jre/jre/bin") {
-          include(name: "msvcr71.dll")
+        fileset(dir: "$box/jre/bin") {
+          include(name: "msvcr120.dll")
         }
       }
     }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
index 418c8b21cf90..5a711a1998f9 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BundledJreManager.groovy
@@ -105,6 +105,8 @@ class BundledJreManager {
         buildContext.ant.exec(executable: "tar", dir: archive.parent) {
           arg(value: "-xf")
           arg(value: archive.name)
+          arg(value: "--strip")
+          arg(value: "1")
           arg(value: "--directory")
           arg(value: destination)
         }
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
index e8ce85963094..a4f189e0007e 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/LinuxDistributionBuilder.groovy
@@ -144,7 +144,7 @@ class LinuxDistributionBuilder extends OsSpecificDistributionBuilder {
     def paths = [buildContext.paths.distAll, unixDistPath]
     if (jreDirectoryPath != null) {
       paths += jreDirectoryPath
-      extraBins += "jre/jre/bin/*"
+      extraBins += "jre/bin/*"
     }
     def description = "archive${jreDirectoryPath != null ? "" : " (without JRE)"}"
     buildContext.messages.block("Build Linux tar.gz $description") {