# HG changeset patch # User Vadim Gelfer # Date 1149202494 25200 # Node ID 609c56df709a884895cc61430f877d8b6bcd6487 # Parent 74d569332f8b46895e34a37a1182648bd403e795# Parent 280fde4b8701b19481fb8f3e312e29500a7b078d merge with crew. diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -24,3 +24,4 @@ mercurial/__version__.py syntax: regexp ^\.pc/ +Output/Mercurial-[0-9.]*.exe diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html --- a/contrib/win32/ReadMe.html +++ b/contrib/win32/ReadMe.html @@ -31,51 +31,7 @@ href="http://www.selenic.com/mercurial">Mercurial web site.

By default, Mercurial installs to C:\Mercurial. The - Mercurial command is called hg.exe. To run this - command, the install directory must be in your search path.

- -

Setting your search path temporarily

- -

To set your search path temporarily, type the following into a - command prompt window:

- -
-set PATH=C:\Mercurial;%PATH%
-
- -

Setting your search path permanently

- -

To set your search path permanently, perform the following - steps. These instructions are for Windows NT, 2000 and XP.

- -
    -
  1. Open the Control Panel. Under Windows XP, select the - "Classic View".
  2. - -
  3. Double-click on the "System" control panel.
  4. - -
  5. Click on the "Advanced" tab.
  6. - -
  7. Click on "Environment Variables". You'll find this near the - bottom of the window.
  8. - -
  9. Under "System variables", you will see "Path". Double-click - it.
  10. - -
  11. Edit "Variable value". Each path element is separated by a - semicolon (";") character. Append a semicolon to the end of the - list, followed by the path where you installed Mercurial - (e.g. C:\Mercurial).
  12. - -
  13. Click on the various "OK" buttons until you've completely - exited from the System control panel.
  14. - -
  15. Log out and log back in, or restart your system.
  16. - -
  17. The next time you run the Windows command prompt, you will be - able to run the hg command without any special - help.
  18. -
+ Mercurial command is called hg.exe.

Testing Mercurial after you've installed it

diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss --- a/contrib/win32/mercurial.iss +++ b/contrib/win32/mercurial.iss @@ -38,6 +38,7 @@ Source: dist\library.zip; DestDir: {app} Source: dist\mfc71.dll; DestDir: {sys}; Flags: sharedfile uninsnosharedfileprompt Source: dist\msvcr71.dll; DestDir: {sys}; Flags: sharedfile uninsnosharedfileprompt Source: dist\w9xpopen.exe; DestDir: {app} +Source: dist\add_path.exe; DestDir: {app} Source: doc\*.txt; DestDir: {app}\Docs Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt @@ -55,3 +56,9 @@ Type: files; Name: {app}\Mercurial.url Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.txt Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url + +[Run] +Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "Add the installation path to the search path" + +[UninstallRun] +Filename: "{app}\add_path.exe"; Parameters: "/del {app}" diff --git a/contrib/win32/win32-build.txt b/contrib/win32/win32-build.txt --- a/contrib/win32/win32-build.txt +++ b/contrib/win32/win32-build.txt @@ -24,6 +24,9 @@ It has the following prerequisites, at l ISTool http://www.istool.org/default.aspx/ + add_path (you need only add_path.exe in the zip file) + http://www.barisione.org/apps.html#add_path + And, of course, Mercurial itself. Once you have all this installed and built, clone a copy of the @@ -34,7 +37,8 @@ In a shell, build a standalone copy of t python setup.py build -c mingw32 py2exe -b 1 -Copy mfc71.dll into the dist directory that just got created. +Copy mfc71.dll and add_path.exe into the dist directory that just +got created. Run ISTool, and open the C:\hg\hg-release\contrib\win32\mercurial.iss file.