diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2013-10-01 18:12:50 +0200 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2013-10-02 13:14:02 +0200 |
| commit | cc6ec06783d9cd580b47a9bf64b8efb50ec58b88 (patch) | |
| tree | 3ad8e3ba78905a0877e29ba9bd687fac3f1d7a65 /project/BuildDependencies | |
| parent | 99749c90087d3dce0a21e7b19bafe57dfaa4c3af (diff) | |
[win32] bump to Python 2.7.5 and PIL-1.1.7.win32-py2.7
Diffstat (limited to 'project/BuildDependencies')
| -rw-r--r-- | project/BuildDependencies/scripts/0_package.list | 1 | ||||
| -rw-r--r-- | project/BuildDependencies/scripts/PIL_d.txt | 2 | ||||
| -rw-r--r-- | project/BuildDependencies/scripts/python_d.bat | 35 | ||||
| -rw-r--r-- | project/BuildDependencies/scripts/python_d.txt | 2 |
4 files changed, 2 insertions, 38 deletions
diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list index 7ac7d1e551..0e88bed8b9 100644 --- a/project/BuildDependencies/scripts/0_package.list +++ b/project/BuildDependencies/scripts/0_package.list @@ -13,5 +13,6 @@ libnfs-1.6.1-win32.7z libshairplay-c159ca7-win32.7z libjpeg-turbo-1.2.0-win32.7z pcre-8.33-win32.zip +python-2.7.5-win32.7z sqlite-3.7.16.1-win32.7z taglib-1.8-win32.7z diff --git a/project/BuildDependencies/scripts/PIL_d.txt b/project/BuildDependencies/scripts/PIL_d.txt index cde7c2cde9..54e6c11829 100644 --- a/project/BuildDependencies/scripts/PIL_d.txt +++ b/project/BuildDependencies/scripts/PIL_d.txt @@ -1,2 +1,2 @@ ; filename mirror source of the file -PIL-1.1.7.win32-py2.6.exe http://mirrors.xbmc.org/build-deps/win32/ http://www.pythonware.com/products/pil/ +PIL-1.1.7.win32-py2.7.exe http://mirrors.xbmc.org/build-deps/win32/ http://www.pythonware.com/products/pil/ diff --git a/project/BuildDependencies/scripts/python_d.bat b/project/BuildDependencies/scripts/python_d.bat deleted file mode 100644 index a5a56362c4..0000000000 --- a/project/BuildDependencies/scripts/python_d.bat +++ /dev/null @@ -1,35 +0,0 @@ -@ECHO ON - -SET LOC_PATH=%CD% -SET FILES=%LOC_PATH%\python_d.txt - -CALL dlextract.bat python %FILES% - -cd %TMP_PATH% - -set DEBUG=false - -echo \test\ > py_exclude.txt - -if "%DEBUG%" == "false" ( - echo _d.dll >> py_exclude.txt - echo _d.pyd >> py_exclude.txt - echo _d.lib >> py_exclude.txt - echo .pdb >> py_exclude.txt - echo tcl85g. >> py_exclude.txt - echo tclpip85g. >> py_exclude.txt - echo tk85g. >> py_exclude.txt -) - -xcopy python2.6.6\include\* "%CUR_PATH%\include\python" /E /Q /I /Y /EXCLUDE:py_exclude.txt -xcopy python2.6.6\python\DLLs "%XBMC_PATH%\system\python\DLLs" /E /Q /I /Y /EXCLUDE:py_exclude.txt -xcopy python2.6.6\python\Lib "%XBMC_PATH%\system\python\Lib" /E /Q /I /Y /EXCLUDE:py_exclude.txt -xcopy python2.6.6\python26.dll "%XBMC_PATH%\project\Win32BuildSetup\dependencies\" /Q /I /Y /EXCLUDE:py_exclude.txt -xcopy python2.6.6\libs\*.lib "%CUR_PATH%\lib\" /E /Q /I /Y /EXCLUDE:py_exclude.txt -xcopy python2.6.6\libs\*.pdb "%CUR_PATH%\lib\" /E /Q /I /Y /EXCLUDE:py_exclude.txt - -rem for debugging -xcopy python2.6.6\python26.dll "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)\" /Q /I /Y /EXCLUDE:py_exclude.txt -xcopy python2.6.6\python26_d.dll "%XBMC_PATH%\project\VS2010Express\XBMC\Debug (DirectX)\" /Q /I /Y /EXCLUDE:py_exclude.txt - -cd %LOC_PATH% diff --git a/project/BuildDependencies/scripts/python_d.txt b/project/BuildDependencies/scripts/python_d.txt deleted file mode 100644 index 1c15979445..0000000000 --- a/project/BuildDependencies/scripts/python_d.txt +++ /dev/null @@ -1,2 +0,0 @@ -; filename source of the file -python2.6.6.7z http://mirrors.xbmc.org/build-deps/win32/ |