Patchwork [STABLE] win32: update Inno Setup script after the changes done in 95e042d77a5f

login
register
mail settings
Submitter Pascal Quantin
Date July 19, 2015, 4:13 p.m.
Message ID <f8aead51aec0e0584722.1437322437@PC>
Download mbox | patch
Permalink /patch/10042/
State Accepted
Headers show

Comments

Pascal Quantin - July 19, 2015, 4:13 p.m.
# HG changeset patch
# User Pascal Quantin <pascal.quantin@gmail.com>
# Date 1437322278 -7200
#      Sun Jul 19 18:11:18 2015 +0200
# Branch stable
# Node ID f8aead51aec0e0584722f2814040599dc4f6c286
# Parent  a2d178b3a1b4227e5e7d48d2b3fa5ab1171ca59b
win32: update Inno Setup script after the changes done in 95e042d77a5f
Matt Mackall - July 20, 2015, 6:34 p.m.
On Sun, 2015-07-19 at 18:13 +0200, Pascal Quantin wrote:
> # HG changeset patch
> # User Pascal Quantin <pascal.quantin@gmail.com>
> # Date 1437322278 -7200
> #      Sun Jul 19 18:11:18 2015 +0200
> # Branch stable
> # Node ID f8aead51aec0e0584722f2814040599dc4f6c286
> # Parent  a2d178b3a1b4227e5e7d48d2b3fa5ab1171ca59b
> win32: update Inno Setup script after the changes done in 95e042d77a5f

Queued for stable, thanks.

Patch

diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -70,15 +70,15 @@ 
 Source: contrib\win32\postinstall.txt; DestDir: {app}; DestName: ReleaseNotes.txt
 Source: dist\hg.exe; DestDir: {app}; AfterInstall: Touch('{app}\hg.exe.local')
 #if ARCH == "x64"
-Source: dist\*.dll; Destdir: {app}
-Source: dist\*.pyd; Destdir: {app}
+Source: dist\lib\*.dll; Destdir: {app}\lib
+Source: dist\lib\*.pyd; Destdir: {app}\lib
 #else
+Source: dist\w9xpopen.exe; DestDir: {app}
+#endif
 Source: dist\python*.dll; Destdir: {app}; Flags: skipifsourcedoesntexist
 Source: dist\msvc*.dll; DestDir: {app}; Flags: skipifsourcedoesntexist
-Source: dist\w9xpopen.exe; DestDir: {app}
-#endif
 Source: dist\Microsoft.VC*.CRT.manifest; DestDir: {app}; Flags: skipifsourcedoesntexist
-Source: dist\library.zip; DestDir: {app}
+Source: dist\lib\library.zip; DestDir: {app}\lib
 Source: dist\add_path.exe; DestDir: {app}
 Source: doc\*.html; DestDir: {app}\Docs
 Source: doc\style.css; DestDir: {app}\Docs