( )⚙ D6187 wix: fix the package build when not adding features

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6187

wix: fix the package build when not adding features
ClosedPublic

Authored by durin42 on Apr 3 2019, 12:05 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG429bed755ce1: wix: fix the package build when not adding features
Summary

Should have used ifdef, not if. Sigh.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Apr 3 2019, 12:05 AM
Closed by commit rHG429bed755ce1: wix: fix the package build when not adding features (authored by durin42). · Explain WhyApr 3 2019, 7:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14644

contrib/packaging/wix/mercurial.wxs

<ComponentRef Id='COPYING' /> <ComponentRef Id='COPYING' />
<ComponentRef Id='mercurial.rc' /> <ComponentRef Id='mercurial.rc' />
<ComponentRef Id='mergetools.rc' /> <ComponentRef Id='mergetools.rc' />
<ComponentGroupRef Id='helpFolder' /> <ComponentGroupRef Id='helpFolder' />
<ComponentGroupRef Id='templatesFolder' /> <ComponentGroupRef Id='templatesFolder' />
<MergeRef Id='VCRuntime' /> <MergeRef Id='VCRuntime' />
<MergeRef Id='VCRuntimePolicy' /> <MergeRef Id='VCRuntimePolicy' />
</Feature> </Feature>
<?if $(var.MercurialExtraFeatures)?> <?ifdef MercurialExtraFeatures?>
<?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?> <?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?>
<FeatureRef Id="$(var.EXTRAFEAT)" /> <FeatureRef Id="$(var.EXTRAFEAT)" />
<?endforeach?> <?endforeach?>
<?endif?> <?endif?>
<Feature Id='Locales' Title='Translations' Description='Translations' Level='1'> <Feature Id='Locales' Title='Translations' Description='Translations' Level='1'>
<ComponentGroupRef Id='localeFolder' /> <ComponentGroupRef Id='localeFolder' />
<ComponentRef Id='i18nFolder' /> <ComponentRef Id='i18nFolder' />
</Feature> </Feature>