Commit Graph

34 Commits

Author SHA1 Message Date
Mads Kiilerich
377db36818 help: fix some instances of 'the the' 2012-07-26 02:54:13 +02:00
Steve Borho
9fbec5585f wix: add phases help text and two more translations (issue 3288) 2012-03-03 23:14:31 -06:00
Martin Geisler
d8334151e6 Remove FSF mailing address from GPL headers
The GPLv3 FAQ suggests to upgrade by

  [...] replace all your existing v2 license notices (usually at the
  top of each file) with the new recommended text available on the GNU
  licenses howto. It's more future-proof because it no longer includes
  the FSF's postal mailing address.

This removes the postal address, but leaves the version number at 2+.
2012-01-06 16:27:13 +01:00
Steve Borho
80262e7e1a wix: add map-commandline.bisect 2012-01-02 20:52:16 -06:00
Steve Borho
123c48ed44 wix: catch up with more added files
revsets:  1.7::tip and adds("mercurial/help/**")
          1.7::tip and adds("mercurial/templates/**")
2011-06-30 12:55:19 -05:00
Adrian Buehlmann
182911e62d wix: add missing templates/paper/diffstat.tmpl 2011-06-29 12:54:34 +02:00
Steve Borho
f81fa9164b wix: a new mercurial.js has replaced graph.js 2011-04-30 11:53:57 -05:00
Steve Borho
ebbe78951f wix: add new file templates/paper/bookmarks.tmpl
This file was snuck onto the stable branch with 77ea38e46cc8
2011-03-18 11:36:36 -05:00
Steve Borho
f6f81fe744 wix: drop bin/ folder from MSI installers (issue 2673)
Also fixes issue 2658.
2011-03-08 10:03:01 -06:00
Adrian Buehlmann
77ab03f101 port win32.py to using the Python ctypes library
The pywin32 package is no longer needed.

ctypes is now required for running Mercurial on Windows.

ctypes is included in Python since version 2.5. For Python 2.4, ctypes is
available as an extra installer package for Windows.

Moved spawndetached() from windows.py to win32.py and fixed it, using
ctypes as well. spawndetached was defunct with Python 2.6.6 because Python
removed their undocumented subprocess.CreateProcess. This fixes
'hg serve -d' on Windows.
2011-02-14 11:12:26 +01:00
Steve Borho
33365c466e wix: add an ssl certificate file to the WiX installers 2010-12-29 18:27:56 -06:00
Steve Borho
1d324e9771 wix: allow x86 MSI packages to be installed on x64 systems 2010-11-26 20:05:16 -06:00
Steve Borho
f2a3ea2967 wix: add support for x64 native MSI packages 2010-11-26 17:40:13 -06:00
Steve Borho
a95ec762fd wix: switch Mercurial Windows installer to use py2exe --bundle 3
--bundle 3 leaves all of the compiled C extensions and other DLLs outside of
the library.zip, so we no longer add the installer folder to the system PATH.
Instead, we now ship a small bin/hg.cmd and it is placed in the PATH.

Switching to py2exe --bundle 3 is necessary because the higher bundle options
are not supported on x64.
2010-11-26 16:18:19 -06:00
Steve Borho
85bbdcc648 wix: add subrepos help text 2010-10-25 10:07:54 -05:00
Steve Borho
44d93504ff wix: add vim syntax file for Mercurial unit tests 2010-10-20 16:45:08 -05:00
Steve Borho
c84eb2535b wix: add new help page templates 2010-10-20 16:41:17 -05:00
Steve Borho
9663c6a39b wix: add new merge-tools.txt help text 2010-10-20 16:27:24 -05:00
Steve Borho
3f177d32a4 wix: generate a new GUID for the help folder
A GUID change is recommended after changes like 857ab17725c0
2010-07-01 19:13:23 -05:00
Steve Borho
a10936e8ce wix: pick up new help topics added between 1.5 and 1.6
These files are not included the 1.6.0 installer, but will be picked up by
nightly builds as soon as this makes it to the stable branch.
2010-07-01 12:53:37 -05:00
Adrian Buehlmann
a3eefcc44b wix: new GUID for contrib.guid
to comply with the component GUID rules of Windows Installer, applied to
the change 5f884a9e81ee
2010-04-27 09:47:33 +02:00
Steve Borho
547e95b96c wix: hgweb file renames 2010-04-26 11:33:37 -05:00
Adrian Buehlmann
5b1887513a wix updates
- using FileSource attribute
- removed unneeded "DiskId='1'"
- all guids are now in guids.wxi
2010-04-16 14:57:30 +02:00
Adrian Buehlmann
c2496a9944 wix: refactor and new guids.wxi 2010-04-04 02:39:45 +02:00
Martin Geisler
79b5361923 Merge with stable 2010-03-19 11:32:55 +01:00
Adrian Buehlmann
bd3cb13c64 wix: don't show version in title of root feature
The version is already shown in the title bar of the feature selection dialog
and in the text of the welcome dialog. It's unusual for Windows programs to repeat
the version in the root feature.
2010-03-19 10:39:01 +01:00
Adrian Buehlmann
1f2b9929e9 wix: use build variable for VC redist source dir 2010-03-19 10:26:19 +01:00
Martin Geisler
3c35180612 Merge with stable 2010-03-17 10:55:28 +01:00
Adrian Buehlmann
3e93d70483 contrib/wix: fix product name to include version
Without this, Mercurial is registered under the installed programs
on Windows as just 'Mercurial', which is unusual for a program to do
on Windows.

Including the version in the registered product name registers the
software in the Windows control panel of installed programs as, for
example, 'Mercurial 1.5' (for 1.5), or as

  'Mercurial 1.5.1032' for a stable 1.5+32-d9a6645d6d9b
  'Mercurial 1.5.5080' for a unstable 1.5+80-1119076dd3e8

when using http://bitbucket.org/tortoisehg/thg-winbuild to create
daily builds.

Furthermore, the install UI texts in the built installer database (MSI
file) are more clear on what the user is about to install, as, for example,
the text in the initial installer dialog now reads

  "The Setup Wizard will install Mercurial 1.5 on your computer"

instead of just

  "The Setup Wizard will install Mercurial on your computer"
2010-03-16 17:39:12 +01:00
Steve Borho
5e4444fb42 wix: pre-check the 'I approve this license' checkbox
This is simply a convenience to the user, they can click next until the
installer goes away.  Optimally, the checkbox would be hidden or removed,
but that requires rewriting the UI.
2010-03-08 11:12:48 -06:00
Adrian Buehlmann
5c235b09fe contrib/wix: add COPYING.rtf
Moving the file from the misc directory of the thg-winbuild repo, which
uses mercurial's contrib/wix.

This file is displayed by the install UI sequence, so it belongs to the
WiX sources quite closely.

It happens to be installed by the msi installer, too.
2010-02-25 14:56:09 +01:00
Adrian Buehlmann
ba12ccbcb7 contrib/wix: switch *.wxs files to LF eol 2010-02-19 21:48:09 +01:00
Adrian Buehlmann
3d25317a13 contrib/wix: MSVC CRT libraries are installed in WinSxS
not in %system32%
2010-02-18 20:47:12 +01:00
Steve Borho
58556829a8 Add WiX installer scripts to contrib/wix 2010-02-18 13:05:15 -06:00