contrib/wix/dist.wxs
author Martin von Zweigbergk <martinvonz@google.com>
Wed, 21 Mar 2018 10:46:00 -0700
changeset 37034 74f91bec6991
parent 33581 e12c3049af8e
child 37569 2025bf60adb2
permissions -rw-r--r--
rebase: register status file generator only once when using single transaction rebase.storestatus() behaved differently depending on whether a transaction is passed to it. If a transaction is passed, it registers a "file generator" that runs when the transaction commits. If no transaction was passed, it writes the rebase state immediately. This imprecise timing of the writing makes it hard to reason about, so let's make it more explicit which behavior we're getting by checking if we have a transaction before calling it. For the single-transaction case, move the call to storestatus(tr) early and do it only once since it's only going to write the file (at most) once anyway. Differential Revision: https://phab.mercurial-scm.org/D2912
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13041
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
     1
<?xml version="1.0" encoding="utf-8"?>
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
     2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
     3
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
     4
  <?include guids.wxi ?>
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 13041
diff changeset
     5
  <?include defines.wxi ?>
13041
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
     6
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
     7
  <Fragment>
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
     8
    <DirectoryRef Id="INSTALLDIR" FileSource="$(var.SourceDir)">
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 13041
diff changeset
     9
      <Component Id="distOutput" Guid="$(var.dist.guid)" Win64='$(var.IsX64)'>
25409
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    10
        <File Name="python27.dll" KeyPath="yes" />
13041
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
    11
      </Component>
25409
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    12
      <Directory Id="libdir" Name="lib" FileSource="$(var.SourceDir)/lib">
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    13
        <Component Id="libOutput" Guid="$(var.lib.guid)" Win64='$(var.IsX64)'>
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    14
          <File Name="library.zip" KeyPath="yes" />
32407
008d37c4d783 base85: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents: 32406
diff changeset
    15
          <File Name="mercurial.cext.base85.pyd" />
32408
3b88a7fa97d8 bdiff: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents: 32407
diff changeset
    16
          <File Name="mercurial.cext.bdiff.pyd" />
32409
017ad85e5ac8 diffhelpers: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents: 32408
diff changeset
    17
          <File Name="mercurial.cext.diffhelpers.pyd" />
32410
151cc3b3d799 mpatch: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents: 32409
diff changeset
    18
          <File Name="mercurial.cext.mpatch.pyd" />
32406
a9c71d578a1c osutil: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents: 25409
diff changeset
    19
          <File Name="mercurial.cext.osutil.pyd" />
32411
df448de7cf3b parsers: switch to policy importer
Yuya Nishihara <yuya@tcha.org>
parents: 32410
diff changeset
    20
          <File Name="mercurial.cext.parsers.pyd" />
32128
5e1a91f693f0 wix: include zstd.pyd in the installation
Matt Harbison <matt_harbison@yahoo.com>
parents: 25409
diff changeset
    21
          <File Name="mercurial.zstd.pyd" />
33581
e12c3049af8e wix: update list of necessary pyd files
Steve Borho <steve@borho.org>
parents: 32674
diff changeset
    22
          <File Name="hgext.fsmonitor.pywatchman.bser.pyd" />
25409
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    23
          <File Name="pyexpat.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    24
          <File Name="bz2.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    25
          <File Name="select.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    26
          <File Name="unicodedata.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    27
          <File Name="_ctypes.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    28
          <File Name="_elementtree.pyd" />
33581
e12c3049af8e wix: update list of necessary pyd files
Steve Borho <steve@borho.org>
parents: 32674
diff changeset
    29
          <File Name="_testcapi.pyd" />
25409
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    30
          <File Name="_hashlib.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    31
          <File Name="_socket.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    32
          <File Name="_ssl.pyd" />
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    33
        </Component>
95e042d77a5f wix: move library.zip and all *.pyd into a lib/ folder
Steve Borho <steve@borho.org>
parents: 17389
diff changeset
    34
      </Directory>
13041
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
    35
    </DirectoryRef>
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
    36
  </Fragment>
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
    37
79388a8325dc wix: switch Mercurial Windows installer to use py2exe --bundle 3
Steve Borho <steve@borho.org>
parents:
diff changeset
    38
</Wix>