contrib/wix/doc.wxs
author Gregory Szorc <gregory.szorc@gmail.com>
Sat, 10 Mar 2018 10:56:10 -0800
changeset 36856 1f7d9024674c
parent 13042 bd9bc4123920
permissions -rw-r--r--
hgweb: make parsedrequest part of wsgirequest This is kind of ugly. But an upcoming commit will teach parsedrequest about the input stream. Because the input stream is global state and can't be accessed without side-effects, we need to take actions to ensure that multiple consumers don't read from it independently. The easiest way to do this is for one object to hold a reference to both items having access to the input stream so that when a copy is made, we can remove the attribute from the other instance. So we create our parsed request instance from the wsgirequest constructor and hold a reference to it there. This is better than our new type holding a reference to wsgirequest because all the code for managing access will be temporary and we shouldn't pollute parsedrequest with this ugly history. Differential Revision: https://phab.mercurial-scm.org/D2770
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10513
47838dee7d60 contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents: 10502
diff changeset
     1
<?xml version="1.0" encoding="utf-8"?>
47838dee7d60 contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents: 10502
diff changeset
     2
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     3
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     4
  <?include guids.wxi ?>
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 10930
diff changeset
     5
  <?include defines.wxi ?>
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     6
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     7
  <Fragment>
10930
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
     8
    <ComponentGroup Id="docFolder">
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
     9
      <ComponentRef Id="doc.hg.1.html" />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    10
      <ComponentRef Id="doc.hgignore.5.html" />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    11
      <ComponentRef Id="doc.hgrc.5.html" />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    12
      <ComponentRef Id="doc.style.css" />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    13
    </ComponentGroup>
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    14
  </Fragment>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    15
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    16
  <Fragment>
10930
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    17
    <DirectoryRef Id="INSTALLDIR">
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    18
      <Directory Id="docdir" Name="doc" FileSource="$(var.SourceDir)">
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 10930
diff changeset
    19
        <Component Id="doc.hg.1.html" Guid="$(var.doc.hg.1.html.guid)" Win64='$(var.IsX64)'>
10930
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    20
          <File Name="hg.1.html" KeyPath="yes">
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    21
            <Shortcut Id="hg1StartMenu" Directory="ProgramMenuDir"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    22
                      Name="Mercurial Command Reference"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    23
                      Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    24
            />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    25
          </File>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    26
        </Component>
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 10930
diff changeset
    27
        <Component Id="doc.hgignore.5.html" Guid="$(var.doc.hgignore.5.html.guid)" Win64='$(var.IsX64)'>
10930
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    28
          <File Name="hgignore.5.html" KeyPath="yes">
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    29
            <Shortcut Id="hgignore5StartMenu" Directory="ProgramMenuDir"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    30
                      Name="Mercurial Ignore Files"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    31
                      Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    32
            />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    33
          </File>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    34
        </Component>
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 10930
diff changeset
    35
        <Component Id="doc.hgrc.5.html" Guid="$(var.doc.hgrc.5.html)" Win64='$(var.IsX64)'>
10930
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    36
          <File Name="hgrc.5.html" KeyPath="yes">
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    37
            <Shortcut Id="hgrc5StartMenu" Directory="ProgramMenuDir"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    38
                      Name="Mercurial Configuration Files"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    39
                      Icon="hgIcon.ico" IconIndex="0" Advertise="yes"
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    40
            />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    41
          </File>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    42
        </Component>
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 10930
diff changeset
    43
        <Component Id="doc.style.css" Guid="$(var.doc.style.css)" Win64='$(var.IsX64)'>
10930
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    44
          <File Name="style.css" KeyPath="yes" />
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    45
        </Component>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    46
      </Directory>
230ab9a23594 wix updates
Adrian Buehlmann <adrian@cadifra.com>
parents: 10828
diff changeset
    47
    </DirectoryRef>
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    48
  </Fragment>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    49
10513
47838dee7d60 contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents: 10502
diff changeset
    50
</Wix>