diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/hexchat.props | 4 | ||||
| -rw-r--r-- | win32/installer/hexchat.iss.tt | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/win32/hexchat.props b/win32/hexchat.props index e038e2b8..95521977 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.4</YourPython3Path> + <YourPython3Path>c:\gtk-build\python-3.5</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>python34</Python3Lib> + <Python3Lib>python35</Python3Lib> <Python3Output>hcpython3</Python3Output> <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk> diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 99571e20..33098fcf 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -75,7 +75,7 @@ Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disable 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.4)"; Types: custom; Flags: disablenouninstallwarning exclusive +Name: "langs\python\python3"; Description: "Python (requires Python 3.5)"; Types: custom; Flags: disablenouninstallwarning exclusive [Tasks] Name: portable; Description: "Yes"; GroupDescription: "Portable Mode: Stores configuration files within install directory for portable drives."; Flags: unchecked @@ -102,6 +102,7 @@ Filename: "{tmp}\vcredist.exe"; Parameters: "/install /quiet /norestart"; Status Filename: "{tmp}\dotnet4.exe"; Parameters: "/q /norestart"; StatusMsg: "Installing .NET"; Components: xtm; Flags: skipifdoesntexist; Tasks: not portable Filename: "{tmp}\perl.msi"; StatusMsg: "Installing Perl"; Components: langs\perl; Flags: shellexec skipifdoesntexist; Tasks: not portable Filename: "{tmp}\python.msi"; StatusMsg: "Installing Python"; Components: langs\python; Flags: shellexec skipifdoesntexist; Tasks: not portable +Filename: "{tmp}\python.exe"; Parameters: "InstallAllUsers=1 PrependPath=1"; StatusMsg: "Installing Python"; Components: langs\python; Flags: shellexec skipifdoesntexist; Tasks: not portable Filename: "{tmp}\spelling-dicts.exe"; Parameters: "/verysilent"; StatusMsg: "Installing Spelling Dictionaries"; Components: spell; Flags: skipifdoesntexist; Tasks: not portable [Files] @@ -270,13 +271,13 @@ begin #if APPARCH == "x64" REDIST := 'https://dl.hexchat.net/misc/vcredist_2015_x64.exe'; PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x64.msi'; - PY2 := 'http://python.org/ftp/python/2.7.8/python-2.7.8.amd64.msi'; - PY3 := 'http://python.org/ftp/python/3.4.1/python-3.4.1.amd64.msi'; + PY2 := 'http://python.org/ftp/python/2.7.10/python-2.7.10.amd64.msi'; + PY3 := 'http://python.org/ftp/python/3.5.1/python-3.5.1-amd64.exe'; #else REDIST := 'https://dl.hexchat.net/misc/vcredist_2015_x86.exe'; PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x86.msi'; - PY2 := 'http://python.org/ftp/python/2.7.8/python-2.7.8.msi'; - PY3 := 'http://python.org/ftp/python/3.4.1/python-3.4.1.msi'; + PY2 := 'http://python.org/ftp/python/2.7.10/python-2.7.10.msi'; + PY3 := 'http://python.org/ftp/python/3.5.1/python-3.5.1.exe'; #endif DOTNET := 'https://dl.hexchat.net/misc/dotnet_40.exe'; SPELL := 'https://dl.hexchat.net/hexchat/HexChat%20Spelling%20Dictionaries%20r2.exe'; @@ -298,8 +299,8 @@ 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('python34.dll') then - idpAddFile(PY3, ExpandConstant('{tmp}\python.msi')); + if IsComponentSelected('langs\python\python3') and not CheckDLL('python35.dll') then + idpAddFile(PY3, ExpandConstant('{tmp}\python.exe')); end; end; end; |