Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset 38429d250dd6…

Parents beff284b796b…

Parents 772b0bb81c48…

by Steve Borho

Changes to 3 files · Browse files at 38429d250dd6 Showing diff from parent beff284b796b 772b0bb81c48 Diff from another changeset...

Change 1 of 4 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
8
9
10
11
 
12
13
14
 
19
20
21
22
 
23
24
25
 
49
50
51
 
52
53
54
 
59
60
61
62
63
64
 
 
65
66
67
 
8
9
10
 
11
12
13
14
 
19
20
21
 
22
23
24
25
 
49
50
51
52
53
54
55
 
60
61
62
 
 
 
63
64
65
66
67
@@ -8,7 +8,7 @@
 [Setup]  AppCopyright=Copyright 2005-2009 Matt Mackall and others  AppName=TortoiseHg -AppVerName=TortoiseHg {#Version} +AppVerName=TortoiseHg {#VERSION}  InfoAfterFile=contrib/win32/postinstall.txt  LicenseFile=COPYING.txt  ShowLanguageDialog=yes @@ -19,7 +19,7 @@
 AppID=TortoiseHg  AppContact=Steve Borho <steve@borho.org>  AppMutex=thgtaskbar,Global\thgtaskbar -OutputBaseFilename=TortoiseHg-{#Version} +OutputBaseFilename=TortoiseHg-{#VERSION}  DefaultDirName={pf}\TortoiseHg  SourceDir=..\..  VersionInfoDescription=Mercurial distributed SCM @@ -49,6 +49,7 @@
 Source: ..\build-hg\templates\*.*; DestDir: {app}\templates; Flags: recursesubdirs createallsubdirs  Source: ..\build-hg\locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs  Source: ..\build-hg\i18n\*.*; DestDir: {app}\i18n; Flags: +Source: ..\build-hg\doc\*.html; DestDir: {app}\docs; Flags:  Source: {app}\Mercurial.ini; DestDir: {app}\backup; Flags: external skipifsourcedoesntexist uninsneveruninstall  Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; AfterInstall: FileExpandString('{app}\Mercurial.ini')  Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt @@ -59,9 +60,8 @@
 Source: dist\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\library.zip; DestDir: {app} -Source: doc\*.html; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist -Source: doc\*.pdf; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist -Source: doc\*.chm; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist +Source: doc\build\pdf\*.pdf; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist +Source: doc\build\chm\*.chm; DestDir: {app}\docs; Flags: external skipifsourcedoesntexist  Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs  Source: dist\gtk\*; DestDir: {app}\gtk; Flags: ignoreversion recursesubdirs createallsubdirs  Source: locale\*.*; DestDir: {app}\locale; Flags: recursesubdirs createallsubdirs
Change 1 of 2 Show Entire File doc/​Build.bat Stacked
 
1
2
3
 
 
 
4
5
6
 
56
57
58
59
 
60
61
62
 
1
2
 
3
4
5
6
7
8
 
58
59
60
 
61
62
63
64
@@ -1,6 +1,8 @@
 @echo off   -set hhc_compiler="%ProgramFiles%\HTML Help Workshop\hhc.exe" +if "%hhc_compiler" equ "" ( + set hhc_compiler="%ProgramFiles%\HTML Help Workshop\hhc.exe" +)  set PDFLATEX=PdfLatex  set SPHINXBUILD=sphinx-build  set OUTPUTDIRSUFFIX= @@ -56,7 +58,7 @@
   if "%1" == "chm" (   %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %OUTPUTDIR%/chm - %hhc_compiler% %OUTPUTDIR%/chm/TortoiseHGdoc.hhp + %hhc_compiler% %OUTPUTDIR%/chm/TortoiseHG.hhp   echo.   echo.Build finished. The CHM file is in %OUTPUTDIR%/chm.   goto end
Change 1 of 1 Show Entire File doc/​source/​conf.py Stacked
 
153
154
155
156
 
157
158
159
 
153
154
155
 
156
157
158
159
@@ -153,7 +153,7 @@
 #html_file_suffix = ''    # Output file base name for HTML help builder. -htmlhelp_basename = 'TortoiseHgdoc' +htmlhelp_basename = 'TortoiseHg'      # Options for LaTeX output