Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Inno Setup file dependency on c:\daily path.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2013-07-17 12:57:26 +00:00
parent beee5d6863
commit 6dbc37ce70
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/tools/bld_chm_exe.bat
View File

@@ -74,6 +74,7 @@ mkdir %INNO%\docs\htmlhelp
copy %WXWIN%\docs\doxygen\out\wx.chm %INNO%\docs\htmlhelp\wx.chm copy %WXWIN%\docs\doxygen\out\wx.chm %INNO%\docs\htmlhelp\wx.chm
cd %WXWIN%\build\tools cd %WXWIN%\build\tools
iscc wxwidgets.iss >> c:\temp.log 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%
echo docs built for %WXW_VER% >> c:\temp.log echo docs built for %WXW_VER% >> c:\temp.log

2
build/tools/wxwidgets.iss
View File

@@ -35,7 +35,7 @@ DisableProgramGroupPage=yes
LicenseFile={#WXW_DIR}\docs\licence.txt LicenseFile={#WXW_DIR}\docs\licence.txt
InfoBeforeFile={#WXW_DIR}\docs\readme.txt InfoBeforeFile={#WXW_DIR}\docs\readme.txt
InfoAfterFile={#INFOFILE} InfoAfterFile={#INFOFILE}
OutputDir=c:\daily OutputDir={#WXW_DIR}\..
OutputBaseFilename={#SETUPFILENAME} OutputBaseFilename={#SETUPFILENAME}
PrivilegesRequired=none PrivilegesRequired=none
SetupIconFile={#WXW_DIR}\art\wxwin.ico SetupIconFile={#WXW_DIR}\art\wxwin.ico