aboutsummaryrefslogtreecommitdiffstats
path: root/setup.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-06-091-1/+1
|\ | | | | | | Change-Id: I73f39966a2af7aa935e1890e29c9b71573aae97c
| * utils: Handle SymlinksFriedemann Kleint2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | Try to recreate the .so version symlinks correctly on Linux instead of copying the files. Task-number: PYSIDE-526 Change-Id: I3b015efe4f2f57abe418f171a8631d194ed08f65 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | testrunner.py/Windows: Add Clang to the pathFriedemann Kleint2017-06-061-17/+1
| | | | | | | | | | | | | | | | | | | | | | It is required for shiboken's ApiExtractor tests. Move subroutine detectClang into utils.py for usage by testrunner.py/setup.py. Task-number: PYSIDE-431 Change-Id: I9f1984ea9fc9857ad3e7fddf621884fdc96ef52f Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-06-021-1/+1
|\| | | | | | | Change-Id: Ia6485d1b1caa93c4ecdd02b0544f19d197a43fb0
| * Fix .so filter for LinuxFriedemann Kleint2017-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | Previously, libpyside.so would not match .so.* and so, the libraries were not copied. Task-number: PYSIDE-526 Change-Id: I407db564beaee1f443dc7b816bc0bf798c8aacf1 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-05-231-9/+7
|\| | | | | | | Change-Id: Iae075ebf8614dd016166bcb5f105f695e7dc3de2
| * setup.py/prepare_coin_sources.py: Adapt to repository mergeFriedemann Kleint2017-05-231-7/+7
| | | | | | | | | | | | | | | | Remove the former submodules pyside2/shiboken2 from the modules lists. Change-Id: I41de78f5519c24cce1e649eaf3b2f2d1cabcc9b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | setup.py/Windows: Add Clang to PATHFriedemann Kleint2017-05-191-1/+31
| | | | | | | | | | | | | | | | | | | | This removes the need for PATH to be added by COIN and makes provisioning easier. It should be revisited once Clang is shipped as 3rdparty library for Qt. Task-number: PYSIDE-431 Change-Id: I6868a2cfda4b519065c8db33e0779e6c48ba9fae Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-05-191-19/+49
|\| | | | | | | Change-Id: I551cb95411e934d2a9f2b747ca70cf9a063b65c1
| * Fix Python libraries to be found for macOS Python 2.6 interpreterAlexandru Croitor2017-05-031-18/+40
| | | | | | | | | | Change-Id: I0dbd65a23bde599f923811c74d0565f329116c93 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix Python libraries to be found on OpenSuSE 13.01Alexandru Croitor2017-05-031-0/+2
| | | | | | | | | | Change-Id: I8bc9f18e5e85ff22ab4e6f24d9bf0917730b7a23 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix syntax error for format method on Python 2.6Alexandru Croitor2017-05-031-2/+2
| | | | | | | | | | Change-Id: I5f2ecb29ca904b6b5a011f461debda62f38dbdc2 Reviewed-by: Christian Tismer <tismer@stackless.com>
| * Fix CMake bug where incorrect CMAKE_OSX_SYSROOT was chosenAlexandru Croitor2017-04-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Apparently in earlier versions of CMake, if the OS version found in CMAKE_OSX_DEPLOYMENT_TARGET did not have a corresponding SDK with the same version in XCode, the CMake build would fail. Make sure to use the latest SDK available to XCode. Change-Id: Ie2317c1d285377b0cd5c7a75c94628b03aef557e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-04-211-30/+34
|\| | | | | | | Change-Id: I722a7c48e44380241dc8f6b013830e07bb0438f5
| * setup.py: Wrap prepare_packages in try/exceptFriedemann Kleint2017-04-201-26/+30
| | | | | | | | | | | | | | | | Print a message mentioning the function as otherwise it is quite hard to figure out where failures come from. Change-Id: Ib007c666e0ef406261c80e317004d1e439cf0403 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * setup.py: Fix .pdb file namesFriedemann Kleint2017-04-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | Remove the python version suffix, fixing error error: [Errno 2] No such file or directory: 'pyside-setup56d\\testenv3d_build\\py3.5-qt5.6.3-64bit-debug/shiboken2/libshiboken/shiboken2-python3.5.pdb' when building Windows with debug. Change-Id: I4352e77d67732ea5f2a60766a47f0dfca163a9a5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add version 5.9 and make it defaultFriedemann Kleint2017-04-071-1/+8
| | | | | | | | | | Change-Id: Ie7814933cb257a0ce495ad40d98dcacec4b78903 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge branch '5.6' into devFriedemann Kleint2017-04-051-0/+7
|\| | | | | | | | | | | | | Drop the change changing the default version to 5.6 in setup.py. Change-Id: Ifafc76c36ad9170271d7ed9db9ab5303b4606242
| * Add version 5.6 and make it defaultFriedemann Kleint2017-04-051-1/+8
|/ | | | | Change-Id: I323c5f69ee4ba1b1c04addd2eeb9a4a76b99a54c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Create a tracking branch for version unless it existsFriedemann Kleint2017-03-201-1/+11
| | | | | Change-Id: Ie7832668e0a4adf4dcbf78e49c2af4b65ebe5107 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Support python 3.6Christian Tismer2017-02-071-2/+3
| | | | | | | | The necessary support for python 3.6 is just changing the setup.py file. Task-number: PYSIDE-471 Change-Id: Id5c0ad67d1bb9d360f333a415bed65e62c30b53e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Add explanatory comment to repository checkFriedemann Kleint2017-02-071-0/+1
| | | | | | | Amends change b97da3efa0462a4de6ae20904dde3843bc18bce2. Change-Id: I8a48aa0d313f370f3933ff699ec2ed347f760e8b Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Check whether files are present in a submoduleFriedemann Kleint2017-01-121-1/+1
| | | | | | | | | | Calling setup.py to initialize the submodules from scratch would fail complaining about the missing 'master' branch in 'wiki', since it assumed the submodules were initialized if the directory was present. Check the directory contents instead. Change-Id: I577a97d8cacf408f7caf52565e13e88815475a3b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Set the minimum Python3 to 3.3Christian Tismer2016-11-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | This was not really set. The setup supported 3.2, the default was saying 3.4, and I have set it now to 3.3. Reason: Besides a sensible useful minimum version, Python 3.3.3 is the only currently working version, which allows for a debug python build on macOS. I need this for my debugging work, admittedly. So this change is really made to support PYSIDE-79. Victor Stinner has supplied a patch three years ago, see https://mail.python.org/pipermail/python-bugs-list/2013-July/209044.html Since then, the patch was not maintained, and the problem has crept into python, again. If I find some time for it, then I will fix it. Task-number: PYSIDE-79 Change-Id: I1b7d4ff1613d31567095636edc61f4222fad08dd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make paths absolute in setup.pyChristian Tismer2016-10-181-1/+6
| | | | | | | | | | | | | | | The paths for "qmake" and "cmake" will not work when they are relative paths. This problem is pretty subtle, when setup.py breaks because it cannot create the simple list at line 712, variable "cmake_cmd". This innocent looking list is causing problems, because it uses qtinfo.py, and this is dependent on properties which call back into the subprocess module! The properties in qtinfo.py are now real properties, because their values are early computed in __init__. The problem is solved by this patch. Change-Id: I877b6644fa2909ca9ac1f23d4ce5accfc869716b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* setup: Add QT_SRC_DIR variableFriedemann Kleint2016-10-141-0/+10
| | | | | | | | | Presence of the variable enables the generation of the doc targets in PySide2. Task-number: PYSIDE-363 Change-Id: I0e1d4702da297f2390f09f9354c413da24febee1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix licenses of setup.py testrunner.pyFriedemann Kleint2016-10-121-0/+39
| | | | | Change-Id: I049929e2c4e24554866000df5daa063071060884 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Build shiboken with documentation generator by defaultFriedemann Kleint2016-09-281-1/+0
| | | | | Change-Id: I7ebf94d93ce5125deadf103bb4354e54079a372b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* support pyside CI testing with filteringChristian Tismer2016-09-221-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PySide is currently in an unfinished state. Therefore, running all the tests will never return a success. To make this more useful, this script is controlled by a blacklist, in order to keep record of the known-to-fail tests. On success: zero error status On Failure: nonzero (raises ValueError) The test parser uses a blacklist file that is compatible to standard Qt blacklist files. macOS, Ubuntu and windows (thanks to fkleint) are supported. The blacklist has a feature where new configurations are learned. It first removes old versions of the same tests, before it inserts the new ones. Blacklisting is now optional. We support now py2, py3, qt5, qt5.6 etc. Some consideration about collapsing the data are added. The parser has now a sub-command "test" that is mandatory. Support for moving the build_dir to another location without loosing the tests so far. Implement BPASS. Support CTEST_OUTPUT_ON_FAILURE Change-Id: If66d3cf1733a3b0c8a47fe9b8c6aec8ea430c699 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix retrieving VIRTUALENV variableFriedemann Kleint2016-09-221-1/+1
| | | | | | | | Use get() with default value. Amends 8b484df1cf36cbf43192bc1e4669b5e3dcb591e7. Change-Id: I728747e2de1ef9878a7a7698ec701055fcf18363 Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Prefix build/install directories by virtualenv nameFriedemann Kleint2016-09-211-2/+10
| | | | | | | | | | Use testenv_name_build/testenv_name_install instead of pyside_build_install when a virtual environment exists. This makes it easier to maintain builds in varying environments in parallel for comparing things. Change-Id: I33f672a24d871ccb8c9aad1614b7b3eded33b93c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Make prepareSubModules() a bit smarterFriedemann Kleint2016-09-161-14/+35
| | | | | | | | | | | | Avoid unnecessarily re-initializing the submodules and checking out branches. In a first loop, collect the subdirectories and check whether any are missing. Initialize submodules only in that case. In the second loop, check out the correct branch if it differs. Change-Id: I3c16fd9b7bd6feb77b7b921d61f7e622cfab797f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Improve finding the respective make tool on WindowsFriedemann Kleint2016-09-151-11/+10
| | | | | | | | | Check whether nmake can actually be found. Invert option --jom to --no-jom so that jom is used by default. As options are not checked, --jom will then be simply ignored. Change-Id: I67bd7f92d3bb2800530847abe0808283ca14d8a4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Add completion messages to build and installFriedemann Kleint2016-09-121-0/+2
| | | | | | | | It is sometimes hard to tell whether the build finished successfully, add a message to show it. Change-Id: If9a20272f851fbe0ade801ddab1bee11fca807da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Restructure setup.pyFriedemann Kleint2016-09-121-16/+27
| | | | | | | | | | | | | | | Move all code that was unconditionally executed at startup into a subroutine prepareBuild() and execute that from the build command class. Overwrite the Distutils'_install to be extended. This makes the standard --help options of DistUtils work as expected and causes the script to require a command argument instead of starting unconditionally. Change-Id: I0bf1bfc4ba0e15662122733b04e468f1838e4ae8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Fix checking for qmake/cmake binariesFriedemann Kleint2016-09-121-1/+15
| | | | | | | Verify that the commands exist. Change-Id: I8a4263320774f151848f68b04bc7b4447afe2579 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Let OPTION_REUSE_BUILD imply OPTION_IGNOREGITFriedemann Kleint2016-09-121-1/+1
| | | | | Change-Id: Id24505e17c39a0e81fab283f04e53923d9f56d6a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* setup.py: Fix branchesFriedemann Kleint2016-07-261-2/+6
| | | | | | | | | | | | | | | | | - Change the examples to the dev branch - Introduce an optional 3rd parameter to the submodules hash pointing to the directory and use that to switch the wiki module to the master branch. This makes it possible to run commands like git submodule foreach git pull which did not work previously due to the wiki submodule being in a headless state. Change-Id: Ib90f68f73e3401431fd2dce90f02ed75095a5429 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Add various setup.py build options for development convenience.Alexandru Croitor2016-06-201-20/+55
| | | | | | | | | | | | | | | --reuse-build option will rebuild only modified sources, --skip-cmake skips generating new Makefiles, --skip-make-install skips executing make install, --skip-packaging will not create a python package. A combination of these can decrease development iteration time, instead of constantly rebuilding the whole world, or waiting for the packaging to be done, when you are only interested if a certain file compiles. Change-Id: I755f102573dcb37ceb1b835b0843f244c2d4114e Reviewed-by: Christian Tismer <tismer@stackless.com>
* Fix OS/X inclusion of framework headers.Alexandru Croitor2016-06-161-4/+10
| | | | | | | | | | | | | | | | | | | | | The recent change that made use of framework headers on OS/X did not work with homebrew Qt, and it didn't work with official builds either, because neither of the chosen include folders contained all the necessary headers to lead to a successful build. Fortunately shiboken actually supports being passed multiple include locations, separated by a colon on OS/X, and a semicolon on Windows. This patch makes sure to always pass the Qt include folder, and in case if the Qt build is a framework build, also passes the root frameworks location, with headers found by shiboken under frameworkName.framewework/Headers. This works for homebrew builds, official builds and custom non-installed prefix / in-source builds of Qt. Change-Id: I47b24e197839883de2ab873461efc1f4d4d33743 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Include Qt framework headers in osxSimo Fält2016-06-031-1/+5
| | | | | | | | | While using Qt binaries installed with Qt Company installer, pyside can't find header files which are installed to lib/Qt<module>.framework/Headers directory. Change-Id: If74f5b3bf0f139bbcc6e9b62fb16e125f6ca9d4c Reviewed-by: Christian Tismer <tismer@stackless.com>
* setup.py: Remove Qt Quick 1 imports folder.Friedemann Kleint2016-06-011-10/+0
| | | | | | | | Qt Quick 1 has been removed in Qt 5.6. Change-Id: I4db96e3a5613d8abe208841752c6ea25e72c4a8e Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Christian Tismer <tismer@stackless.com>
* Allow explicitly setting the OSX sysroot / SDK.Alexandru Croitor2016-05-201-0/+7
| | | | | | | The change allows using the provided SDK in all compilation targets. Change-Id: I2b5d7b24af725e82c5468b9a5e22cc60fd0e42c4 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Add option to link with libc++ on older OSX versions.Alexandru Croitor2016-05-111-0/+10
| | | | | | | | | | | | | | Versions of OSX lower than 10.9 link libstdc++ by default. Also libstdc++ is linked when the osx minimum deployment target is lower than 10.9. The new option allows explicitly linking libc++ in the cases mentioned above. It is not enabled by default, because most libraries and executables on versions lower than 10.9 are compiled with libstdc++, and mixing standard library versions can lead to crashes. Change-Id: I7397d2bbce2cfceaeb848f25e0bbf1a24ac9bde8 Reviewed-by: Christian Tismer <tismer@stackless.com>
* Switch submodule repositories.Friedemann Kleint2016-05-021-7/+4
| | | | | | | | | | Clone submodules from code.qt.io and adapt branches. Change-Id: Iecf128ca00c4eb25e5450db8630e42e9307bd7cc Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* fix the name pyside2uicChristian Tismer2016-04-191-12/+12
| | | | This was modified, but not corrected in setup.py
* Cleanup around qtinfo.pyThomas-Karl Pietrowski2016-02-031-12/+9
| | | | | | * cleaning up unneeded redeclarations in setup.py * making sure our "-qt=X" get passed to cmake (doesn't make any difference so far, but makes sense) * rename getQMakePath to getQMakeCommand and make it return the complete command
* Adding -qt=X option only if qmake is a link to qtchooserThomas-Karl Pietrowski2016-02-031-1/+10
| | | | | | | | | | | | | On Linux (at least on Ubuntu and Debian) qtchooser is used to switch between different installations of Qt. A user reported that on Windows this method does not (seem) exist. Don't know whether his/her Qt5 setup was correct or not, but this commit adds a check, which * Looks whether qmake exists at all * Checks whether it is a symlink * Checks whether the symlink is pointing at a existing file * And check whether this file is qtchooser. It doesn't matter if the link is called "/usr/bin/qtchooser" or "qtchooser" and we only add "-qt=X" in these cases.
* Intoducing new option "qt"Thomas-Karl Pietrowski2016-02-021-1/+4
| | | | | | | | | | | | | | | | | | | I would even call it qt_version, but qtchooser, which switches between different versions of Qt, is also using this option. So I hope this would be less confusing for other people. So in case you have different Qt5 installations you can choose now one of them by using --qt=5.4 for example. ``` $ qtchooser -l 4 5 default qt4-i386-linux-gnu qt4-x86_64-linux-gnu qt4 qt5-x86_64-linux-gnu qt5 ``` The main reason for this commit is that qtchooser chooses qt4 as default here on Ubuntu/Linux (as we can also see in the travis builds). This commit will add the option plus add the default to qt5.
* Passing command(s) to qtinfo as listThomas-Karl Pietrowski2016-02-021-1/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 05:00:20 +0000