Skip to content

Commit f6373da

Browse files
rmartin16mhsmith
andauthored
Update wxs for WiX 5 (#14)
Updates the WiX configuration files to adapt to WiX 5 format (WiX 6 has some potential licensing issues, but should be mostly compatible). --------- Co-authored-by: Malcolm Smith <smith@chaquo.com>
1 parent 3de243a commit f6373da

File tree

5 files changed

+322
-146
lines changed

5 files changed

+322
-146
lines changed

README.rst

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,10 @@ looks something like::
6060
my-project.wxs
6161
MyProject.exe
6262

63-
This project can now be compiled with `WiX <https://wixtoolset.org>`__ to
64-
produce an MSI file. This is a three step process. Open a command prompt,
65-
and change into the ``My Project`` directory. Then:
63+
This project can now be compiled with `WiX <https://wixtoolset.org>`__ to produce an MSI
64+
file. Open a command prompt, and change into the ``My Project`` directory. Then::
6665

67-
1. Generate a manifest of the files in your project::
68-
69-
C:\...>"%WIX%\bin\heat.exe" dir src -gg -sfrag -sreg -srd -scom -dr my_project_ROOTDIR -cg my_project_COMPONENTS -var var.SourceDir -out my-project-manifest.wxs
70-
71-
2. Compile the ``.wxs`` files::
72-
73-
C:\...>"%WIX%\bin\candle.exe" -ext WixUtilExtension -ext WixUIExtension -dSourceDir=src my-project.wxs myproject-manifest.wxs
74-
75-
3. Link the compiled output to produce the MSI::
76-
77-
C:\...>"%WIX%\bin\light.exe" -ext WixUtilExtension -ext WixUIExtension my-project.wixobj myproject-manifest.wixobj "My Project.msi"
66+
C:\...>wix build -ext WixToolset.UI.wixext -arch x64 my-project.wxs -loc unicode.wxl -o "My Project.msi"
7867

7968
The MSI file can then be used to install your application. When installed, your
8069
application will have an entry in your Start menu.

cookiecutter.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"guid": "1409c8f5-c276-4cf3-a2fd-defcbdfef9a2",
1414
"install_scope": "",
1515
"use_full_install_path": true,
16+
"package_path": "C:\\path\\to\\content",
1617
"binary_path": "{{ cookiecutter.formal_name }}.exe",
1718
"document_types": "",
1819
"python_version": "3.X.0",

{{ cookiecutter.format }}/briefcase.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Generated using Python {{ cookiecutter.python_version }}
2+
[briefcase]
3+
target_version = "0.3.24"
4+
25
[paths]
36
app_path = "src/app"
47
app_packages_path = "src/app_packages"
@@ -12,7 +15,7 @@ support_path = "src"
1215
"3.12": "support_revision = 9",
1316
"3.13": "support_revision = 3",
1417
}.get(cookiecutter.python_version|py_tag, "") }}
15-
stub_binary_revision = 8
18+
stub_binary_revision = 9
1619
icon = "icon.ico"
1720
{% for document_type_id, document_type in cookiecutter.document_types.items() -%}
1821
document_type_icon.{{ document_type_id }} = "{{ cookiecutter.app_name }}-{{ document_type_id }}.ico"
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<WixLocalization Codepage="utf-8" xmlns="http://schemas.microsoft.com/wix/2006/localization">
3-
<String Id="InstallScopeDlgPerMachineDescription">[ProductName] will be installed in a per-machine folder and be available for all users. You must have local Administrator privileges.</String>
1+
<WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl">
2+
<!-- We override this string to remove the sentence "You can change the default
3+
installation folder", which is an option we don't currently offer. -->
4+
<String
5+
Id="InstallScopeDlgPerMachineDescription"
6+
Value="[ProductName] will be installed in a per-machine folder and be available for all users. You must have local Administrator privileges." />
47
</WixLocalization>

0 commit comments

Comments
 (0)