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

diff --git a/build/tools/bld_chm_exe.bat b/build/tools/bld_chm_exe.bat
index 6125edb63e6d37fd28d2f57dc9741a7ff6b5d050..6c70dd3edb3b1ca8df2bd9c0ce26a63b37ca98a0 100644 (file)
--- 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\r
 cd %WXWIN%\build\tools\r
 iscc wxwidgets.iss >> c:\temp.log\r
+copy %INNO%\..\wxMSW-%WXW_VER%-Setup.exe c:\daily
 \r
 echo docs built for %WXW_VER%\r
 echo docs built for %WXW_VER% >> c:\temp.log\r

diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss
index ad6cbe5d861afb193a68cb3de46e2c23ba695911..dad7ce76a4d4280e90096ff4526bd94f1679890b 100644 (file)
--- a/build/tools/wxwidgets.iss
+++ b/build/tools/wxwidgets.iss
@@ -34,10 +34,10 @@ UsePreviousAppDir=no
 DisableProgramGroupPage=yes\r
 LicenseFile={#WXW_DIR}\docs\licence.txt
 InfoBeforeFile={#WXW_DIR}\docs\readme.txt
-InfoAfterFile={#INFOFILE}\r
-OutputDir=c:\daily\r
-OutputBaseFilename={#SETUPFILENAME}\r
-PrivilegesRequired=none\r
+InfoAfterFile={#INFOFILE}
+OutputDir={#WXW_DIR}\..
+OutputBaseFilename={#SETUPFILENAME}
+PrivilegesRequired=none
 SetupIconFile={#WXW_DIR}\art\wxwin.ico
 Compression=lzma\r
 SolidCompression=yes\r