merge with stable
authorSteve Borho <steve@borho.org>
Sat, 08 Jan 2011 22:15:19 -0600
changeset 13247 af50a62e9c20
parent 13245 0b2407ee081b (current diff)
parent 13246 a01c52b08c5f (diff)
child 13250 1a4330e30017
merge with stable
--- a/contrib/win32/mercurial.iss	Fri Jan 07 19:15:21 2011 +0100
+++ b/contrib/win32/mercurial.iss	Sat Jan 08 22:15:19 2011 -0600
@@ -83,6 +83,7 @@
 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
 Source: dist\library.zip; DestDir: {app}
 Source: dist\add_path.exe; DestDir: {app}
+Source: dist\cacert.pem; Destdir: {app}
 Source: doc\*.html; DestDir: {app}\Docs
 Source: doc\style.css; DestDir: {app}\Docs
 Source: mercurial\help\*.txt; DestDir: {app}\help
@@ -93,6 +94,7 @@
 
 [INI]
 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/
+Filename: {app}\Mercurial.ini; Section: web; Key: cacerts; String: {app}\cacert.pem
 
 [UninstallDelete]
 Type: files; Name: {app}\Mercurial.url
--- a/contrib/win32/win32-build.txt	Fri Jan 07 19:15:21 2011 +0100
+++ b/contrib/win32/win32-build.txt	Sat Jan 08 22:15:19 2011 -0600
@@ -34,7 +34,7 @@
   Inno Setup
       http://www.jrsoftware.org/isdl.php#qsp
 
-      Get and install ispack-5.3.10.exe which includes Inno Setup Processor,
+      Get and install ispack-5.3.10.exe or later (includes Inno Setup Processor),
       which is necessary to package Mercurial.
 
   ISTool - optional
@@ -46,6 +46,9 @@
   Docutils
       http://docutils.sourceforge.net/
 
+  CA Certs file
+      http://curl.haxx.se/ca/cacert.pem
+
 And, of course, Mercurial itself.
 
 Once you have all this installed and built, clone a copy of the
@@ -73,7 +76,7 @@
     "C:\Program Files\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86_amd64
     python setup.py py2exe -b 3
 
-Copy add_path.exe into the dist directory that just got created.
+Copy add_path.exe and cacert.pem files into the dist directory that just got created.
 
 If you are using Python up to version 2.5.4, copy mfc71.dll into the dist
 directory that just got created.