Update source code with c++11 and python 2/3 compatibility for Ubuntu 17.10 #74
Conversation
Changed deprecated Qt methods.
Changed deprecated Qt methods.
Not tested.
fixes to GAIA_QT5 define
There was a problem hiding this comment.
Thank you for the updates! As your contribution is larger than 20 lines of code can you submit a CLA form?
Some changes are necessary (see comments). Also better description for this pull request itself (mention updates for all dependencies, including waf, eigen)
Some thoughts:
- It is not clear, we should update Eigen if it isn't entirely necessary.
- Will older versions of swig work?
- Remove hardcoded paths for GCC 7.2
- Support for Intel MKL should be optional (add a configuration flag, otherwise, remove)
- There are some unnecessary files (waflib)
.lock-waf_linux2_build
Outdated
| @@ -0,0 +1,8 @@ | |||
| argv = ['./waf', 'configure', '--with-python'] | |||
README.md
Outdated
| @@ -16,7 +16,7 @@ Dependencies: | |||
| * Qt >= 4.5 | |||
| * libYAML >= 0.1.1 | |||
| * Python >= 2.4 | |||
| * SWIG >= 1.3.31 | |||
| * SWIG >= 3.0.10 | |||
There was a problem hiding this comment.
Would still work with older swig versions? Ubuntu 14.04 LTS is 2.0.11.
There was a problem hiding this comment.
There is no swig limitation other than you have already had issues with.
gaia.txt
Outdated
| @@ -0,0 +1,286 @@ | |||
| Waf: Entering directory `/home/gordon/gaia/build' | |||
| @@ -0,0 +1,1702 @@ | |||
| ############################################################################# | |||
There was a problem hiding this comment.
Remove, as this file can be generated from Gaia2lib.pro
| @@ -4,63 +4,131 @@ | |||
| // Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.fr> | |||
| // Copyright (C) 2007-2011 Benoit Jacob <jacob.benoit.1@gmail.com> | |||
| // | |||
| // Eigen is free software; you can redistribute it and/or | |||
There was a problem hiding this comment.
To keep track of things, which version has Eigen been updated to and what is the reason for the update?
There was a problem hiding this comment.
The Eigen version 3.3.4 was mentioned and it was for c++11 compatibility.
src/wscript
Outdated
| @@ -119,6 +126,67 @@ def build_tools(bld): | |||
| use = ['gaia2'] + bld.env['USELIB']) | |||
|
|
|||
| # Cyclops server | |||
| if sys.platform.startswith('linux') and gaia_qt5: | |||
There was a problem hiding this comment.
There's lots of duplicated code. It may be good to shorted the code and assign a features variable first (to qt5 qt5network cxx cxxprogram cyclops or qt4 cxx cxxprogram cyclops depending on gaia_qt5) and then run the generic build command.
There was a problem hiding this comment.
I duplicated the code in the wscript files because I can only test on Ubuntu and I tried to leave build unchanged for other operating environments - the c++ source code changes likely will work for them too with the gnu compiler. Any changes/improvements recommended are okay with me. I still have to get the Cyclops option to compile without errors. The only other potential issue I am aware of is the location of the python directory eg. for 2.7 it is /usr/local/lib/python2.7/dist-packages. For python 3.6 it is /usr/local/lib/python3/dist-packages and I had fixed to /usr/local/lib/python3.6/dist-packages but wanted that to be more dynamic.
There was a problem hiding this comment.
Now use conditional build_tools_qt4 method and build_tools_qt5 method.
src/wscript
Outdated
| target = 'tools/cyclopsmaster', | ||
| includes = [ '.', 'metrics', '3rdparty', 'tools/cyclops_server/' ], | ||
| use = ['gaia2'] + bld.env['USELIB']) | ||
| # cyclops init scripts | ||
| if bld.env['WITH_CYCLOPS']: |
There was a problem hiding this comment.
Make sure that build commands aren't run twice in the case of linux.
There was a problem hiding this comment.
.waf runs some cyclops compiles twice and there is no easy way to avoid that.
src/wscript_new
Outdated
| @@ -0,0 +1,210 @@ | |||
| #!/usr/bin/env python | |||
There was a problem hiding this comment.
Remove this file, keep all updates in src/wscript
| VERSION="1.8.21" | ||
| REVISION="71bc2f1f9d6d313df7b3e05a55143f91" | ||
| GIT="x" | ||
| VERSION="2.0.6" |
There was a problem hiding this comment.
To document changes better, make sure to mention waf update to 2.0.6 in the pull request description.
There was a problem hiding this comment.
I've included release notes for Linux in my README.md. waf 1.9 or better is required for Python2 or Python3.
waflib/Build.py
Outdated
| @@ -0,0 +1,1474 @@ | |||
| #!/usr/bin/env python | |||
There was a problem hiding this comment.
The waflib/* files should not be necessary. Remove
will not compile
|
Will comply to all requested changes and send in CLA form. |
c++ 4 spaces python 2 spaces
update moc
Qt5meansQt5.6toQt5.10from launchpad.Python 2/3means forQt4and all other operating system same as before:./waf configure --with-python-bindings --with-tests --with-assertsorpython 3 ./waf configure --with-python-bindings --with-tests --with-assertsFor
Ubuntuor possibly other Linux platforms:./waf configure --with-python-bindings --with-tests --with-asserts --with-gaia-qt5orpython 3 ./waf configure --with-python-bindings --with-tests --with-asserts --with-gaia-qt5--with-cyclopsstill being worked on.