Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
authorLee Cantey <lcantey@gmail.com>
Mon, 18 Jun 2007 15:21:02 -0700
changeset 4629 a04b5f37eda7
parent 4628 02956be66a58
child 4630 e6d105a51ec7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer. Initial version from Shun-ichi GOTO in BTS 449 for private copies of DLLs. Additional changes to remove local DLL flag on uninstall and set privilege level.
contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss	Mon Jun 18 15:14:49 2007 -0700
+++ b/contrib/win32/mercurial.iss	Mon Jun 18 15:21:02 2007 -0700
@@ -25,17 +25,18 @@
 SetupIconFile=contrib\favicon.ico
 AllowNoIcons=true
 DefaultGroupName=Mercurial
+PrivilegesRequired=none
 
 [Files]
-Source: ..\..\msys\1.0\bin\patch.exe; DestDir: {app}
 Source: contrib\mercurial.el; DestDir: {app}/Contrib
 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme
 Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Flags: confirmoverwrite
 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
-Source: dist\hg.exe; DestDir: {app}
+Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
 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\patch.exe; DestDir: {app}
+Source: dist\mfc71.dll; DestDir: {app}
+Source: dist\msvcr71.dll; DestDir: {app}
 Source: dist\w9xpopen.exe; DestDir: {app}
 Source: dist\add_path.exe; DestDir: {app}
 Source: doc\*.txt; DestDir: {app}\Docs
@@ -59,3 +60,12 @@
 
 [UninstallRun]
 Filename: "{app}\add_path.exe"; Parameters: "/del {app}"
+
+[UninstallDelete]
+Type: files; Name: "{app}\hg.exe.local"
+
+[Code]
+procedure Touch(fn: String);
+begin
+  SaveStringToFile(ExpandConstant(fn), '', False);
+end;