diff options
| author | tomek <eustachy.kapusta@gmail.com> | 2016-12-23 14:04:32 +0100 |
|---|---|---|
| committer | tomek <eustachy.kapusta@gmail.com> | 2016-12-23 14:04:32 +0100 |
| commit | 63e9c721148f8a91bc68484c3f9ee42cfbc4316f (patch) | |
| tree | 26ce5efbf880bbebbdf93b042d14927b4c6cd96c | |
| parent | 2c80cb7efde327931976112bd4c0127e8a70ac61 (diff) | |
win32: Update Python to 3.6
| -rw-r--r-- | win32/hexchat.props | 4 | ||||
| -rw-r--r-- | win32/installer/hexchat.iss.tt | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/hexchat.props b/win32/hexchat.props index 1503c201..818894fb 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -9,7 +9,7 @@ <YourMsgfmtPath>c:\gtk-build\msgfmt</YourMsgfmtPath> <YourPerlPath>c:\gtk-build\perl-5.20</YourPerlPath> <YourPython2Path>c:\gtk-build\python-2.7</YourPython2Path> - <YourPython3Path>c:\gtk-build\python-3.5</YourPython3Path> + <YourPython3Path>c:\gtk-build\python-3.6</YourPython3Path> <YourWinSparklePath>c:\gtk-build\WinSparkle</YourWinSparklePath> <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW --> @@ -27,7 +27,7 @@ <Python2Lib>python27</Python2Lib> <Python2Output>hcpython2</Python2Output> <Python3Path>$(YourPython3Path)\$(PlatformName)</Python3Path> - <Python3Lib>python35</Python3Lib> + <Python3Lib>python36</Python3Lib> <Python3Output>hcpython3</Python3Output> <LuaInclude>$(DepsRoot)\include\luajit-2.0</LuaInclude> <LuaOutput>hclua</LuaOutput> diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index ad8ccafa..f4177c9f 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -75,7 +75,7 @@ Name: "langs\lua"; Description: "Lua"; Types: normal custom; Flags: disablenouni Name: "langs\perl"; Description: "Perl (requires Perl 5.20)"; Types: custom; Flags: disablenouninstallwarning Name: "langs\python"; Description: "Python Interface"; Types: custom; Flags: disablenouninstallwarning Name: "langs\python\python2"; Description: "Python (requires Python 2.7)"; Types: custom; Flags: disablenouninstallwarning exclusive -Name: "langs\python\python3"; Description: "Python (requires Python 3.5)"; Types: custom; Flags: disablenouninstallwarning exclusive +Name: "langs\python\python3"; Description: "Python (requires Python 3.6)"; Types: custom; Flags: disablenouninstallwarning exclusive [Tasks] Name: portable; Description: "Yes"; GroupDescription: "Portable Mode: Stores configuration files within install directory for portable drives."; Flags: unchecked @@ -290,13 +290,13 @@ begin REDIST_2013 := 'https://dl.hexchat.net/misc/vcredist_2013_x64.exe'; PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x64.msi'; PY2 := 'https://www.python.org/ftp/python/2.7.12/python-2.7.12.amd64.msi'; - PY3 := 'https://www.python.org/ftp/python/3.5.2/python-3.5.2-amd64.exe'; + PY3 := 'https://www.python.org/ftp/python/3.6.0/python-3.6.0-amd64.exe'; #else REDIST := 'https://dl.hexchat.net/misc/vcredist_2015_x86.exe'; REDIST_2013 := 'https://dl.hexchat.net/misc/vcredist_2013_x86.exe'; PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x86.msi'; PY2 := 'https://www.python.org/ftp/python/2.7.12/python-2.7.12.msi'; - PY3 := 'https://www.python.org/ftp/python/3.5.2/python-3.5.2.exe'; + PY3 := 'https://www.python.org/ftp/python/3.6.0/python-3.6.0.exe'; #endif DOTNET := 'https://dl.hexchat.net/misc/dotnet_40.exe'; SPELL := 'https://dl.hexchat.net/hexchat/HexChat%20Spelling%20Dictionaries%20r2.exe'; @@ -323,7 +323,7 @@ begin if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then idpAddFile(PY2, ExpandConstant('{tmp}\python.msi')); - if IsComponentSelected('langs\python\python3') and not CheckDLL('python35.dll') then + if IsComponentSelected('langs\python\python3') and not CheckDLL('python36.dll') then idpAddFile(PY3, ExpandConstant('{tmp}\python.exe')); end; end; |