aboutsummaryrefslogtreecommitdiffstats
path: root/qtinfo.py
Commit message (Collapse)AuthorAgeFilesLines
* Split and move various setup.py parts into different filesAlexandru Croitor2018-04-301-237/+0
| | | | | | | | | | | | | | | | | This is an initial effort to clean up setup.py. A new directory called build_scripts contains most of the logic for building, leaving setup.py as an entry point. The build_scripts directory contains the usual qtinfo, utils, and the setup.py content has been split into main.py and platform specific files under platforms subfolder. The testrunner script has been modified to find the new location of the utils module. Task-number: PYSIDE-558 Change-Id: I3e041d5116ca5c3f96c789317303b65a7b1bbd70 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Reformat and remove of trailing spaces from filesCristian Maureira-Fredes2018-04-191-6/+9
| | | | | | | | Continuing the 72/79 reformatting with the remaining Python files. Change-Id: I4fc0abd720326a16ed4b2d431fd703de71fe02e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2018-03-051-16/+129
|\ | | | | | | Change-Id: I452d3a0a04e282b678879132ca1b3a272910ef04
| * Improve macOS minimum deployment target decision processAlexandru Croitor2018-03-021-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of asking the user to specify a minimum macOS deployment target, setup.py will now query the value from qmake. A user can still specify a custom value if they wish to do so. This simplifies building on the CI, meaning there is no need to hardcode the minimum deployment targets per branch. Task-number: PYSIDE-603 Task-number: PYSIDE-606 Change-Id: I55c79dc643b5a2b59d0e65add132c581fb6fc7f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Improve QtInfo classAlexandru Croitor2018-03-021-16/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the class would do a qmake process invocation for each qmake -query property, after this change only a single invocation is done to get all the query properties. In addition another new invocation is done to find all mkspecs variable, in order to find what kind of Qt build is being used: a debug build, release build, or debug_and_release build. This information is useful for packaging purposes, to know which files should be copied or ignored. Change-Id: If1ee4d19e0cc550e40dc568d1256030c8928c4e5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Friedemann Kleint2017-11-271-0/+12
|\| | | | | | | Change-Id: I79637555fbfbd596dee4313baf80149d03bb5206
| * Make standalone option work on macOSAlexandru Croitor2017-11-151-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements standalone option on macOS, both for .dylib Qt build and framework build. Multiple rules are applied to figure out which files need to be copied into the final package. We also take care to embed a proper LC_RPATH for the PySide libraries, so that they point to the copied over Qt libraries. Change-Id: I442749e7c2318a66a22e3a1dd0ae703fb8943acf Task-number: PYSIDE-558 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Fix licensesFriedemann Kleint2017-04-051-0/+39
|/ | | | | | | | | | | | | | | | | | Fix license checker error messages when run in default mode (git ls-files in pyside-setup): Failed test '.../pyside-setup/header.LGPL re-defines a license of type LGPL originally defined in .../qtbase/header.LGPL' not ok 2 - docs/conf.py does not appear to contain a license header not ok 3 - docs/make.bat does not appear to contain a license header not ok 4 - ez_setup.py does not appear to contain a license header not ok 5 - popenasync.py does not appear to contain a license header not ok 7 - qtinfo.py does not appear to contain a license header not ok 11 - utils.py does not appear to contain a license header Task-number: PYSIDE-491 Change-Id: Ia10ff40ef39c64ac717f36ed073b1d1675a150d1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make paths absolute in setup.pyChristian Tismer2016-10-181-1/+10
| | | | | | | | | | | | | | | 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>
* Cleanup around qtinfo.pyThomas-Karl Pietrowski2016-02-031-8/+6
| | | | | | * 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
* Fixing the hotfix: Importing needed "os" and at least replacing _qmake_path ↵Thomas-Karl Pietrowski2016-02-031-2/+2
| | | | | | with _qmake_command Well, not more left to say.
* Hotfix: correcting variable nameThomas-Karl Pietrowski2016-02-031-1/+6
| | | | | | Like an user noticed (thanks for that), I just missed to rename a variable. So I just fixed it and added made the code at this place a little bit more failsave. https://github.com/PySide/pyside2-setup/commit/ca90a050c12f52bf5f4fb55f721ee5811f583afe#commitcomment-15862337
* Passing command(s) to qtinfo as listThomas-Karl Pietrowski2016-02-021-6/+6
|
* support the location of the installed Qt5 docs.Christian Tismer2015-07-161-0/+4
| | | | This configuration needs to be set by setup.py and is then known in the make files.
* use the headers info that can be found in "qmake -query".Christian Tismer2013-10-181-0/+4
| | | | Since Qt has a headers variable, there is no reason for a work-around.
* Don't use custom popenasync module on linux to run commands. This fixes ↵Roman Lacko2012-09-071-10/+5
| | | | following error: can't concatenate bytes to None
* new --standalone option, when enabled, package qt libs on linuxRoman Lacko2012-06-071-0/+4
|
* Initial commit (copy of lck/pyside-dist repo)Roman Lacko2012-06-041-0/+51
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 21:20:17 +0000