diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 9864d6306..b12086b39 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -26,6 +26,24 @@ if ((Get-Command "mvn" -ErrorAction SilentlyContinue) -eq $null) Write-Host "Unable to find mvn.cmd in your PATH (try: choco install maven)" exit 1 } +if ((Get-Command 'wix' -ErrorAction SilentlyContinue) -eq $null) +{ + Write-Error 'Unable to find wix in your PATH (try: dotnet tool install --global wix --version 6.0.0)' + exit 1 +} +$wixExtensions = & wix.exe extension list --global | Out-String +if ($wixExtensions -notmatch 'WixToolset.UI.wixext') { + Write-Error 'UI wix extension missing. Please install it with: wix.exe extension add WixToolset.UI.wixext/6.0.0 --global)' + exit 1 +} +if ($wixExtensions -notmatch 'WixToolset.Util.wixext') { + Write-Error 'Util wix extension missing. Please install it with: wix.exe extension add WixToolset.Util.wixext/6.0.0 --global)' + exit 1 +} +if ($wixExtensions -notmatch 'WixToolset.BootstrapperApplications.wixext') { + Write-Error 'Util wix extension missing. Please install it with: wix.exe extension add WixToolset.BootstrapperApplications.wixext/6.0.0 --global)' + exit 1 +} $buildDir = Split-Path -Parent $PSCommandPath $version = $(mvn -f $buildDir/../../pom.xml help:evaluate -Dexpression="project.version" -q -DforceStdout) @@ -190,11 +208,14 @@ Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninsta Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi" # create bundle including winfsp -& "$env:WIX\bin\candle.exe" .\bundle\bundleWithWinfsp.wxs -ext WixBalExtension -ext WixUtilextension -out bundle\ ` - -dBundleVersion="$semVerNo.$revisionNo" ` - -dBundleVendor="$Vendor" ` - -dBundleCopyright="$copyright" ` - -dAboutUrl="$AboutUrl" ` - -dHelpUrl="$HelpUrl" ` - -dUpdateUrl="$UpdateUrl" -& "$env:WIX\bin\light.exe" -b . .\bundle\BundlewithWinfsp.wixobj -ext WixBalExtension -ext WixUtilextension -out installer\$AppName-Installer.exe \ No newline at end of file +& wix build ` + -define BundleVersion="$semVerNo.$revisionNo" ` + -define BundleVendor="$Vendor" ` + -define BundleCopyright="$copyright" ` + -define AboutUrl="$AboutUrl" ` + -define HelpUrl="$HelpUrl" ` + -define UpdateUrl="$UpdateUrl" ` + -ext "WixToolset.Util.wixext" ` + -ext "WixToolset.BootstrapperApplications.wixext" ` + .\bundle\bundleWithWinfsp.wxs ` + -out "installer\$AppName-Installer.exe" \ No newline at end of file diff --git a/dist/win/bundle/bundleWithWinfsp.wxs b/dist/win/bundle/bundleWithWinfsp.wxs index 8e009526e..bf18a8e4e 100644 --- a/dist/win/bundle/bundleWithWinfsp.wxs +++ b/dist/win/bundle/bundleWithWinfsp.wxs @@ -1,66 +1,38 @@ - - - - - - - - + + + - + - - - + - - - + + + - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/win/bundle/customBootstrapperTheme.wxl b/dist/win/bundle/customBootstrapperTheme.wxl deleted file mode 100644 index cc464ce9c..000000000 --- a/dist/win/bundle/customBootstrapperTheme.wxl +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - [WixBundleName] Setup - [WixBundleName] - Welcome - This Setup will install [WixBundleName] and additional dependencies on your computer. - Version [WixBundleVersion] - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or - creates a complete local copy of the bundle in directory. Install is the default. - -/passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - [WixBundleName] <a href="#">license terms</a>. - I &agree to the license terms and conditions - &Options - &Install - &Close - Setup Options - Install location: - &Browse - &OK - &Cancel - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Close - Repair Successfully Completed - Uninstall Successfully Completed - Installation Successfully Completed - Setup Successful - &Launch - You must restart your computer before you can use the software. - &Restart - &Close - Setup Failed - Setup Failed - Uninstall Failed - Repair Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - Files In Use - The following applications are using files that need to be updated: - Close the &applications and attempt to restart them. - &Do not close applications. A reboot will be required. - &OK - &Cancel - No action was taken as a system reboot is required. - diff --git a/dist/win/bundle/customBootstrapperTheme.xml b/dist/win/bundle/customBootstrapperTheme.xml deleted file mode 100644 index ef986bd27..000000000 --- a/dist/win/bundle/customBootstrapperTheme.xml +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - #(loc.Caption) - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - #(loc.Title) - - - - #(loc.Title) - #(loc.HelpHeader) - #(loc.HelpText) - - - - #(loc.Title) - - #(loc.InstallHeader) - #(loc.InstallMessage) - - #(loc.InstallAcceptCheckbox) - #(loc.InstallVersion) - - - - - - #(loc.Title) - #(loc.FilesInUseHeader) - #(loc.FilesInUseLabel) - A - - - - - - - - - #(loc.Title) - - #(loc.ProgressHeader) - #(loc.ProgressLabel) - #(loc.OverallProgressPackageText) - - - - - - #(loc.Title) - #(loc.ModifyHeader) - - - - - - #(loc.Title) - - #(loc.SuccessHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) - #(loc.SuccessUninstallHeader) - - #(loc.SuccessRestartText) - - - - - #(loc.Title) - - #(loc.FailureHeader) - #(loc.FailureInstallHeader) - #(loc.FailureUninstallHeader) - #(loc.FailureRepairHeader) - #(loc.FailureHyperlinkLogText) - - #(loc.FailureRestartText) - - - - diff --git a/dist/win/bundle/resources/customBootstrapperTheme.wxl b/dist/win/bundle/resources/customBootstrapperTheme.wxl new file mode 100644 index 000000000..f292f6833 --- /dev/null +++ b/dist/win/bundle/resources/customBootstrapperTheme.wxl @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/win/bundle/resources/customBootstrapperTheme.xml b/dist/win/bundle/resources/customBootstrapperTheme.xml new file mode 100644 index 000000000..9a76faa44 --- /dev/null +++ b/dist/win/bundle/resources/customBootstrapperTheme.xml @@ -0,0 +1,133 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + + + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + +