Permalink
Commits on Apr 7, 2011
  1. Merge remote branch 'mine/remove-internal-python'

    Jim Carroll
    Jim Carroll committed Apr 7, 2011
    * mine/remove-internal-python:
      Updated the xcode project for osx.
      Updated the ios and osx depends builds to no longer invoke configure with --enable-external-python.
      removed USE_EXTERNAL_PYTHON from the windows projects (from Linux, using emacs on the project files because it's easier than pulling up VS.
      Updated windows projects and code to remove the last evil vestages of internal python and it's wrappers.
      File changes to remove the last remnants of USE_EXTERNAL_PYTHON and --enable-external-python.
      Removed internal python from linux.
  2. Updated the xcode project for osx.

    jimfcarroll
    jimfcarroll committed Apr 7, 2011
  3. Updated the ios and osx depends builds to no longer invoke configure …

    Jim Carroll
    Jim Carroll committed Apr 7, 2011
    …with --enable-external-python.
  4. removed USE_EXTERNAL_PYTHON from the windows projects (from Linux, us…

    Jim Carroll
    Jim Carroll committed Apr 7, 2011
    …ing emacs on the project files because it's easier than pulling up VS.
  5. Updated windows projects and code to remove the last evil vestages of…

    jimfcarroll
    jimfcarroll committed Apr 7, 2011
    … internal python and it's wrappers.
  6. File changes to remove the last remnants of USE_EXTERNAL_PYTHON and -…

    Jim Carroll
    Jim Carroll committed Apr 7, 2011
    …-enable-external-python.
  7. Removed internal python from linux.

    Jim Carroll
    Jim Carroll committed Apr 7, 2011
  8. [osx] fixed build breakage

    davilla committed Apr 7, 2011
  9. [ios] fixed include paths

    davilla committed Apr 7, 2011
Commits on Apr 6, 2011
  1. Merge branch 'master' of github.com:xbmc/xbmc

    Jim Carroll
    Jim Carroll committed Apr 6, 2011
  2. The push of the external-python broke the default build for linux. Th…

    Jim Carroll
    Jim Carroll committed Apr 6, 2011
    …is fix is just until we get the external-python as the default on linux.
  3. Merge remote branch 'mine/ext-python'

    Jim Carroll
    Jim Carroll committed Apr 6, 2011
  4. Code changes to make external python work in windows. Changes credit …

    wsoltys authored and Jim Carroll committed Mar 12, 2011
    …to WiSo
    
    External pythong changes. Credit WiSo
    [WIN32] don't load python with our dll loader if USE_EXTERNAL_PYTHON is defined
    [WIN32] added osdefs.h for DELIM
    [WIN32] removed check for zlib.pyd. its in the core now
    [WIN32] unified log message
    [WIN32] set the PYTHONPATH within MSVCR90.DLL in order for python to pick it up
    [WIN32] external python doesn't need special wrapping and the path to the dll
    [WIN32] set some more python related env vars (might be removed from emu_msvcrt.cpp in future?)
    Fixed the error message for missing msvcrt dll so that it happens when the error condition occurrs.
    [WIN32] fixed: ext python should work now. Needs tests on win32 as I'm on win64
    [WIN32] fixed: the putenv source got missing
    [WIN32] removed DetectDVDtype.*
    [WIN32] cosmetics
    There's no reason to make a special case for osx when looking to acquire the python thread lock prior to the Py_Initialize.
    [WIN32] added delayed loaded dlls to the opengl project target
  5. Adding external python to the win32 build system. credit to WiSo and …

    jimfcarroll
    jimfcarroll committed Mar 21, 2011
    …blinkseb.
    
    Fixed the external python to work without the Dll proxies. Fixed XBPython.cpp so that even though it's directly linked, it works correctly allowing scripts to run multiple times. This included removing the Py_NO_SHARED_ENABLED and adding the USE_EXTERNAL_PYTHON. We now need to: set PYTHONPATH in the code, fix the debug linking, move the preprocessor changes to other builds besides Debug OpenGL.
    [WIN32] renamed python download deps.
    [WIN32] renamed python download deps.
    [WIN32] changed: we don't have debug libs for vanilla python. credit WiSo
    [WIN32] copy python dll to the debug directory - credit WiSo
    [WIN32] copy sdl.dll to the debug directory
    [WIN32] copy python dll to dependencies. Credit WiSo
    [WIN32] fixed dep script file
    [WIN32] download stripped down version of python 2.6.6
    [WIN32] enable external python (missing commit)
    fixed some settings on the two windows release configurations
  6. This commit represents the including of the new external python for w…

    wsoltys authored and Jim Carroll committed Mar 12, 2011
    …in32. credit goes to mostly WiSo and blinkseb.
    
    [WIN32] added include/python to the include path and removed lib/python/PC
    [WIN32] added python27.lib to the linker
    [WIN32] removed Py_NO_ENABLE_SHARED
    Still need the python directory that was under system because linux internal python build still put things there.
    There is a bug in the Windows external python because on Windows, the DLL that python is linked against may not be the DLL that xbmc is linked against. So passing a FILE* to python from an fopen has the potential to crash. This resolves that problem. Credit to blinkseb.
    added: download python dependencies with our script.
    changed: use Python 2.6.6 on Windows. Debug build is included in the archive, but not copied by default. Set DEBUG to true to copy these.
    [WIN32] changed: in case of debug python is used, be sure to exclude it from our installer
    [WIN32] fixed: get debug python working. The following has to be defined:
     - Py_NO_ENABLE_SHARED
     - Py_TRACE_REFS
    [WIN32] fixed: oups...
    [WIN32] changed: got external python work. It needs more testing to be sure. We don't link against a .lib to be able to load python from where we want (that's why Py_NO_ENABLE_SHARED is defined). We don't define USE_EXTERNAL_PYTHON because we need to use our dll loader.
    Fixed a couple of problems: 1) The Makefile.in file was merged incorrectly. 2) We cannot call PyEval_AcquireLock prior to the threads being initialized in linux.
    OSX shouldn't build the internal python ... ever ... but especially when USE_EXTERNAL_PYTHON is set.
  7. fixed: push back the extracted video duration to the VideoInfoTag var…

    mkortstiege committed Apr 6, 2011
    … m_strRuntime so we do not end up with an empty value in case no runtime was scraped (fixes #11405)
  8. refactor: renamed GetStreamDetailsForFileId to GetStreamDetails

    mkortstiege committed Apr 6, 2011
    Instead of passing the streamdetails and the file id to GetStreamDetails() it now takes the entire VideoInfoTag.
    As it's not used anywhere else it was made protected.
  9. updated: Finnish translation. closes ticket #11402

    viking spiff
    viking authored and spiff committed Apr 5, 2011
  10. fixed - watched/unwatched context menu items didn't do anything usefu…

    Jonathan Marshall
    Jonathan Marshall committed Apr 6, 2011
    …l for folders inside folders
  11. ensure watched status is set on items if they're not yet available in…

    Jonathan Marshall
    Jonathan Marshall committed Apr 6, 2011
    … the library
  12. [WIN32] fixed build

    wsoltys committed Apr 6, 2011
  13. fixes osx build

    Jonathan Marshall
    Jonathan Marshall committed Apr 6, 2011
  14. no need for the image to be actually rotated - XBMC handles this at d…

    Jonathan Marshall
    Jonathan Marshall committed Apr 6, 2011
    …isplay time