Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows Installer: Upgrade to WiX Toolset 5 #929

Open
wants to merge 23 commits into
base: main
Choose a base branch
from

Commits on Oct 27, 2024

  1. Configuration menu
    Copy the full SHA
    a22d844 View commit details
    Browse the repository at this point in the history
  2. Fix: Make generated WiX authoring pass WixCop checks

    WixCop.exe is a built in formatting tool that comes with WiX toolset v3. This fixes `wix convert` command not beins able to run
    jkarasti committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    99f231b View commit details
    Browse the repository at this point in the history
  3. Change: Stop generating an XML declaration at the top of the WiX auth…

    …oring
    
    It's not needed anymore.
    jkarasti committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    6e2659b View commit details
    Browse the repository at this point in the history
  4. Change: Update WiX schema namespace

    Also rename `root_el` to `wix_el`.
    
    WiX version 5 uses the same namespace.
    jkarasti committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    b2c085c View commit details
    Browse the repository at this point in the history
  5. Change: Rename INSTALLDIR to INSTALLFOLDER

    It's the new default name for it
    jkarasti committed Oct 27, 2024
    Configuration menu
    Copy the full SHA
    3357b30 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. Change: Merge Product into Package element

    - The Keywords and Description items move under a new SummaryInformation element.
    - Shuffle things around so that elements previously under the product element are now under the Package element.
    - Rename SummaryCodepage in SummaryInformation to Codepage and remove a duplicate Manufacturer item.
    - Remove InstallerVersion and let WiX set it to default value. (500 a.k.a Windows 7)
    jkarasti committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    3df5c0d View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2024

  1. Change: Disable AllowSameVersionUpgrades

    Since running `wix msi validate` with it set to `yes` causes an error.
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    9a87e64 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    28b555a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e6f5a25 View commit details
    Browse the repository at this point in the history
  4. Change: Convert Wix UI extension authoring to WiX Toolset v5

    Due to limitations of the xml.etree.ElementTree library, add the items in the root element as a dictionary
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    68cd96a View commit details
    Browse the repository at this point in the history
  5. Change: Swap Media element with MediaTemplate

    This is a new default and makes authoring slightly simpler without any functional changes.
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    410beea View commit details
    Browse the repository at this point in the history
  6. Refactor: Simplify build_data() function

    - Rename variables to be more clear about what they do:
    - reorganise code
    - simplify a few checks
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    c7e3f99 View commit details
    Browse the repository at this point in the history
  7. Change: Wrap all files to be included in the .msi in a `ComponentGrou…

    …pRef`
    
    With this, all the files are organised into Components,
    each of which points to a Directory defined in the StandardDirectory element.
    This simplifies the Feature element considerable as only thing it needs to
    include everything in the built msi is a reference to `ApplicationComponents`
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    2b73427 View commit details
    Browse the repository at this point in the history
  8. Refactor: build_dir_xml() function

    - rename for clarity
    - remove unnecessary checks
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    02c8396 View commit details
    Browse the repository at this point in the history
  9. Change: Write dangerzone version and upgradecode into Package and Sum…

    …maryInformation elements directly
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    9da6070 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    3906280 View commit details
    Browse the repository at this point in the history
  11. Change: Write Dangerzone.wxs inside the script directly

    Also reduce duplication slightly by definig `build_dir`, `cx_freeze_dir` and `dist_dir`
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    ada9f47 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0767e01 View commit details
    Browse the repository at this point in the history
  13. Change: Update the build-app.bat script to work with WiX Toolset v5

    - WiX Toolset v3 used to validate the msi package by default. In v5 that has moved to a new command, so add a new validation step to the script.
    
    - Also emove the step that uses `insignia.exe` to sign the Dangerzone.msi with the digital signatures from its external cab archives.
    
      In WiX Toolset v4 and newer, insignia is replaced with a new command `wix msi inscribe`, but we tell wix to embed the cabinets into the .msi
      (That's what`EmbedCab="yes"` in the Media / MediaTemplate element does) so singning them separately is not necessary. [0]
    
      [0] https://wixtoolset.org/docs/tools/signing/
    jkarasti committed Nov 11, 2024
    Configuration menu
    Copy the full SHA
    63dbe6a View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    3eaa89f View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    945f184 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    a900a7c View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2024

  1. Fixup: Tweak wix install doc

    jkarasti committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    8cb83ca View commit details
    Browse the repository at this point in the history