Patchwork D6059: inno: move inno installer files to contrib/packaging/inno

login
register
mail settings
Submitter phabricator
Date March 5, 2019, 3:24 p.m.
Message ID <9977ba211e2b2a72056b0c071987cc47@localhost.localdomain>
Download mbox | patch
Permalink /patch/39068/
State Not Applicable
Headers show

Comments

phabricator - March 5, 2019, 3:24 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG765f836a9484: inno: move inno installer files to contrib/packaging/inno (authored by indygreg, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6059?vs=14334&id=14361

REVISION DETAIL
  https://phab.mercurial-scm.org/D6059

AFFECTED FILES
  contrib/packaging/inno/mercurial.iss
  contrib/packaging/inno/readme.txt
  contrib/win32/mercurial.iss
  contrib/win32/win32-build.txt
  contrib/wix/README.txt

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/contrib/wix/README.txt b/contrib/wix/README.txt
--- a/contrib/wix/README.txt
+++ b/contrib/wix/README.txt
@@ -10,9 +10,7 @@ 
 the only sane way to keep the source tree and the installer in sync.
 
 The MSI installer builder uses only the mercurial.ini file from the
-contrib/win32 folder, the contents of which have been historically used
-to create an InnoSetup based installer.  The rest of the files there are
-ignored.
+contrib/win32 folder.
 
 The MSI packages built by thg-winbuild require elevated (admin)
 privileges to be installed due to the installation of MSVC CRT libraries
diff --git a/contrib/win32/win32-build.txt b/contrib/packaging/inno/readme.txt
rename from contrib/win32/win32-build.txt
rename to contrib/packaging/inno/readme.txt
--- a/contrib/win32/win32-build.txt
+++ b/contrib/packaging/inno/readme.txt
@@ -98,13 +98,14 @@ 
   mingw32-make html
   cd ..
 
-If you use ISTool, you open the C:\hg\hg-release\contrib\win32\mercurial.iss
+If you use ISTool, you open the
+C:\hg\hg-release\contrib\packaging\inno\mercurial.iss
 file and type Ctrl-F9 to compile the installer file.
 
 Otherwise you run the Inno Setup compiler.  Assuming it's in the path
 you should execute:
 
-  iscc contrib\win32\mercurial.iss /dVERSION=foo
+  iscc contrib\packaging\inno\mercurial.iss /dVERSION=foo
 
 Where 'foo' is the version number you would like to see in the
 'Add/Remove Applications' tool.  The installer will be placed into
@@ -114,7 +115,7 @@ 
 
 If you want to build an installer for a 64-bit mercurial, add /dARCH=x64 to
 your command line:
-  iscc contrib\win32\mercurial.iss /dARCH=x64
+  iscc contrib\packaging\inno\mercurial.iss /dARCH=x64
 
 To automate the steps above you may want to create a batchfile based on the
 following (MinGW build chain):
@@ -125,6 +126,6 @@ 
   cd doc
   mingw32-make html
   cd ..
-  iscc contrib\win32\mercurial.iss /dVERSION=snapshot
+  iscc contrib\packaging\inno\mercurial.iss /dVERSION=snapshot
 
 and run it from the root of the hg repository (c:\hg\hg-release).
diff --git a/contrib/win32/mercurial.iss b/contrib/packaging/inno/mercurial.iss
rename from contrib/win32/mercurial.iss
rename to contrib/packaging/inno/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/packaging/inno/mercurial.iss
@@ -5,7 +5,7 @@ 
 #define FileHandle
 #define FileLine
 #define VERSION = "unknown"
-#if FileHandle = FileOpen(SourcePath + "\..\..\mercurial\__version__.py")
+#if FileHandle = FileOpen(SourcePath + "\..\..\..\mercurial\__version__.py")
   #expr FileLine = FileRead(FileHandle)
   #expr FileLine = FileRead(FileHandle)
   #define VERSION = Copy(FileLine, Pos('"', FileLine)+1, Len(FileLine)-Pos('"', FileLine)-1)
@@ -43,7 +43,7 @@ 
 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
 AppContact=mercurial@mercurial-scm.org
 DefaultDirName={pf}\Mercurial
-SourceDir=..\..
+SourceDir=..\..\..
 VersionInfoDescription=Mercurial distributed SCM (version {#VERSION})
 VersionInfoCopyright=Copyright 2005-2019 Matt Mackall and others
 VersionInfoCompany=Matt Mackall and others