contrib/wix/defines.wxi
author Martin von Zweigbergk <martinvonz@google.com>
Wed, 03 Dec 2014 15:03:29 -0800
changeset 23463 bb0143e12f35
parent 13042 bd9bc4123920
permissions -rw-r--r--
graft: use a real conflict for the tests One of the graft tests grafts a changeset that changes a file's content from 'a' to 'b' onto a branch that has changed the file's content from 'a', via 'b', and then back to 'a' again. To prepare for not considering this a file in need of merging, let's use 'c' as the file's new content to make sure it has to be considered conflicting. There's a second similar case further down where an ancestor is grafted. Make sure that is also considered a conflict.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     1
<Include>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     2
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     3
  <?if $(var.Platform) = "x64" ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     4
    <?define IsX64 = yes ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     5
  <?else?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     6
    <?define IsX64 = no ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     7
  <?endif?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     8
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
     9
</Include>