Commit 5bcb15e8 authored by Adrien's avatar Adrien Committed by GitHub
Browse files

fix(installers) Update jre url (#2291)

parent 01a09d7c
......@@ -36,6 +36,8 @@
<replace file="${updated.project.file}" token="@windows.shortcut.name@" value="${windows.shortcut.name}"/>
<replace file="${updated.project.file}" token="@linux.shortcut.name@" value="${linux.shortcut.name}"/>
<replace file="${updated.project.file}" token="@mac.studio.dir@" value="${mac.studio.dir}"/>
<replace file="${updated.project.file}" token="@jre.osx.archive.name@" value="${jre.osx.archive.name}"/>
<replace file="${updated.project.file}" token="@jre.folder.name@" value="${jre.folder.name}"/>
<replace file="${updated.project.file}" token="@enable.uninstaller@" value="${enable.uninstaller}"/>
<replace file="${updated.project.file}" token="@slide1@" value="${slide1}"/>
<replace file="${updated.project.file}" token="@slide2@" value="${slide2}"/>
......
......@@ -296,7 +296,7 @@
</createDirectory>
<runProgram>
<program>tar</program>
<programArguments>-xzf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/OpenJDK11U-jre_x64_mac_hotspot_11.0.2_9.tar.gz" -C "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre"</programArguments>
<programArguments>-xzf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/@jre.osx.archive.name@" -C "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre"</programArguments>
<progressText>Installing JRE...</progressText>
<ruleList>
<platformTest>
......@@ -315,7 +315,7 @@
</runProgram>
<runProgram>
<program>mv</program>
<programArguments>"${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/jdk-11.0.2+9-jre/Contents/" "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/"</programArguments>
<programArguments>"${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/@jre.folder.name@/Contents/" "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
......@@ -324,7 +324,7 @@
</runProgram>
<runProgram>
<program>rm</program>
<programArguments>-rf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/jdk-11.0.2+9-jre"</programArguments>
<programArguments>-rf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/jre/@jre.folder.name@"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
......@@ -333,7 +333,7 @@
</runProgram>
<runProgram>
<program>rm</program>
<programArguments>-rf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/OpenJDK11U-jre_x64_mac_hotspot_11.0.2_9.tar.gz"</programArguments>
<programArguments>-rf "${installdir}/@mac.shortcut.name@/Contents/Eclipse/@jre.osx.archive.name@"</programArguments>
<ruleList>
<platformTest>
<type>osx</type>
......
......@@ -297,10 +297,11 @@
</activation>
<properties>
<if.task>net.sf.antcontrib.logic.IfTask</if.task>
<jre.url>http://repositories.rd.lan/tools/studio-tools</jre.url>
<jre.winx86.x64.url>OpenJDK11U-jre_x64_windows_hotspot_11.0.2_9</jre.winx86.x64.url>
<jre.linuxx86.x64.url>OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9</jre.linuxx86.x64.url>
<jre.osx.url>OpenJDK11U-jre_x64_mac_hotspot_11.0.2_9</jre.osx.url>
<jre.url>http://artifacts.rd.lan/tools/studio-tools</jre.url>
<jre.winx86.x64.url>OpenJDK11U-jre_x64_windows_hotspot_11.0.7_10</jre.winx86.x64.url>
<jre.linuxx86.x64.url>OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10</jre.linuxx86.x64.url>
<jre.osx.url>OpenJDK11U-jre_x64_mac_hotspot_11.0.7_10</jre.osx.url>
<jre.folder.name>jdk-11.0.7+10-jre</jre.folder.name>
</properties>
<build>
<plugins>
......@@ -376,6 +377,8 @@
value="${product.short.name}-${product.version}-x86_64.run" />
<property name="updated.project.file"
value="${basedir}/installer/installer_project_linux_x86_64.xml" />
<property name="jre.osx.archive.name" value="${jre.osx.url}.tar.gz" />
<property name="jre.folder.name" value="${jre.folder.name}" />
<ant antfile="createInstallerProject.xml" />
</target>
</configuration>
......@@ -461,7 +464,7 @@
<copy
todir="${project.build.directory}/products/${productId}/win32/win32/x86_64/jre">
<fileset
dir="${user.home}/${jre.winx86.x64.url}/jdk-11.0.2+9-jre" />
dir="${user.home}/${jre.winx86.x64.url}/${jre.folder.name}" />
</copy>
</target>
</configuration>
......@@ -498,7 +501,7 @@
<copy
todir="${project.build.directory}/products/${productId}/linux/gtk/x86_64/jre">
<fileset
dir="${user.home}/${jre.linuxx86.x64.url}/jdk-11.0.2+9-jre" />
dir="${user.home}/${jre.linuxx86.x64.url}/${jre.folder.name}" />
</copy>
</target>
</configuration>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment