From patchwork Sun Jul 19 16:13:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [STABLE] win32: update Inno Setup script after the changes done in 95e042d77a5f From: Pascal Quantin X-Patchwork-Id: 10042 Message-Id: To: mercurial-devel@selenic.com Date: Sun, 19 Jul 2015 18:13:57 +0200 # HG changeset patch # User Pascal Quantin # 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 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