diff options
author | Roman Lacko <backup.rlacko@gmail.com> | 2013-07-02 12:56:15 +0200 |
---|---|---|
committer | Roman Lacko <backup.rlacko@gmail.com> | 2013-07-02 12:56:15 +0200 |
commit | 0b8386326fa1992ac25271297c8f44debb681c90 (patch) | |
tree | aa89625c08a199830fdbd91624fdef24ceab7449 | |
parent | 7d3a13c26bb82255441329c68eefe646c00c8c22 (diff) |
Since version 1.2.0 there is no need to run post install procedure on win32
-rw-r--r-- | README.rst | 34 | ||||
-rw-r--r-- | pyside_postinstall.py | 5 |
2 files changed, 20 insertions, 19 deletions
diff --git a/README.rst b/README.rst index 67464eb87..78a0d5d42 100644 --- a/README.rst +++ b/README.rst @@ -43,10 +43,6 @@ There are two options to install PySide on Windows: :: c:\> c:\Python27\Scripts\easy_install PySide - c:\> c:\Python27\python.exe c:\Python27\Scripts\pyside_postinstall.py -install - - Note that the post-install procedure is not needed when installing via installer. - The installer calls the pyside_postinstall.py script automatically. Installing PySide on a UNIX System ---------------------------------- @@ -100,8 +96,8 @@ Installing prerequisities c:\> c:\Python27\python distribute_setup.py -Building PySide distribution ----------------------------- +Building and installing PySide distribution +------------------------------------------- #. Clone ``PySide`` setup scripts from git repository: @@ -127,17 +123,11 @@ Building PySide distribution c:\> c:\Python27\python.exe setup.py bdist_wininst --msvc-version=10.0 --qmake=c:\Qt\4.8.4\bin\qmake.exe --openssl=c:\OpenSSL32bit\bin -#. After the successful build, install the distribution with easy_install - and run the post-install script: +#. After the successful build, install the distribution with easy_install: :: c:\> c:\Python27\Scripts\easy_install dist\PySide-1.2.0.win32-py2.7.exe - c:\> c:\Python27\python.exe c:\Python27\Scripts\pyside_postinstall.py -install - - # After successfull install, the post-install script should print the following information to the console: - - c:\> The PySide extensions were successfully installed. Building PySide on a UNIX System (Ubuntu 12.04 LTS) =================================================== @@ -179,8 +169,8 @@ Installing prerequisities $ sudo python2.7 distribute_setup.py -Building PySide distribution ----------------------------- +Building and installing PySide distribution +------------------------------------------- #. Clone ``PySide`` setup scripts from git repository: @@ -212,11 +202,13 @@ Building PySide distribution :: $ sudo easy_install-2.7 dist/PySide-1.2.0.egg + +#. If installing package that was built with --standalone option, + run the post-install script: + + :: + $ sudo python2.7 pyside_postinstall.py -install - - # After successfull install, the post-install script should print the following information to the console: - - $ PySide package successfully installed in... PySide Setup Script command line options ======================================== @@ -332,6 +324,10 @@ PySide - Fix multiple segfaults and better track the life time of Qt objects - Fix multiple memory leaks +- Configure Qt library at import time - there is no more need to call + post-install script when installing PySide via easy_install. + *Note that post-install is still required on POSIX platform + when installing package that was built with --standalone option*. Shiboken ******** diff --git a/pyside_postinstall.py b/pyside_postinstall.py index 0b1a7979a..3cae89970 100644 --- a/pyside_postinstall.py +++ b/pyside_postinstall.py @@ -248,6 +248,11 @@ def install_win32(): pyside_path = pyside_path.replace("lib/site-packages", "Lib/site-packages")
print("PySide package found in %s..." % pyside_path)
+ # Since version 1.2.0 there is no need to run post install procedure on win32
+ from PySide import __version_info__ as pyside_version_info
+ if pyside_version_info >= (1,2,0):
+ return
+
if is_bdist_wininst:
# Run from inside the bdist_wininst installer
import distutils.sysconfig
|