# HG changeset patch # User Gregory Szorc # Date 1552001862 28800 # Node ID c68a1df5c79a0696e5e01f01cf2f1ab16e43d9e1 # Parent 3dbd3cdfe0d660efd0233e9cbfd0a055b6840e68 wix: move contrib/wix to contrib/packaging/wix We're trying to consolidate all our packaging code into contrib/packaging. Let's move the WiX files there. Differential Revision: https://phab.mercurial-scm.org/D6096 diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/COPYING.rtf diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/README.txt Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,29 @@ +WiX installer source files +========================== + +The files in this folder are used by the thg-winbuild [1] package +building architecture to create a Mercurial MSI installer. These files +are versioned within the Mercurial source tree because the WXS files +must kept up to date with distribution changes within their branch. In +other words, the default branch WXS files are expected to diverge from +the stable branch WXS files. Storing them within the same repository is +the only sane way to keep the source tree and the installer in sync. + +The MSI installer builder uses only the mercurial.ini file from the +contrib/win32 folder. + +The MSI packages built by thg-winbuild require elevated (admin) +privileges to be installed due to the installation of MSVC CRT libraries +under the C:\WINDOWS\WinSxS folder. Thus the InnoSetup installers may +still be useful to some users. + +To build your own MSI packages, clone the thg-winbuild [1] repository +and follow the README.txt [2] instructions closely. There are fewer +prerequisites for a WiX [3] installer than an InnoSetup installer, but +they are more specific. + +Direct questions or comments to Steve Borho + +[1] http://bitbucket.org/tortoisehg/thg-winbuild +[2] http://bitbucket.org/tortoisehg/thg-winbuild/src/tip/README.txt +[3] http://wix.sourceforge.net/ diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/contrib.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/contrib.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/defines.wxi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/defines.wxi Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,9 @@ + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/dist.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/dist.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/doc.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/doc.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/guids.wxi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/guids.wxi Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/help.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/help.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/i18n.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/i18n.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/locale.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/locale.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/mercurial.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/mercurial.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + VersionNT >= 501 + + + + + + + + mercurial@mercurial-scm.org + https://mercurial-scm.org/wiki/ + https://mercurial-scm.org/about/ + https://mercurial-scm.org/downloads/ + https://mercurial-scm.org/wiki/Support + hgIcon.ico + + + amus + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/packaging/wix/templates.wxs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/contrib/packaging/wix/templates.wxs Thu Mar 07 15:37:42 2019 -0800 @@ -0,0 +1,251 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/COPYING.rtf diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/README.txt --- a/contrib/wix/README.txt Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -WiX installer source files -========================== - -The files in this folder are used by the thg-winbuild [1] package -building architecture to create a Mercurial MSI installer. These files -are versioned within the Mercurial source tree because the WXS files -must kept up to date with distribution changes within their branch. In -other words, the default branch WXS files are expected to diverge from -the stable branch WXS files. Storing them within the same repository is -the only sane way to keep the source tree and the installer in sync. - -The MSI installer builder uses only the mercurial.ini file from the -contrib/win32 folder. - -The MSI packages built by thg-winbuild require elevated (admin) -privileges to be installed due to the installation of MSVC CRT libraries -under the C:\WINDOWS\WinSxS folder. Thus the InnoSetup installers may -still be useful to some users. - -To build your own MSI packages, clone the thg-winbuild [1] repository -and follow the README.txt [2] instructions closely. There are fewer -prerequisites for a WiX [3] installer than an InnoSetup installer, but -they are more specific. - -Direct questions or comments to Steve Borho - -[1] http://bitbucket.org/tortoisehg/thg-winbuild -[2] http://bitbucket.org/tortoisehg/thg-winbuild/src/tip/README.txt -[3] http://wix.sourceforge.net/ diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/contrib.wxs --- a/contrib/wix/contrib.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/defines.wxi --- a/contrib/wix/defines.wxi Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/dist.wxs --- a/contrib/wix/dist.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/doc.wxs --- a/contrib/wix/doc.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/guids.wxi --- a/contrib/wix/guids.wxi Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/help.wxs --- a/contrib/wix/help.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/i18n.wxs --- a/contrib/wix/i18n.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/locale.wxs --- a/contrib/wix/locale.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/mercurial.wxs --- a/contrib/wix/mercurial.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,162 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - VersionNT >= 501 - - - - - - - - mercurial@mercurial-scm.org - https://mercurial-scm.org/wiki/ - https://mercurial-scm.org/about/ - https://mercurial-scm.org/downloads/ - https://mercurial-scm.org/wiki/Support - hgIcon.ico - - - amus - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a contrib/wix/templates.wxs --- a/contrib/wix/templates.wxs Fri Mar 08 10:33:05 2019 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3dbd3cdfe0d6 -r c68a1df5c79a tests/test-install.t --- a/tests/test-install.t Fri Mar 08 10:33:05 2019 -0800 +++ b/tests/test-install.t Thu Mar 07 15:37:42 2019 -0800 @@ -196,7 +196,7 @@ > > tracked = [f for f in hgdirectory(sys.argv[1])] > - > xml = ET.parse("%s/../contrib/wix/%s.wxs" % (testdir, sys.argv[1])) + > xml = ET.parse("%s/../contrib/packaging/wix/%s.wxs" % (testdir, sys.argv[1])) > root = xml.getroot() > dir = root.find('.//{%(wix)s}DirectoryRef' % ns) >