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

Introduce new namespace and solve duplicate key issue #802

Merged
merged 9 commits into from Jun 9, 2016

Conversation

smoes
Copy link
Contributor

@smoes smoes commented Jun 2, 2016

…4 by default but can be overridden by user.
Fixes issue #780 and allows using the newest Wix toolset.

@smoes
Copy link
Contributor Author

smoes commented Jun 2, 2016

The AppVeyor build failure is due to the standard major version being 4, but it is using 3. Please add wixMajorVersion := 3 to test settings.

@@ -57,6 +57,8 @@ object WindowsPlugin extends AutoPlugin {
"-cultures:en-us"),
wixProductId := WixHelper.makeGUID,
wixProductUpgradeId := WixHelper.makeGUID,
wixMajorVersion := 4,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change this to 3, so we remain backwards compatible and the tests run.

@muuki88 muuki88 added the windows label Jun 3, 2016
@muuki88
Copy link
Contributor

muuki88 commented Jun 3, 2016

Code looks good. Please add some documentation. You can build the docs with this guide

Also an additional windows test would be nice, it seems appveyor only supports Wix 3.10.

@smoes
Copy link
Contributor Author

smoes commented Jun 6, 2016

Now also resolves issue #781.
I removed the auto start menu shortcut generation for config files, since that should be left to the user anyways. That resolves the conflict of two coexisting AddShortCut WindowsFeatures. Config files still can be added to the start menu manually.

Edit: Ugghhh different setup on AppVeyor as it seems.

@smoes
Copy link
Contributor Author

smoes commented Jun 6, 2016

So the final solution for #781 was different than I expected:

The RemoveFolder directive has nothing to do with shortcuts. I re-inserted the previous standard shortcuts for the config files but removed the RemoveFolder directive for ApplicationFolder from the AddShortcuts xml. It was moved to ApplicationFolder itself so that it appears only once in the very right spot, independent of shortcuts.

@smoes smoes changed the title Add support for Wix4 namespace. Add new key wixMajorVersion, that is … Introduce new namespace #780 and solve duplicate key issue #781 Jun 6, 2016
@smoes smoes changed the title Introduce new namespace #780 and solve duplicate key issue #781 Introduce new namespace and solve duplicate key issue Jun 6, 2016
@muuki88
Copy link
Contributor

muuki88 commented Jun 7, 2016

LGTM. I will try t o test it this week on my windows machine.

@nazoking do you have time to test this as well?

@muuki88 muuki88 merged commit 8eb636d into sbt:master Jun 9, 2016
@smoes smoes deleted the add-wix4-namespaces branch June 9, 2016 20:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants