Patchwork D6187: wix: fix the package build when not adding features

login
register
mail settings
Submitter phabricator
Date April 3, 2019, 11:08 p.m.
Message ID <f3287044f852a69a1ef24cf02f102623@localhost.localdomain>
Download mbox | patch
Permalink /patch/39466/
State Not Applicable
Headers show

Comments

phabricator - April 3, 2019, 11:08 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG429bed755ce1: wix: fix the package build when not adding features (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6187?vs=14637&id=14644

REVISION DETAIL
  https://phab.mercurial-scm.org/D6187

AFFECTED FILES
  contrib/packaging/wix/mercurial.wxs

CHANGE DETAILS




To: durin42, indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/contrib/packaging/wix/mercurial.wxs b/contrib/packaging/wix/mercurial.wxs
--- a/contrib/packaging/wix/mercurial.wxs
+++ b/contrib/packaging/wix/mercurial.wxs
@@ -129,7 +129,7 @@ 
         <MergeRef Id='VCRuntime' />
         <MergeRef Id='VCRuntimePolicy' />
       </Feature>
-      <?if $(var.MercurialExtraFeatures)?>
+      <?ifdef MercurialExtraFeatures?>
         <?foreach EXTRAFEAT in $(var.MercurialExtraFeatures)?>
           <FeatureRef Id="$(var.EXTRAFEAT)" />
         <?endforeach?>