| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
Use get() with default value. Amends
8b484df1cf36cbf43192bc1e4669b5e3dcb591e7.
Change-Id: I728747e2de1ef9878a7a7698ec701055fcf18363
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
Verify that the commands exist.
Change-Id: I8a4263320774f151848f68b04bc7b4447afe2579
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
| |
Change-Id: Id24505e17c39a0e81fab283f04e53923d9f56d6a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
--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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
| |
The change allows using the provided SDK in all compilation targets.
Change-Id: I2b5d7b24af725e82c5468b9a5e22cc60fd0e42c4
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
This was modified, but not corrected in setup.py
|
|
|
|
|
|
| |
* 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
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
|
| |
I tried to build pyside using setup.py here on Ubuntu and I get the same problem like mentioned in #21.
The solution is to perfer qmake-qt5 over qmake. This shouldn't make any difference on OSX and Windows.
Fixes #21
|
|
|
| |
This is for testing an commit for shiboken2. The changes here might be incomplete.
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
show windows!
|
| |
|
| |
|
| |
|
|
|
|
| |
This is specially useful when installing from PyPI that passing --qmake is not as simple as setup.py approach.
|
|
|
|
| |
1. This is wrong for Python >= 3
2. No needed, because PySide2 does it now on it's own.
|
|
|
|
|
|
|
|
|
|
|
| |
The intention is to have PySide2 and Shiboken2 as project names, to
allow for co-existence of PySide and PySide2.
This is the first version that builds with these settings on OS X:
$ python3 setup.py build --debug --no-examples --ignore-git --qmake=/usr/local/Cellar/qt5/5.5.0/bin/qmake --jobs=9
This is not yet tested.
|
| |
|
|
|
|
| |
repository, too confusing.
|
|
|
|
| |
window debugging)
|
|
|
|
| |
This configuration needs to be set by setup.py and is then known in the make files.
|
| |
|
| |
|
|
|
|
|
|
| |
This bug is old, but showed up after I tried to build parts of PySide for Qt5.
Problem: There are rpath entries which don't trigger creation of an rpath command.
This can be seen when Qt is not linked, and qtcore has an explicit path.
|
|\
| |
| |
| |
| |
| | |
* 'master' of https://github.com/PySide/pyside-setup:
minimal update of Qt5 status.
Remove the need to use the post-install script on Mac OS platform and update the docs.
|
| |
| |
| |
| | |
update the docs.
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
# By David Strauss
# Via David Strauss (1) and Roman Lacko (1)
* 'master' of https://github.com/PySide/pyside-setup:
Fix spelling of OpenSSL
|
| | |
|
|/
|
|
| |
shiboken is ready, pyside comes now!
|
| |
|