From 6dbc37ce7040fafdd973f9ae84256f2c084ac4fc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 17 Jul 2013 12:57:26 +0000 Subject: [PATCH] Remove Inno Setup file dependency on c:\daily path. Generate the output file in the parent of the sources directory and take care of copying it to c:\daily in bld_chm_exe.bat itself. This allows to use wxwidgets.iss without that batch file and also on systems without c:\ drive at all. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/tools/bld_chm_exe.bat | 1 + build/tools/wxwidgets.iss | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/tools/bld_chm_exe.bat b/build/tools/bld_chm_exe.bat index 6125edb63e..6c70dd3edb 100644 --- a/build/tools/bld_chm_exe.bat +++ b/build/tools/bld_chm_exe.bat @@ -74,6 +74,7 @@ mkdir %INNO%\docs\htmlhelp copy %WXWIN%\docs\doxygen\out\wx.chm %INNO%\docs\htmlhelp\wx.chm cd %WXWIN%\build\tools iscc wxwidgets.iss >> c:\temp.log +copy %INNO%\..\wxMSW-%WXW_VER%-Setup.exe c:\daily echo docs built for %WXW_VER% echo docs built for %WXW_VER% >> c:\temp.log diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss index ad6cbe5d86..dad7ce76a4 100644 --- a/build/tools/wxwidgets.iss +++ b/build/tools/wxwidgets.iss @@ -34,10 +34,10 @@ UsePreviousAppDir=no DisableProgramGroupPage=yes LicenseFile={#WXW_DIR}\docs\licence.txt InfoBeforeFile={#WXW_DIR}\docs\readme.txt -InfoAfterFile={#INFOFILE} -OutputDir=c:\daily -OutputBaseFilename={#SETUPFILENAME} -PrivilegesRequired=none +InfoAfterFile={#INFOFILE} +OutputDir={#WXW_DIR}\.. +OutputBaseFilename={#SETUPFILENAME} +PrivilegesRequired=none SetupIconFile={#WXW_DIR}\art\wxwin.ico Compression=lzma SolidCompression=yes -- 2.45.2