contrib/wix/help.wxs
author Mads Kiilerich <madski@unity3d.com>
Tue, 22 Apr 2014 02:10:25 +0200
changeset 21391 cb15835456cb
parent 16220 939f043ab5ed
child 26119 65d2538ac993
permissions -rw-r--r--
merge: change debug logging - test output changes but no real changes Preparing for action list split-up, making sure the final change don't have any test changes. The patch moves debug statements around without really changing anything. Arguably, it temporarily makes the code worse. The only justification is that it makes it easier to review the test changes ... and in the end the big change will not change test output at all. The changes to test output are due to changes in the ordering of debug output. That is mainly because we now do the debug logging for files when we actually process them. Files are also processed in a slightly different but still correct order. It is now primarily ordered by action type, secondarily by filename. The patch introduces some redundancy. Some of it will be removed again, some of it will in the end help code readability and efficiency. It is possible that we later on could introduce a "process this action list and do some logging and progress reporting and apply this function". The "preserving X for resolve" debug statements will only have single space indentation. It will no longer have a leading single space indented "f: msg -> m" message. Having this message double indented would thus no longer make sense. The bid actions will temporarily be sorted using a custom sort key that happens to match the sort order the simplified code will have in the end.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     1
<?xml version="1.0" encoding="utf-8"?>
10513
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: 12830
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>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     8
    <DirectoryRef Id="INSTALLDIR">
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
     9
      <Directory Id="helpdir" Name="help" FileSource="$(var.SourceDir)">
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents: 12830
diff changeset
    10
        <Component Id="helpFolder" Guid="$(var.helpFolder.guid)" Win64='$(var.IsX64)'>
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    11
          <File Name="config.txt" KeyPath="yes" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    12
          <File Name="dates.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    13
          <File Name="diffs.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    14
          <File Name="environment.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    15
          <File Name="extensions.txt" />
14819
b30c889584ef wix: catch up with more added files
Steve Borho <steve@borho.org>
parents: 13042
diff changeset
    16
          <File Name="filesets.txt" />
11491
159233cc9c14 wix: pick up new help topics added between 1.5 and 1.6
Steve Borho <steve@borho.org>
parents: 10828
diff changeset
    17
          <File Name="glossary.txt" />
14819
b30c889584ef wix: catch up with more added files
Steve Borho <steve@borho.org>
parents: 13042
diff changeset
    18
          <File Name="hgignore.txt" />
11491
159233cc9c14 wix: pick up new help topics added between 1.5 and 1.6
Steve Borho <steve@borho.org>
parents: 10828
diff changeset
    19
          <File Name="hgweb.txt" />
12790
6c619c2e8778 wix: add new merge-tools.txt help text
Steve Borho <steve@borho.org>
parents: 11491
diff changeset
    20
          <File Name="merge-tools.txt" />
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    21
          <File Name="multirevs.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    22
          <File Name="patterns.txt" />
16220
939f043ab5ed wix: add phases help text and two more translations (issue 3288)
Steve Borho <steve@borho.org>
parents: 14819
diff changeset
    23
          <File Name="phases.txt" />
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    24
          <File Name="revisions.txt" />
11491
159233cc9c14 wix: pick up new help topics added between 1.5 and 1.6
Steve Borho <steve@borho.org>
parents: 10828
diff changeset
    25
          <File Name="revsets.txt" />
12830
d8205dacf9a3 wix: add subrepos help text
Steve Borho <steve@borho.org>
parents: 12790
diff changeset
    26
          <File Name="subrepos.txt" />
10828
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    27
          <File Name="templates.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    28
          <File Name="urls.txt" />
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    29
        </Component>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    30
      </Directory>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    31
    </DirectoryRef>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    32
  </Fragment>
1aa9464ce9ae wix: refactor and new guids.wxi
Adrian Buehlmann <adrian@cadifra.com>
parents: 10513
diff changeset
    33
10513
47838dee7d60 contrib/wix: switch *.wxs files to LF eol
Adrian Buehlmann <adrian@cadifra.com>
parents: 10502
diff changeset
    34
</Wix>