win32: Bump python to 3.4.0

This commit is contained in:
TingPing 2014-03-17 09:05:58 -04:00
parent caddb25711
commit 36950c0d46
2 changed files with 5 additions and 5 deletions

View File

@ -11,7 +11,7 @@
<YourMsgfmtPath>c:\mozilla-build\msgfmt</YourMsgfmtPath> <YourMsgfmtPath>c:\mozilla-build\msgfmt</YourMsgfmtPath>
<YourPerlPath>c:\mozilla-build\perl-5.18</YourPerlPath> <YourPerlPath>c:\mozilla-build\perl-5.18</YourPerlPath>
<YourPython2Path>c:\mozilla-build\python-2.7</YourPython2Path> <YourPython2Path>c:\mozilla-build\python-2.7</YourPython2Path>
<YourPython3Path>c:\mozilla-build\python-3.3</YourPython3Path> <YourPython3Path>c:\mozilla-build\python-3.4</YourPython3Path>
<!-- YOU SHOULDN'T TOUCH ANYTHING BELOW --> <!-- YOU SHOULDN'T TOUCH ANYTHING BELOW -->
@ -28,7 +28,7 @@
<Python2Lib>python27</Python2Lib> <Python2Lib>python27</Python2Lib>
<Python2Output>hcpython2</Python2Output> <Python2Output>hcpython2</Python2Output>
<Python3Path>$(YourPython3Path)\$(PlatformName)</Python3Path> <Python3Path>$(YourPython3Path)\$(PlatformName)</Python3Path>
<Python3Lib>python33</Python3Lib> <Python3Lib>python34</Python3Lib>
<Python3Output>hcpython3</Python3Output> <Python3Output>hcpython3</Python3Output>
<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <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> <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>

View File

@ -76,7 +76,7 @@ Name: "langs"; Description: "Language Interfaces"; Types: custom; Flags: disable
Name: "langs\perl"; Description: "Perl (requires Perl 5.18)"; Types: custom; Flags: disablenouninstallwarning Name: "langs\perl"; Description: "Perl (requires Perl 5.18)"; Types: custom; Flags: disablenouninstallwarning
Name: "langs\python"; Description: "Python Interface"; 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\python2"; Description: "Python (requires Python 2.7)"; Types: custom; Flags: disablenouninstallwarning exclusive
Name: "langs\python\python3"; Description: "Python (requires Python 3.3)"; Types: custom; Flags: disablenouninstallwarning exclusive Name: "langs\python\python3"; Description: "Python (requires Python 3.4)"; Types: custom; Flags: disablenouninstallwarning exclusive
[Tasks] [Tasks]
Name: portable; Description: "Yes"; GroupDescription: "Portable Mode: Stores configuration files within install directory for portable drives."; Flags: unchecked Name: portable; Description: "Yes"; GroupDescription: "Portable Mode: Stores configuration files within install directory for portable drives."; Flags: unchecked
@ -254,12 +254,12 @@ begin
REDIST := 'http://dl.hexchat.net/misc/vcredist_2013_x64.exe'; REDIST := 'http://dl.hexchat.net/misc/vcredist_2013_x64.exe';
PERL := 'http://dl.hexchat.net/misc/perl/Perl-5.18.2-x64.exe'; PERL := 'http://dl.hexchat.net/misc/perl/Perl-5.18.2-x64.exe';
PY2 := 'http://python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi'; PY2 := 'http://python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi';
PY3 := 'http://python.org/ftp/python/3.3.4/python-3.3.4.amd64.msi'; PY3 := 'http://python.org/ftp/python/3.4.0/python-3.4.0.amd64.msi';
#else #else
REDIST := 'http://dl.hexchat.net/misc/vcredist_2013_x86.exe'; REDIST := 'http://dl.hexchat.net/misc/vcredist_2013_x86.exe';
PERL := 'http://dl.hexchat.net/misc/perl/Perl-5.18.2-x86.exe'; PERL := 'http://dl.hexchat.net/misc/perl/Perl-5.18.2-x86.exe';
PY2 := 'http://python.org/ftp/python/2.7.6/python-2.7.6.msi'; PY2 := 'http://python.org/ftp/python/2.7.6/python-2.7.6.msi';
PY3 := 'http://python.org/ftp/python/3.3.4/python-3.3.4.msi'; PY3 := 'http://python.org/ftp/python/3.4.0/python-3.4.0.msi';
#endif #endif
DOTNET := 'http://dl.hexchat.net/misc/dotnet_40.exe'; DOTNET := 'http://dl.hexchat.net/misc/dotnet_40.exe';
SPELL := 'http://dl.hexchat.net/hexchat/HexChat%20Spelling%20Dictionaries%20r2.exe'; SPELL := 'http://dl.hexchat.net/hexchat/HexChat%20Spelling%20Dictionaries%20r2.exe';