Dm/xml configs #2
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 16 commits
December 28, 2011 19:31
(confuses vim)
Of course, messing up with os.environ breaks other tests ...
This is a bug we still have to fix. Patches welcome!
* Do not use a config.py.in configured by cmake to find cmake That's too overkill and not very reliable anyway * Now honor CMAKE_INSTALL_PREFIX * Get rid of magic qibuild.CMAKE_QIBUILD_DIR global variable and use a function instead * Fix install of man pages * Install qibuild html doc * Add a quick script to test qibuild installation * Install a qibuild-config.cmake to be able to find the qibuild framework, * qibuild.cmake: update to version 11 include(qibuild/general) will work *only* is qibuild/general is in CMAKE_ROOT_PATH, and we do not want to install qibuild here (because it messes up with install rules) so we just use a qibuild-config.cmake.
You can now use: find_package(qibuild) and this will work because `qibuild configure` will gently set 'qibuild_DIR` for you ;)
Changes:
* 'global' qibuild.cfg in ~/.config/qi/qibuild.cfg is no longer read
* you can now have on IDE per config
* qibuild now opt-depends on lxml, to generate pretty xml files
* merging of '-c' option, default config et all is done by the
QiBuildConfig class instead of beeing done by Toc
* toc.update_toc_config() is gone, use
toc.config.set....
toc.save_config()
TODO:
* rename toc.configstore to toc.config ?
* use XML for internal storage of qitoolchain too?
(This fix automatic testing by may not be such a good idea)
Note1: the config for the project is now in qiproject.xml, so you can use the same sources with two versions of qibuild :) Note2: the conversion will only happen once, so be careful
|
Merged. |
opennao
pushed a commit
that referenced
this pull request
Feb 5, 2018
Change-Id: I15a55b5c8e8c267f82fa1535a2f1865c201493dc
opennao
pushed a commit
that referenced
this pull request
Feb 5, 2018
Warning below was fixed in pytest-cov 2.3.1: see details on pytest-dev/pytest#1684 pytest_funcarg__cov: declaring fixtures using "pytest_funcarg__" prefix is deprecated and scheduled to be removed in pytest 4.0. Please remove the prefix and use the @pytest.fixture decorator instead. Change-Id: Id8565778485eb502ef72b0635dfa222532de8dc6
opennao
pushed a commit
that referenced
this pull request
Feb 5, 2018
Change-Id: I13eb08420bf9d7f57e0d37fc18cfcc9d7a749b49
opennao
pushed a commit
that referenced
this pull request
Feb 5, 2018
For qitoolchain feeds, either 'url' or 'path' attributes must be set in a 'feed' non-root element Will now throw a violent AssertionError on malformed feed. Change-Id: I979d647adc9465de8d55d21dea1d3c7d3841553e
opennao
pushed a commit
that referenced
this pull request
Feb 5, 2018
Resolve "gitlab-ci is broken" Closes #2 See merge request qi/qibuild!6
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
You'll notice that there are three branches in this pull request:
master
it's mostly cleanup stuff: documentation, typos, cosemtic changes and so on ...
dm/find-package-qibuid
Cleanup the way we install qibuild, do not configure qibuild python code with cmake.
Also, make it possible to use
find_package(qibuild)
instead of
include(qibuild.cmake)
(and yes, the qibuild.cmake becomes unnecessary)
dm/xml-configs:
'global' qibuild.cfg in ~/.config/qi/qibuild.cfg is no longer read
'qibuild.cfg' is deprecated, use '.qi/qibuild.xml' instead
'qibuild.manifest' is deprecated, use '/qiproject.xml' instead
But the conversion is made on the fly by qibuild :)
you can now have on IDE per config
qibuild now opt-depends on lxml, to generate pretty xml files
merging of '-c' option, default config et all is done by the
QiBuildConfig class instead of beeing done by Toc
toc.update_toc_config() is gone, use
toc.config.set....
toc.save_config()