Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/win32/mercurial.iss @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 4da2149b63a1 |
children |
rev | line source |
---|---|
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
1 ; Script generated by the Inno Setup Script Wizard. |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
3 |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
4 [Setup] |
4383
1bcf38111877
Update copyright year and change to range
Lee Cantey <lcantey@gmail.com>
parents:
3863
diff
changeset
|
5 AppCopyright=Copyright 2005-2007 Matt Mackall and others |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 AppName=Mercurial |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
3617
diff
changeset
|
7 AppVerName=Mercurial snapshot |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
8 InfoAfterFile=contrib/win32/postinstall.txt |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 LicenseFile=COPYING |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
10 ShowLanguageDialog=yes |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
11 AppPublisher=Matt Mackall and others |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
12 AppPublisherURL=http://www.selenic.com/mercurial |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
13 AppSupportURL=http://www.selenic.com/mercurial |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
14 AppUpdatesURL=http://www.selenic.com/mercurial |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3} |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
16 AppContact=mercurial@selenic.com |
3863
1ef8ada4370f
Remove hard-coded version numbers and release notes from packaging
Matt Mackall <mpm@selenic.com>
parents:
3617
diff
changeset
|
17 OutputBaseFilename=Mercurial-snapshot |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
18 DefaultDirName={sd}\Mercurial |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
19 SourceDir=C:\hg\hg-release |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
20 VersionInfoDescription=Mercurial distributed SCM |
4383
1bcf38111877
Update copyright year and change to range
Lee Cantey <lcantey@gmail.com>
parents:
3863
diff
changeset
|
21 VersionInfoCopyright=Copyright 2005-2007 Matt Mackall and others |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
22 VersionInfoCompany=Matt Mackall and others |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
23 InternalCompressLevel=max |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
24 SolidCompression=true |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
25 SetupIconFile=contrib\favicon.ico |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
26 AllowNoIcons=true |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
27 DefaultGroupName=Mercurial |
4629
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
28 PrivilegesRequired=none |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
29 |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
30 [Files] |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
31 Source: contrib\mercurial.el; DestDir: {app}/Contrib |
1844
b768f3ae0c2c
Remove patchbomb from list of contrib files to install since it's now an extension.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
32 Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme |
b768f3ae0c2c
Remove patchbomb from list of contrib files to install since it's now an extension.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
33 Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; Flags: confirmoverwrite |
b768f3ae0c2c
Remove patchbomb from list of contrib files to install since it's now an extension.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
34 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt |
4629
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
35 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local') |
1844
b768f3ae0c2c
Remove patchbomb from list of contrib files to install since it's now an extension.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
36 Source: dist\library.zip; DestDir: {app} |
4629
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
37 Source: dist\patch.exe; DestDir: {app} |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
38 Source: dist\mfc71.dll; DestDir: {app} |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
39 Source: dist\msvcr71.dll; DestDir: {app} |
1844
b768f3ae0c2c
Remove patchbomb from list of contrib files to install since it's now an extension.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
40 Source: dist\w9xpopen.exe; DestDir: {app} |
2384
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
41 Source: dist\add_path.exe; DestDir: {app} |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
42 Source: doc\*.txt; DestDir: {app}\Docs |
4829
4da2149b63a1
Add html docs and use for help shortcut
Lee Cantey <lcantey@gmail.com>
parents:
4629
diff
changeset
|
43 Source: doc\*.html; DestDir: {app}\Docs |
1844
b768f3ae0c2c
Remove patchbomb from list of contrib files to install since it's now an extension.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
44 Source: templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs |
b768f3ae0c2c
Remove patchbomb from list of contrib files to install since it's now an extension.
Lee Cantey <lcantey@gmail.com>
parents:
1690
diff
changeset
|
45 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
46 Source: COPYING; DestDir: {app}; DestName: Copying.txt |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
47 |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
48 [INI] |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
49 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://www.selenic.com/mercurial/ |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
50 |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
51 [UninstallDelete] |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
52 Type: files; Name: {app}\Mercurial.url |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
53 |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
54 [Icons] |
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
55 Name: {group}\Uninstall Mercurial; Filename: {uninstallexe} |
4829
4da2149b63a1
Add html docs and use for help shortcut
Lee Cantey <lcantey@gmail.com>
parents:
4629
diff
changeset
|
56 Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html |
1290
f310f034422f
Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
57 Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url |
2384
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
58 |
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
59 [Run] |
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
60 Filename: "{app}\add_path.exe"; Parameters: "{app}"; Flags: postinstall; Description: "Add the installation path to the search path" |
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
61 |
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
62 [UninstallRun] |
068b32d06873
Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents:
2276
diff
changeset
|
63 Filename: "{app}\add_path.exe"; Parameters: "/del {app}" |
4629
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
64 |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
65 [UninstallDelete] |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
66 Type: files; Name: "{app}\hg.exe.local" |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
67 |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
68 [Code] |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
69 procedure Touch(fn: String); |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
70 begin |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
71 SaveStringToFile(ExpandConstant(fn), '', False); |
a04b5f37eda7
Fixes to not require administrator privleges and use private copies of DLLs when running the Windows installer.
Lee Cantey <lcantey@gmail.com>
parents:
4383
diff
changeset
|
72 end; |