Skip to content

Release201412 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 2 commits into from
Nov 30, 2014
Merged

Release201412 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac9ed5a
refresh package list
Nov 30, 2014
44bba1c
mingw64 32bit compatibility patch
Nov 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 30 additions & 16 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,13 +750,21 @@ def _create_batch_scripts(self):
:r_end
""")
# Prepare a live patch on python (shame we need it) to have mingw64ok
patch_distutils = ""
if self.py_arch == "win-amd64":
patch_distutils = r"""
%~dp0Find_And_replace.vbs "%WINPYDIR%\Lib\distutils\cygwinccompiler.py" "-O -W" "-O -DMS_WIN64 -W"
patch_distutils = r"""

set WINPYXX=%WINPYVER:~0,1%%WINPYVER:~2,1%

set WINPYARCH="WIN32"
if "%WiNPYDIR:~-5%"=="amd64" set WINPYARCH="WIN-AMD64"

if %WINPYARCH%=="WIN32" set WINMINGW=lib\gcc\i686-w64-mingw32
if %WINPYARCH%=="WIN-AMD64" set WINMINGW=lib\gcc\x86_64-w64-mingw32

if not %WINPYARCH%=="WIN-AMD64" goto no_distutil_patch
%~dp0Find_And_replace.vbs "%WINPYDIR%\Lib\distutils\cygwinccompiler.py" "-O -W" "-O -DMS_WIN64 -W"
:no_distutil_patch


rem Python 3.3+ case
set WINPYMSVCR=libmsvcr100.a
set WINPYSPEC=specs100
Expand All @@ -766,8 +774,14 @@ def _create_batch_scripts(self):
IF "%WINPYXX%"=="27" set WINPYSPEC=specs90

cd %WINPYDIR%
copy /Y ..\tools\mingw32\x86_64-w64-mingw32\lib\%WINPYMSVCR% libs\%WINPYMSVCR%
copy /Y ..\tools\mingw32\lib\gcc\x86_64-w64-mingw32\4.8.2\%WINPYSPEC% ..\tools\mingw32\lib\gcc\x86_64-w64-mingw32\4.8.2\specs
copy /Y ..\tools\mingw32\%WINMINGW%\lib\%WINPYMSVCR% libs\%WINPYMSVCR%

REM copy the right version of gcc
set dir482=..\tools\mingw32\%WINMINGW%\4.8.2\%WINPYSPEC%
if exist %dir482% copy /Y %dir482% ..\tools\mingw32\%WINMINGW%\4.8.2\specs

set dir492=..\tools\mingw32\%WINMINGW%\4.9.2\%WINPYSPEC%
if exist %dir492% copy /Y %dir492% ..\tools\mingw32\%WINMINGW%\4.9.2\specs

REM generate python.34 import file

Expand Down Expand Up @@ -1068,19 +1082,19 @@ def make_all(build_number, release_level, pyver,
# DO create only what version at a time
# You may have to manually delete previous build\winpython-.. directory

make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
verbose=False, archis=(32, ))
#make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
# verbose=False, archis=(64, ), flavor='')
#make_all(3, '', pyver='3.3', rootdir=r'D:\Winpython',
#make_all(3, '', pyver='3.4', rootdir=r'D:\Winpython',
# verbose=False, archis=(32, ))
make_all(3, '', pyver='3.4', rootdir=r'D:\Winpython',
verbose=False, archis=(64, ), flavor='')
#make_all(4, '', pyver='3.3', rootdir=r'D:\Winpython',
# verbose=False, archis=(32, ))
#make_all(3, '', pyver='3.3', rootdir=r'D:\Winpython',
#make_all(4, '', pyver='3.3', rootdir=r'D:\Winpython',
# verbose=False, archis=(64, ))
#make_all(3, '', pyver='2.7', rootdir=r'D:\Winpython',
#make_all(4, '', pyver='2.7', rootdir=r'D:\Winpython',
# verbose=False, archis=(32, ))
#make_all(3, '', pyver='2.7', rootdir=r'D:\Winpython',
#make_all(4, '', pyver='2.7', rootdir=r'D:\Winpython',
# verbose=False, archis=(64, ))
#make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
#make_all(3, '', pyver='3.4', rootdir=r'D:\Winpython',
# verbose=False, archis=(64, ), flavor='FlavorIgraph')
#make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
#make_all(3, '', pyver='3.4', rootdir=r'D:\Winpython',
# verbose=False, archis=(32, ), flavor='FlavorKivy')
18 changes: 18 additions & 0 deletions winpython/data/packages.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ description=playing SQL directly on Python datas
[beautifulsoup4]
description=Screen-scraping library

[blaze]
description=Blaze

[brewer2mpl]
description=Connect colorbrewer2.org color maps to Python and matplotlib

Expand Down Expand Up @@ -184,6 +187,9 @@ description=A Python library to read/write Excel 2007 xlsx/xlsm files
description=Powerful data structures for data analysis, time series and statistics
category=dataproc

[pandas-ply]
description=functional data manipulation for pandas

[patsy]
description=Describing statistical models using symbolic formulas
category=dataoric
Expand Down Expand Up @@ -215,6 +221,9 @@ description=Provides an interface for retrieving information on all running proc
url=http://code.google.com/p/psutil
category=util

[psycopg2]
description=Python-PostgreSQL Database Adapter

[pulp]
description=PuLP is an LP modeler written in python. PuLP can generate MPS or LP files and call GLPK, COIN CLP/CBC, CPLEX, and GUROBI to solve linear problems

Expand All @@ -226,6 +235,12 @@ category=improc
[pycairo]
description=Python bindings for the cairo library

[pycosat]
description=bindings to picosat (a SAT solver)

[pyeda]
description=PyEDA is a Python library for electronic design automation.

[pyflakes]
description=passive checker of Python programs

Expand All @@ -241,6 +256,9 @@ description=Python interface to HDF4 files (Hierarchical Data Format version 4)
url=http://pysclint.sourceforge.net/pyhdf
category=dataproc

[PyHive]
description=PyHive is a collection of Python DB-API and SQLAlchemy interfaces for Presto and Hive.

[pyparsing]
description=A Python Parsing Module
url=http://pyparsing.wikispaces.com/
Expand Down