Skip to content

Commit a3c80dd

Browse files
berdandyberdandy
committed
zola -> azola to provide better differentiation with semver and azola 'releases'
1 parent 6f0578b commit a3c80dd

File tree

3 files changed

+265
-31
lines changed

3 files changed

+265
-31
lines changed

‎Cargo.lock

+26-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
2-
name = "zola"
3-
version = "0.18.1-aw2.6"
2+
name = "azola"
3+
version = "0.1.0"
44
authors = ["Vincent Prouillet <hello@vincentprouillet.com>", "Andy Berdan <andy@berdan.ca>"]
55
edition = "2021"
66
license = "MIT"
77
readme = "README.md"
8-
description = "A fast static site generator with everything built-in"
8+
description = "A fast static site generator with everything built-in. Forked from zola with customizations for aw2"
99
homepage = "https://www.getzola.org"
1010
repository = "https://github.com/berdandy/azola"
1111
keywords = ["static", "site", "generator", "blog"]
@@ -17,7 +17,7 @@ winres = "0.1"
1717
time = "0.3"
1818

1919
[[bin]]
20-
name = "zola"
20+
name = "azola"
2121

2222
[dependencies]
2323
clap = { version = "4", features = ["derive"] }
@@ -65,7 +65,7 @@ cargo-dist-version = "0.11.1"
6565
# CI backends to support
6666
ci = ["github"]
6767
# The installers to generate for each app
68-
installers = []
68+
installers = ["shell", "msi"]
6969
# Target platforms to build apps for (Rust target-triple syntax)
7070
targets = ["x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
7171
# Publish jobs to run in CI
@@ -91,3 +91,9 @@ lto = "thin"
9191
[package.metadata.winres]
9292
OriginalFilename = "zola.exe"
9393
InternalName = "zola"
94+
95+
[package.metadata.wix]
96+
upgrade-guid = "BD78BA4C-7593-4C05-A9E2-CBB0EAA1FD6B"
97+
path-guid = "B0D40DE3-F52A-4A93-9532-2E15655AA4CC"
98+
license = false
99+
eula = false

‎wix/main.wxs

+228
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,228 @@
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+
The "cargo wix" subcommand provides a variety of predefined variables available
20+
for customization of this template. The values for each variable are set at
21+
installer creation time. The following variables are available:
22+
23+
TargetTriple = The rustc target triple name.
24+
TargetEnv = The rustc target environment. This is typically either
25+
"msvc" or "gnu" depending on the toolchain downloaded and
26+
installed.
27+
TargetVendor = The rustc target vendor. This is typically "pc", but Rust
28+
does support other vendors, like "uwp".
29+
CargoTargetBinDir = The complete path to the directory containing the
30+
binaries (exes) to include. The default would be
31+
"target\release\". If an explicit rustc target triple is
32+
used, i.e. cross-compiling, then the default path would
33+
be "target\<CARGO_TARGET>\<CARGO_PROFILE>",
34+
where "<CARGO_TARGET>" is replaced with the "CargoTarget"
35+
variable value and "<CARGO_PROFILE>" is replaced with the
36+
value from the "CargoProfile" variable. This can also
37+
be overridden manually with the "target-bin-dir" flag.
38+
CargoTargetDir = The path to the directory for the build artifacts, i.e.
39+
"target".
40+
CargoProfile = The cargo profile used to build the binaries
41+
(usually "debug" or "release").
42+
Version = The version for the installer. The default is the
43+
"Major.Minor.Fix" semantic versioning number of the Rust
44+
package.
45+
-->
46+
47+
<!--
48+
Please do not remove these pre-processor If-Else blocks. These are used with
49+
the `cargo wix` subcommand to automatically determine the installation
50+
destination for 32-bit versus 64-bit installers. Removal of these lines will
51+
cause installation errors.
52+
-->
53+
<?if $(sys.BUILDARCH) = x64 or $(sys.BUILDARCH) = arm64 ?>
54+
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
55+
<?else ?>
56+
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
57+
<?endif ?>
58+
59+
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
60+
61+
<Product
62+
Id='*'
63+
Name='azola'
64+
UpgradeCode='BD78BA4C-7593-4C05-A9E2-CBB0EAA1FD6B'
65+
Manufacturer='Vincent Prouillet; Andy Berdan'
66+
Language='1033'
67+
Codepage='1252'
68+
Version='$(var.Version)'>
69+
70+
<Package Id='*'
71+
Keywords='Installer'
72+
Description='A fast static site generator with everything built-in. Forked from zola with customizations for aw2'
73+
Manufacturer='Vincent Prouillet; Andy Berdan'
74+
InstallerVersion='450'
75+
Languages='1033'
76+
Compressed='yes'
77+
InstallScope='perMachine'
78+
SummaryCodepage='1252'
79+
/>
80+
81+
<MajorUpgrade
82+
Schedule='afterInstallInitialize'
83+
DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.'/>
84+
85+
<Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'/>
86+
<Property Id='DiskPrompt' Value='azola Installation'/>
87+
88+
<Directory Id='TARGETDIR' Name='SourceDir'>
89+
<Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
90+
<Directory Id='APPLICATIONFOLDER' Name='azola'>
91+
92+
<!--
93+
Enabling the license sidecar file in the installer is a four step process:
94+
95+
1. Uncomment the `Component` tag and its contents.
96+
2. Change the value for the `Source` attribute in the `File` tag to a path
97+
to the file that should be included as the license sidecar file. The path
98+
can, and probably should be, relative to this file.
99+
3. Change the value for the `Name` attribute in the `File` tag to the
100+
desired name for the file when it is installed alongside the `bin` folder
101+
in the installation directory. This can be omitted if the desired name is
102+
the same as the file name.
103+
4. Uncomment the `ComponentRef` tag with the Id attribute value of "License"
104+
further down in this file.
105+
-->
106+
<!--
107+
<Component Id='License' Guid='*'>
108+
<File Id='LicenseFile' Name='ChangeMe' DiskId='1' Source='C:\Path\To\File' KeyPath='yes'/>
109+
</Component>
110+
-->
111+
112+
<Directory Id='Bin' Name='bin'>
113+
<Component Id='Path' Guid='B0D40DE3-F52A-4A93-9532-2E15655AA4CC' KeyPath='yes'>
114+
<Environment
115+
Id='PATH'
116+
Name='PATH'
117+
Value='[Bin]'
118+
Permanent='no'
119+
Part='last'
120+
Action='set'
121+
System='yes'/>
122+
</Component>
123+
<Component Id='binary0' Guid='*'>
124+
<File
125+
Id='exe0'
126+
Name='azola.exe'
127+
DiskId='1'
128+
Source='$(var.CargoTargetBinDir)\azola.exe'
129+
KeyPath='yes'/>
130+
</Component>
131+
</Directory>
132+
</Directory>
133+
</Directory>
134+
</Directory>
135+
136+
<Feature
137+
Id='Binaries'
138+
Title='Application'
139+
Description='Installs all binaries and the license.'
140+
Level='1'
141+
ConfigurableDirectory='APPLICATIONFOLDER'
142+
AllowAdvertise='no'
143+
Display='expand'
144+
Absent='disallow'>
145+
146+
<!--
147+
Uncomment the following `ComponentRef` tag to add the license
148+
sidecar file to the installer.
149+
-->
150+
<!--<ComponentRef Id='License'/>-->
151+
152+
<ComponentRef Id='binary0'/>
153+
154+
<Feature
155+
Id='Environment'
156+
Title='PATH Environment Variable'
157+
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.'
158+
Level='1'
159+
Absent='allow'>
160+
<ComponentRef Id='Path'/>
161+
</Feature>
162+
</Feature>
163+
164+
<SetProperty Id='ARPINSTALLLOCATION' Value='[APPLICATIONFOLDER]' After='CostFinalize'/>
165+
166+
167+
<!--
168+
Uncomment the following `Icon` and `Property` tags to change the product icon.
169+
170+
The product icon is the graphic that appears in the Add/Remove
171+
Programs control panel for the application.
172+
-->
173+
<!--<Icon Id='ProductICO' SourceFile='wix\Product.ico'/>-->
174+
<!--<Property Id='ARPPRODUCTICON' Value='ProductICO' />-->
175+
176+
<Property Id='ARPHELPLINK' Value='https://www.getzola.org'/>
177+
178+
<UI>
179+
<UIRef Id='WixUI_FeatureTree'/>
180+
181+
<!--
182+
Enabling the EULA dialog in the installer is a three step process:
183+
184+
1. Comment out or remove the two `Publish` tags that follow the
185+
`WixVariable` tag.
186+
2. Uncomment the `<WixVariable Id='WixUILicenseRtf' Value='Path\to\Eula.rft'>` tag further down
187+
3. Replace the `Value` attribute of the `WixVariable` tag with
188+
the path to a RTF file that will be used as the EULA and
189+
displayed in the license agreement dialog.
190+
-->
191+
<Publish Dialog='WelcomeDlg' Control='Next' Event='NewDialog' Value='CustomizeDlg' Order='99'>1</Publish>
192+
<Publish Dialog='CustomizeDlg' Control='Back' Event='NewDialog' Value='WelcomeDlg' Order='99'>1</Publish>
193+
194+
</UI>
195+
196+
197+
<!--
198+
Enabling the EULA dialog in the installer requires uncommenting
199+
the following `WixUILicenseRTF` tag and changing the `Value`
200+
attribute.
201+
-->
202+
<!-- <WixVariable Id='WixUILicenseRtf' Value='Relative\Path\to\Eula.rtf'/> -->
203+
204+
205+
<!--
206+
Uncomment the next `WixVariable` tag to customize the installer's
207+
Graphical User Interface (GUI) and add a custom banner image across
208+
the top of each screen. See the WiX Toolset documentation for details
209+
about customization.
210+
211+
The banner BMP dimensions are 493 x 58 pixels.
212+
-->
213+
<!--<WixVariable Id='WixUIBannerBmp' Value='wix\Banner.bmp'/>-->
214+
215+
216+
<!--
217+
Uncomment the next `WixVariable` tag to customize the installer's
218+
Graphical User Interface (GUI) and add a custom image to the first
219+
dialog, or screen. See the WiX Toolset documentation for details about
220+
customization.
221+
222+
The dialog BMP dimensions are 493 x 312 pixels.
223+
-->
224+
<!--<WixVariable Id='WixUIDialogBmp' Value='wix\Dialog.bmp'/>-->
225+
226+
</Product>
227+
228+
</Wix>

0 commit comments

Comments
 (0)