Skip to content

Commit

Permalink
Merge branch '20-bump-to-3-11-18' into 'master'
Browse files Browse the repository at this point in the history
Resolve "Bump to 3.11.18"

Closes #20

See merge request qi/qibuild!18
  • Loading branch information
Julien BLONDEAU committed Mar 6, 2018
2 parents 06c2446 + 98e261c commit 10bc9b5
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake/qibuild/version.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (c) 2012-2018 SoftBank Robotics. All rights reserved.
## Use of this source code is governed by a BSD-style license that can be
## found in the COPYING file.
set(QIBUILD_VERSION "3.11.17" CACHE STRING "qibuild version" FORCE)
set(QIBUILD_VERSION "3.11.18" CACHE STRING "qibuild version" FORCE)
1 change: 1 addition & 0 deletions doc/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Changelog
.. toctree::
:maxdepth: 1

changes/3.11.18
changes/3.11.17
changes/3.11.16
changes/3.11.14
Expand Down
29 changes: 29 additions & 0 deletions doc/source/changes/3.11.18.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
v3.11.18
========

qibuild
-----------

* Fix pep8/pylint warnings and enforce zero warnings policy in continuous integration
* Add ssh options for connecting to a remote host for integration test purpose
* Add option to disable the last newline strip on the git wrapper call
* Update copyright with mentions to 2018 and SoftBank
* Add support for fixed refs and detached head in qisrc
* Normalize 'src' path in worktree project manifest to be compliant with Unix and Windows usage
* Fix qt5_3dquickextras-config.cmake filename
* Improve qisrc sync: better outupt when a project fails
* CMake Modules: fix raptor2 and rasqal config files
* Fix rpath management on OSX for python sdk
* Fix OSX rpath for targets generated in subfolders
* change way targets are referencing their dependencies on OSX
* Force rpath on OSX at build time
* Fix condition in ogre-config
* Add qt5_quicktest-config.cmake
* ci: Watch 'master' branch instead of 'next' on Travis
* Add GitLab Continuous integration
* qitest: fix exception when --test-output-dir is omitted
* qitoolchain: Fix feed test that ensure local subfeeds work
* Uniformize install and deploy
* Update qibuild test suite
* when generating a junit xml, write time at testcase level too
* fix subfeed in qitoolchain if git is used as feed source
2 changes: 1 addition & 1 deletion doc/source/conf.in.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# found in the COPYING file.

project = u'qiBuild'
version = '3.11.17'
version = '3.11.18'
release = version
sys.path.insert(0, os.path.abspath('../tools'))
# for autodoc
Expand Down
2 changes: 1 addition & 1 deletion python/qisys/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


def print_version(script_name):
sys.stdout.write("%s version 3.11.17\n" % script_name)
sys.stdout.write("%s version 3.11.18\n" % script_name)
import qibuild
qibuild_dir = os.path.dirname(qibuild.__file__)
python_dir = os.path.dirname(qibuild_dir)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def get_qibuild_cmake_files():
data_files = get_qibuild_cmake_files()

setup(name="qibuild",
version="3.11.17",
version="3.11.18",
description="The meta build framework",
url="http://doc.aldebaran.com/qibuild",
author="Aldebaran Robotics",
Expand Down

0 comments on commit 10bc9b5

Please sign in to comment.