annotate contrib/win32/mercurial.iss @ 30313:392633d7860e

scmutil: clarify that we explicitly do termwidth - 1 on Windows I was a bit confused since we didn't add 1 to the width, which is different from the example shown in StackOverflow. http://stackoverflow.com/a/12642749
author Yuya Nishihara <yuya@tcha.org>
date Thu, 20 Oct 2016 22:57:12 +0900
parents f6d73c8756e2
children 561a019c0268
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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!
9356
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
3
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
4 #ifndef VERSION
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
5 #define FileHandle
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
6 #define FileLine
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
7 #define VERSION = "unknown"
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
8 #if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py")
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
9 #expr FileLine = FileRead(FileHandle)
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
10 #expr FileLine = FileRead(FileHandle)
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
11 #define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1)
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
12 #endif
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
13 #if FileHandle
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
14 #expr FileClose(FileHandle)
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
15 #endif
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
16 #pragma message "Detected Version: " + VERSION
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
17 #endif
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
18
12263
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
19 #ifndef ARCH
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
20 #define ARCH = "x86"
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
21 #endif
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
22
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
23 [Setup]
27925
f6d73c8756e2 copyright: update to 2016
timeless <timeless@mozdev.org>
parents: 27687
diff changeset
24 AppCopyright=Copyright 2005-2016 Matt Mackall and others
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
25 AppName=Mercurial
27687
4cea1b918b21 installer: add windows application version number to inno installer script
Urs Rau <urs.rau@gmail.com>
parents: 27435
diff changeset
26 AppVersion={#VERSION}
12263
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
27 #if ARCH == "x64"
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
28 AppVerName=Mercurial {#VERSION} (64-bit)
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
29 OutputBaseFilename=Mercurial-{#VERSION}-x64
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
30 ArchitecturesAllowed=x64
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
31 ArchitecturesInstallIn64BitMode=x64
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
32 #else
9356
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
33 AppVerName=Mercurial {#VERSION}
12263
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
34 OutputBaseFilename=Mercurial-{#VERSION}
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
35 #endif
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
36 InfoAfterFile=contrib/win32/postinstall.txt
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
37 LicenseFile=COPYING
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
38 ShowLanguageDialog=yes
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
39 AppPublisher=Matt Mackall and others
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25858
diff changeset
40 AppPublisherURL=https://mercurial-scm.org/
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25858
diff changeset
41 AppSupportURL=https://mercurial-scm.org/
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25858
diff changeset
42 AppUpdatesURL=https://mercurial-scm.org/
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
43 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
44 AppContact=mercurial@selenic.com
5625
876acbe2f856 win32: move default install path inside program files
Steve Borho <steve@borho.org>
parents: 5624
diff changeset
45 DefaultDirName={pf}\Mercurial
5626
28899bf513cc win32: use relative path to install source
Steve Borho <steve@borho.org>
parents: 5625
diff changeset
46 SourceDir=..\..
9356
9488a4d64fb5 iss: take version from iscc command line or __version__.py
Steve Borho <steve@borho.org>
parents: 8936
diff changeset
47 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
27925
f6d73c8756e2 copyright: update to 2016
timeless <timeless@mozdev.org>
parents: 27687
diff changeset
48 VersionInfoCopyright=Copyright 2005-2016 Matt Mackall and others
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
49 VersionInfoCompany=Matt Mackall and others
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
50 InternalCompressLevel=max
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
51 SolidCompression=true
7659
25ac72ca68f6 Add Lee Cantey's installer icon to win32 installer
Pascal Quantin <pascal.quantin@wavecom.com>
parents: 6790
diff changeset
52 SetupIconFile=contrib\win32\mercurial.ico
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
53 AllowNoIcons=true
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
54 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: 4385
diff changeset
55 PrivilegesRequired=none
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
56
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
57 [Files]
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
58 Source: contrib\mercurial.el; DestDir: {app}/Contrib
5627
382e336098ed win32: include contrib/vim in Windows package
Steve Borho <steve@borho.org>
parents: 5626
diff changeset
59 Source: contrib\vim\*.*; DestDir: {app}/Contrib/Vim
5628
71179daf6941 win32: include zsh_completion in Windows package
Steve Borho <steve@borho.org>
parents: 5627
diff changeset
60 Source: contrib\zsh_completion; DestDir: {app}/Contrib
10029
c4cc230c3277 mercurial.iss: backout 08bbed8ac9b8
Martin Geisler <mg@lazybytes.net>
parents: 10008
diff changeset
61 Source: contrib\bash_completion; DestDir: {app}/Contrib
10031
c0fa62259d06 mercurial.iss: add tcsh completion script
Pascal Quantin <pascal.quantin@gmail.com>
parents: 10029
diff changeset
62 Source: contrib\tcsh_completion; DestDir: {app}/Contrib
c0fa62259d06 mercurial.iss: add tcsh completion script
Pascal Quantin <pascal.quantin@gmail.com>
parents: 10029
diff changeset
63 Source: contrib\tcsh_completion_build.sh; DestDir: {app}/Contrib
7663
b0a0eb28a933 Package hgk Tcl/Tk script in win32 installer
Pascal Quantin <pascal.quantin@wavecom.com>
parents: 7662
diff changeset
64 Source: contrib\hgk; DestDir: {app}/Contrib; DestName: hgk.tcl
10182
eb0665db0c5c Add RelaxNG schema to win32 installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 10083
diff changeset
65 Source: contrib\xml.rnc; DestDir: {app}/Contrib
12080
eb7ddba6046a win32: add Emacs scripts to Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 10235
diff changeset
66 Source: contrib\mercurial.el; DestDir: {app}/Contrib
eb7ddba6046a win32: add Emacs scripts to Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 10235
diff changeset
67 Source: contrib\mq.el; DestDir: {app}/Contrib
12081
787a5a71e524 win32: add hgweb scripts to Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12080
diff changeset
68 Source: contrib\hgweb.fcgi; DestDir: {app}/Contrib
787a5a71e524 win32: add hgweb scripts to Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12080
diff changeset
69 Source: contrib\hgweb.wsgi; 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
70 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
71 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: 4385
diff changeset
72 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
12263
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
73 #if ARCH == "x64"
25858
f8aead51aec0 win32: update Inno Setup script after the changes done in 95e042d77a5f
Pascal Quantin <pascal.quantin@gmail.com>
parents: 24842
diff changeset
74 Source: dist\lib\*.dll; Destdir: {app}\lib
f8aead51aec0 win32: update Inno Setup script after the changes done in 95e042d77a5f
Pascal Quantin <pascal.quantin@gmail.com>
parents: 24842
diff changeset
75 Source: dist\lib\*.pyd; Destdir: {app}\lib
12263
5f19416056b4 win32: 64-bit Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12262
diff changeset
76 #else
25858
f8aead51aec0 win32: update Inno Setup script after the changes done in 95e042d77a5f
Pascal Quantin <pascal.quantin@gmail.com>
parents: 24842
diff changeset
77 Source: dist\w9xpopen.exe; DestDir: {app}
f8aead51aec0 win32: update Inno Setup script after the changes done in 95e042d77a5f
Pascal Quantin <pascal.quantin@gmail.com>
parents: 24842
diff changeset
78 #endif
8057
2a4cb1d509ec Bundle python dll in win32 installer if present
Pascal Quantin <pascal.quantin@gmail.com>
parents: 8056
diff changeset
79 Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
9357
7ee67a037dcb iss: make mfc*.dll and msvc*.dll optional
Steve Borho <steve@borho.org>
parents: 9356
diff changeset
80 Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist
8058
a0555ae394b3 Add Python 2.6 support to win32 installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 8057
diff changeset
81 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
25858
f8aead51aec0 win32: update Inno Setup script after the changes done in 95e042d77a5f
Pascal Quantin <pascal.quantin@gmail.com>
parents: 24842
diff changeset
82 Source: dist\lib\library.zip; DestDir: {app}\lib
2384
068b32d06873 Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents: 2276
diff changeset
83 Source: dist\add_path.exe; DestDir: {app}
4822
4da2149b63a1 Add html docs and use for help shortcut
Lee Cantey <lcantey@gmail.com>
parents: 4629
diff changeset
84 Source: doc\*.html; DestDir: {app}\Docs
9633
82a4c54d51e1 Add style.css file to Inno Setup script
Pascal Quantin <pascal.quantin@gmail.com>
parents: 9357
diff changeset
85 Source: doc\style.css; DestDir: {app}\Docs
10002
66f3b8c95b62 Update win32 installer with changes from f91e5630ce7e
Pascal Quantin <pascal.quantin@gmail.com>
parents: 9911
diff changeset
86 Source: mercurial\help\*.txt; DestDir: {app}\help
27435
21d2585fbfcb win32: add internals help topics to Inno Setup installer
Pascal Quantin <pascal.quantin@gmail.com>
parents: 26421
diff changeset
87 Source: mercurial\help\internals\*.txt; DestDir: {app}\help\internals
23174
7041b7120e69 win32: fix win32 installers generation
Pascal Quantin <pascal.quantin@gmail.com>
parents: 23143
diff changeset
88 Source: mercurial\default.d\*.rc; DestDir: {app}\default.d
12262
df5386ae41b9 win32: update Inno Setup build instructions with up-to-date software
Pascal Quantin <pascal.quantin@gmail.com>
parents: 12081
diff changeset
89 Source: mercurial\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs skipifsourcedoesntexist
10002
66f3b8c95b62 Update win32 installer with changes from f91e5630ce7e
Pascal Quantin <pascal.quantin@gmail.com>
parents: 9911
diff changeset
90 Source: mercurial\templates\*.*; DestDir: {app}\Templates; Flags: recursesubdirs createallsubdirs
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
91 Source: CONTRIBUTORS; DestDir: {app}; DestName: Contributors.txt
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
92 Source: COPYING; DestDir: {app}; DestName: Copying.txt
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
93
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
94 [INI]
26421
4b0fc75f9403 urls: bulk-change primary website URLs
Matt Mackall <mpm@selenic.com>
parents: 25858
diff changeset
95 Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: https://mercurial-scm.org/
23175
5ec7b2cb577b win32: remove Mercurial.ini file from Inno Setup installer (issue4435)
Pascal Quantin <pascal.quantin@gmail.com>
parents: 23174
diff changeset
96 Filename: {app}\default.d\editor.rc; Section: ui; Key: editor; String: notepad
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
97
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
98 [UninstallDelete]
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
99 Type: files; Name: {app}\Mercurial.url
23175
5ec7b2cb577b win32: remove Mercurial.ini file from Inno Setup installer (issue4435)
Pascal Quantin <pascal.quantin@gmail.com>
parents: 23174
diff changeset
100 Type: filesandordirs; Name: {app}\default.d
5ec7b2cb577b win32: remove Mercurial.ini file from Inno Setup installer (issue4435)
Pascal Quantin <pascal.quantin@gmail.com>
parents: 23174
diff changeset
101 Type: files; Name: "{app}\hg.exe.local"
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
102
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
103 [Icons]
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
104 Name: {group}\Uninstall Mercurial; Filename: {uninstallexe}
4822
4da2149b63a1 Add html docs and use for help shortcut
Lee Cantey <lcantey@gmail.com>
parents: 4629
diff changeset
105 Name: {group}\Mercurial Command Reference; Filename: {app}\Docs\hg.1.html
8056
f614f11a96ca Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7809
diff changeset
106 Name: {group}\Mercurial Configuration Files; Filename: {app}\Docs\hgrc.5.html
f614f11a96ca Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
Pascal Quantin <pascal.quantin@gmail.com>
parents: 7809
diff changeset
107 Name: {group}\Mercurial Ignore Files; Filename: {app}\Docs\hgignore.5.html
1290
f310f034422f Add Windows installer file.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
108 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
109
068b32d06873 Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents: 2276
diff changeset
110 [Run]
068b32d06873 Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents: 2276
diff changeset
111 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
112
068b32d06873 Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents: 2276
diff changeset
113 [UninstallRun]
068b32d06873 Automatically add the path of hg to %PATH% using add_path
Marco Barisione <marco@barisione.org>
parents: 2276
diff changeset
114 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: 4385
diff changeset
115
7662
8aa338cd0df3 Update mercurial.ini file packaged in win32 installer
Pascal Quantin <pascal.quantin@wavecom.com>
parents: 7659
diff changeset
116 [Code]
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: 4385
diff changeset
117 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: 4385
diff changeset
118 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: 4385
diff changeset
119 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: 4385
diff changeset
120 end;