Skip to content

Commit 36b15e8

Browse files
committed
Version 1.0.2
1 parent f4ad329 commit 36b15e8

16 files changed

+111
-54
lines changed
Binary file not shown.

GraalVM_InstallerForWindows/Core/Config.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace GraalVM_InstallerForWindows.Core
2222
{
2323
class Config
2424
{
25-
public static string fVersion = "1.0.1";
25+
public static string fVersion = "1.0.2";
2626
public static string fDownloadsListPath = "https://raw.githubusercontent.com/SourceRabbit/GraalVM-Windows-Installer/main/Downloads/DownloadsList.txt";
2727

2828
}

GraalVM_InstallerForWindows/Core/Installer.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ private void InstallationThreadStart()
6565
Step2_UnzipGraalVM();
6666
fWaitStepToFinish.WaitOne();
6767

68-
6968
fWaitStepToFinish.Reset();
7069
Step3_SetEnvironmentalVariables();
7170
fWaitStepToFinish.WaitOne();
@@ -75,6 +74,11 @@ private void InstallationThreadStart()
7574
fWaitStepToFinish.WaitOne();
7675

7776

77+
fWaitStepToFinish.Reset();
78+
Step5_DeleteGraalVMDownloadedZip();
79+
fWaitStepToFinish.WaitOne();
80+
81+
7882
// Set fFinished to true at the end!!!
7983
fFinished = true;
8084
}
@@ -187,7 +191,7 @@ private void Step2_UnzipGraalVM()
187191

188192
private void Step3_SetEnvironmentalVariables()
189193
{
190-
fStatus = "Setting environmental variables...";
194+
fStatus = "Setting environment variables...";
191195

192196
// Create the JAVA_HOME environmental variable
193197
string environmentalVariableName = "JAVA_HOME";
@@ -224,6 +228,13 @@ private void Step4_RunJarFix()
224228
}
225229

226230

231+
private void Step5_DeleteGraalVMDownloadedZip()
232+
{
233+
string downloadPathToDisk = fInstallationFolder + "\\" + fVersionToInstall;
234+
File.Delete(downloadPathToDisk);
235+
fWaitStepToFinish.Set();
236+
}
237+
227238
public string Status
228239
{
229240
get { return fStatus; }

GraalVM_InstallerForWindows/GraalVM_InstallerForWindows.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
<Compile Include="Properties\Resources.Designer.cs">
9393
<AutoGen>True</AutoGen>
9494
<DependentUpon>Resources.resx</DependentUpon>
95+
<DesignTime>True</DesignTime>
9596
</Compile>
9697
<None Include="app.manifest" />
9798
<None Include="packages.config" />
@@ -113,6 +114,7 @@
113114
<Content Include="JarFix\jarfix.exe">
114115
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
115116
</Content>
117+
<None Include="Resources\MainLogo.png" />
116118
</ItemGroup>
117119
<ItemGroup>
118120
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

GraalVM_InstallerForWindows/Properties/Resources.Designer.cs

Lines changed: 28 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GraalVM_InstallerForWindows/Properties/Resources.resx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
4747
mimetype: application/x-microsoft.net.object.binary.base64
4848
value : The object must be serialized with
49-
: System.Serialization.Formatters.Binary.BinaryFormatter
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
5050
: and then encoded with base64 encoding.
5151
5252
mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
6060
: and then encoded with base64 encoding.
6161
-->
6262
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
6364
<xsd:element name="root" msdata:IsDataSet="true">
6465
<xsd:complexType>
6566
<xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
6869
<xsd:sequence>
6970
<xsd:element name="value" type="xsd:string" minOccurs="0" />
7071
</xsd:sequence>
71-
<xsd:attribute name="name" type="xsd:string" />
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
7273
<xsd:attribute name="type" type="xsd:string" />
7374
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
7476
</xsd:complexType>
7577
</xsd:element>
7678
<xsd:element name="assembly">
@@ -85,9 +87,10 @@
8587
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
8688
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
8789
</xsd:sequence>
88-
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
8991
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
9092
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
9194
</xsd:complexType>
9295
</xsd:element>
9396
<xsd:element name="resheader">
@@ -109,9 +112,13 @@
109112
<value>2.0</value>
110113
</resheader>
111114
<resheader name="reader">
112-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
113116
</resheader>
114117
<resheader name="writer">
115-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116119
</resheader>
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121+
<data name="MainLogo" type="System.Resources.ResXFileRef, System.Windows.Forms">
122+
<value>..\Resources\MainLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123+
</data>
117124
</root>
24.1 KB
Loading

GraalVM_InstallerForWindows/frmMain.Designer.cs

Lines changed: 33 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)