Skip to content

Commit 76aab83

Browse files
StoozyStoozy
committed
Ready for pre alpha release
1 parent 6842cb0 commit 76aab83

File tree

8 files changed

+208
-6
lines changed

8 files changed

+208
-6
lines changed

‎Cargo.lock

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

‎Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
name = "sml"
33
version = "0.1.0"
44
authors = ["Stoozy <mahinsemail@gmail.com>"]
5+
description = "A minecraft launcher"
6+
homepage= "https://github.com/Stoozy/sml"
57
edition = "2018"
68

79
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

‎releases/linux-pre-alpha-0.1.0.tar.gz renamed to ‎releases/linux-pre-alpha-0.1.0-x86_64.tar.gz

File renamed without changes.

‎releases/linux-pre-alpha-0.1.0/install.sh renamed to ‎releases/linux-pre-alpha-0.1.0-x86_64/install.sh

File renamed without changes.

‎releases/linux-pre-alpha-0.1.0/sml renamed to ‎releases/linux-pre-alpha-0.1.0-x86_64/sml

File renamed without changes.

‎releases/windows-pre-alpha-0.1.0-x86_64.msi

2.39 MB
Binary file not shown.

‎src/util.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ pub fn pause() {
4343

4444
pub fn get_instances_path() -> Option<PathBuf> {
4545
if cfg!(windows) {
46-
std::env::current_exe().ok().and_then(|mut pb| {
46+
return std::env::current_exe().ok().and_then(|mut pb| {
4747
pb.pop();
48-
pb.push("instances/");
48+
pb.push("instances");
4949
// if path dne then, create one
5050
// (this should be first time only)
5151
if !pb.exists() {
5252
println!("Creating instances dir at {}", pb.display());
5353
fs::create_dir_all(pb.clone()).expect("Error creating instances folder");
5454
}
55-
Some(pb)
55+
return Some(pb);
5656
});
5757
} else {
5858
// assuming linux here
@@ -67,7 +67,6 @@ pub fn get_instances_path() -> Option<PathBuf> {
6767
Err(_) => return None,
6868
};
6969
}
70-
None
7170
}
7271
pub fn get_u64() -> Option<u64> {
7372
let mut input_text = String::new();

‎wix/main.wxs

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
<?xml version='1.0' encoding='windows-1252'?>
2+
<!--
3+
Copyright (C) 2017 Christopher R. Field.
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<!--
19+
Please do not remove these pre-processor If-Else blocks. These are used with
20+
the `cargo wix` subcommand to automatically determine the installation
21+
destination for 32-bit versus 64-bit installers. Removal of these lines will
22+
cause installation errors.
23+
-->
24+
<?if $(var.Platform) = x64 ?>
25+
<?define Win64 = "yes" ?>
26+
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
27+
<?else ?>
28+
<?define Win64 = "no" ?>
29+
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
30+
<?endif ?>
31+
32+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
33+
34+
<Product
35+
Id='*'
36+
Name='sml'
37+
UpgradeCode='AEA8CBAF-18E6-47C2-9C3F-81909A20A9F9'
38+
Manufacturer='Stoozy'
39+
Language='1033'
40+
Codepage='1252'
41+
Version='$(var.Version)'>
42+
43+
<Package Id='*'
44+
Keywords='Installer'
45+
Description='A minecraft launcher'
46+
Manufacturer='Stoozy'
47+
InstallerVersion='450'
48+
Languages='1033'
49+
Compressed='yes'
50+
InstallScope='perMachine'
51+
SummaryCodepage='1252'
52+
Platform='$(var.Platform)'/>
53+
54+
<MajorUpgrade
55+
Schedule='afterInstallInitialize'
56+
DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.'/>
57+
58+
<Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'/>
59+
<Property Id='DiskPrompt' Value='sml Installation'/>
60+
61+
<Directory Id='TARGETDIR' Name='SourceDir'>
62+
<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
63+
<Directory Id='APPLICATIONFOLDER' Name='sml'>
64+
65+
<!--
66+
Enabling the license sidecar file in the installer is a four step process:
67+
68+
1. Uncomment the `Component` tag and its contents.
69+
2. Change the value for the `Source` attribute in the `File` tag to a path
70+
to the file that should be included as the license sidecar file. The path
71+
can, and probably should be, relative to this file.
72+
3. Change the value for the `Name` attribute in the `File` tag to the
73+
desired name for the file when it is installed alongside the `bin` folder
74+
in the installation directory. This can be omitted if the desired name is
75+
the same as the file name.
76+
4. Uncomment the `ComponentRef` tag with the Id attribute value of "License"
77+
further down in this file.
78+
-->
79+
<!--
80+
<Component Id='License' Guid='*' Win64='$(var.Win64)'>
81+
<File Id='LicenseFile' Name='ChangeMe' DiskId='1' Source='C:\Path\To\File' KeyPath='yes'/>
82+
</Component>
83+
-->
84+
85+
<Directory Id='Bin' Name='bin'>
86+
<Component Id='Path' Guid='B2790090-8E0C-4399-90ED-4FC848B0202C' Win64='$(var.Win64)' KeyPath='yes'>
87+
<Environment
88+
Id='PATH'
89+
Name='PATH'
90+
Value='[Bin]'
91+
Permanent='no'
92+
Part='last'
93+
Action='set'
94+
System='yes'/>
95+
</Component>
96+
<Component Id='binary0' Guid='*' Win64='$(var.Win64)'>
97+
<File
98+
Id='exe0'
99+
Name='sml.exe'
100+
DiskId='1'
101+
Source='target\$(var.Profile)\sml.exe'
102+
KeyPath='yes'/>
103+
</Component>
104+
</Directory>
105+
</Directory>
106+
</Directory>
107+
</Directory>
108+
109+
<Feature
110+
Id='Binaries'
111+
Title='Application'
112+
Description='Installs all binaries and the license.'
113+
Level='1'
114+
ConfigurableDirectory='APPLICATIONFOLDER'
115+
AllowAdvertise='no'
116+
Display='expand'
117+
Absent='disallow'>
118+
119+
<!--
120+
Uncomment the following `ComponentRef` tag to add the license
121+
sidecar file to the installer.
122+
-->
123+
<!--<ComponentRef Id='License'/>-->
124+
125+
<ComponentRef Id='binary0'/>
126+
127+
<Feature
128+
Id='Environment'
129+
Title='PATH Environment Variable'
130+
Description='Add the install location of the [ProductName] executable to the PATH system environment variable. This allows the [ProductName] executable to be called from any location.'
131+
Level='1'
132+
Absent='allow'>
133+
<ComponentRef Id='Path'/>
134+
</Feature>
135+
</Feature>
136+
137+
<SetProperty Id='ARPINSTALLLOCATION' Value='[APPLICATIONFOLDER]' After='CostFinalize'/>
138+
139+
140+
<!--
141+
Uncomment the following `Icon` and `Property` tags to change the product icon.
142+
143+
The product icon is the graphic that appears in the Add/Remove
144+
Programs control panel for the application.
145+
-->
146+
<!--<Icon Id='ProductICO' SourceFile='wix\Product.ico'/>-->
147+
<!--<Property Id='ARPPRODUCTICON' Value='ProductICO' />-->
148+
149+
<Property Id='ARPHELPLINK' Value='https://github.com/Stoozy/sml'/>
150+
151+
<UI>
152+
<UIRef Id='WixUI_FeatureTree'/>
153+
154+
<!--
155+
Enabling the EULA dialog in the installer is a three step process:
156+
157+
1. Comment out or remove the two `Publish` tags that follow the
158+
`WixVariable` tag.
159+
2. Uncomment the `<WixVariable Id='WixUILicenseRtf' Value='Path\to\Eula.rft'>` tag futher down
160+
3. Replace the `Value` attribute of the `WixVariable` tag with
161+
the path to a RTF file that will be used as the EULA and
162+
displayed in the license agreement dialog.
163+
-->
164+
<Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='CustomizeDlg' Order='99'>1</Publish>
165+
<Publish Dialog='CustomizeDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg' Order='99'>1</Publish>
166+
167+
</UI>
168+
169+
170+
<!--
171+
Enabling the EULA dialog in the installer requires uncommenting
172+
the following `WixUILicenseRTF` tag and changing the `Value`
173+
attribute.
174+
-->
175+
<!-- <WixVariable Id='WixUILicenseRtf' Value='Relative\Path\to\Eula.rtf'/> -->
176+
177+
178+
<!--
179+
Uncomment the next `WixVaraible` tag to customize the installer's
180+
Graphical User Interface (GUI) and add a custom banner image across
181+
the top of each screen. See the WiX Toolset documentation for details
182+
about customization.
183+
184+
The banner BMP dimensions are 493 x 58 pixels.
185+
-->
186+
<!--<WixVariable Id='WixUIBannerBmp' Value='wix\Banner.bmp'/>-->
187+
188+
189+
<!--
190+
Uncomment the next `WixVariable` tag to customize the installer's
191+
Graphical User Interface (GUI) and add a custom image to the first
192+
dialog, or screen. See the WiX Toolset documentation for details about
193+
customization.
194+
195+
The dialog BMP dimensions are 493 x 312 pixels.
196+
-->
197+
<!--<WixVariable Id='WixUIDialogBmp' Value='wix\Dialog.bmp'/>-->
198+
199+
</Product>
200+
201+
</Wix>

0 commit comments

Comments
 (0)