Improve conda support on windows #27

fredboudon · 2017-12-04T12:33:37Z

No description provided.

- fix bug with find_executable_path_from_env that raise exception if no executable is found. Return None now.

Fixed Qt5 DLL paths

- add glu32 for open tool on windows - fix bugs with install and builddir

fredboudon · 2017-12-05T17:22:44Z

@pradal I change a number of tools to better take into account conda environment, in particular on windows.

pradal

@fredboudon Excellent. I have done some minor review. Mainly change CONDA_LIBRARYPREFIX to CONDA_LIBRARY_PREFIX.

pradal · 2017-12-05T22:21:23Z

src/sconsx/config.py

 CONDA_ENV = is_conda()
 CONDA_PREFIX = conda_prefix()
+CONDA_LIBRARYPREFIX = conda_library_prefix()


Replace CONDA_LIBRARYPREFIX by CONDA_LIBRARY_PREFIX

Add also a new line

pradal · 2017-12-05T22:23:14Z

src/sconsx/qt4.py

@@ -251,10 +251,16 @@ def locateQt4Command(env, command, qtdir) :
    env['QTDIR']  = _detect(env)
    # TODO: 'Replace' should be 'SetDefault'
 #    env.SetDefault(
+    qtinclude = os.path.join('$QTDIR', 'include')


It would be nice to explain why we search a dir with qt and qt/QtCore.
Later on these lines have to be understandable...

pradal · 2017-12-05T22:24:21Z

src/sconsx/tools/ann.py

@@ -40,8 +40,8 @@ def depends(self):
   def default(self):

      if CONDA_ENV:
-         self._default['include'] = pj(CONDA_PREFIX,'include')
-         self._default['libpath'] = pj(CONDA_PREFIX,'lib')
+         self._default['include'] = pj(CONDA_LIBRARYPREFIX,'include')


Replace CONDA_LIBRARYPREFIX by CONDA_LIBRARY_PREFIX

pradal · 2017-12-05T22:24:33Z

src/sconsx/tools/bison.py

@@ -34,7 +34,11 @@ def __init__(self, config):
   def default(self):

      if CONDA_ENV:
-          self._default['bin'] = os.path.join(CONDA_PREFIX, 'bin')
+          if os.name == 'posix':
+            self._default['bin'] = os.path.join(CONDA_LIBRARYPREFIX, 'bin')


pradal · 2017-12-05T22:26:26Z

src/sconsx/tools/boost_base.py

@@ -56,8 +69,11 @@ def default(self):

        # -- lets now look for decent include dirs --
        if CONDA_ENV:
-            self._default['include'] = pj(CONDA_PREFIX, 'include')
-            self._default['lib'] = pj(CONDA_PREFIX, 'lib')
+            self._default['include'] = pj(CONDA_LIBRARYPREFIX, 'include')


CONDA_LIBRARY_PREFIX

pradal · 2017-12-05T22:29:10Z

src/sconsx/tools/builddir.py

+        #    self._conda_build = False
+        #    prefix = self._default['build_prefix'] = pj(self.config.dir[0],"build-scons")
+
+        prefix = self._default['build_prefix'] = pj(self.config.dir[0],"build-scons")


Not sure I understand. On conda, we want to put the lib, include and bin directly in the PREFIX and LIB_PREFIX and not in build_scons, isn't it?

No, see deploy. The cleanest solution is to build in build-scons and install on system. See install.py for thus

Deploy has always called scons in a build mode and not in install mode. I had some problem on Linux/Mac because if I build the lib in build-scons, libs are linked with other libs in the build-scons/lib and conda do not succeed t relocate it.
So we have to test this behavior. If it works, I am OK do move from scons build to scons install

pradal · 2017-12-05T22:29:27Z

src/sconsx/tools/cgal.py

@@ -44,7 +44,7 @@ def default(self):
      self._default['flags'] = ''
      self._default['defines'] = ''
      if CONDA_ENV:
-          prefix = CONDA_PREFIX
+          prefix = CONDA_LIBRARYPREFIX


CONDA_LIBRARY_PREFIX

pradal · 2017-12-05T22:31:21Z

src/sconsx/tools/flex.py

@@ -34,7 +34,11 @@ def __init__(self, config):
   def default(self):

      if CONDA_ENV:
-          base_dir = CONDA_PREFIX
+          if os.name == 'posix':
+            base_dir = CONDA_LIBRARYPREFIX


On posix, LIBRARY_PREFIX is not set. So why do you change these lines?

pradal · 2017-12-05T22:33:03Z

src/sconsx/tools/python.py

+          if os.name == 'posix':
+              self._default['libpath'] = pj(CONDA_PREFIX, 'lib')
+          else:
+              self._default['libpath'] = pj(CONDA_PREFIX, 'libs')            


I think that for CONDA, Python is also set in the environment variables

The lib of python (python27.dll) is in the libs directory and is not set correctly by default by sconsx on windows.

Thanks. These lines are also correct outside conda build.

pradal · 2017-12-05T22:35:51Z

src/sconsx/tools/qhull.py

+      if env['WITH_QHULL'] :
+        def_qhull_inc = env['qhull_includes']
+        qhull_inc = pj(def_qhull_inc, 'libqhull')
+        if not os.path.exists(os.path.join(def_qhull_inc, "qhull_a.h")) and not os.path.exists(os.path.join(qhull_inc, "qhull_a.h")) :


Cut this line in two lines to ease. We just need to look at qhull_a.h, isn't it?

Indeed we look at qhull_a.h but 2 possible directory of header exists and are tested.

It would be clearer to use path.py for the path management. But I will do that on another PR

…tension to make it optional

fredboudon and others added 10 commits April 10, 2017 15:28

Merge branch 'master' of https://github.com/openalea/sconsx

5d59cb2

Make load of tools non stopping

57bb507

Make qhull optional.

9eb6b5c

Make qt4 compatible with conda for windows.

e8aa3fe

- fix bug with qt4 tool for include path detection.

356b0cb

- fix bug with find_executable_path_from_env that raise exception if no executable is found. Return None now.

fix print of debug message

6f539e4

Fixed Qt5 DLL paths

a9a1e1f

Merge branch 'master' of https://github.com/Ethan13310/sconsx

634c1f2

Merge pull request #1 from Ethan13310/master

427ea6f

Fixed Qt5 DLL paths

- fix bug with conda_library_prefix set to LIBRARY_PREFIX on windows

c3d8ef4

- add glu32 for open tool on windows - fix bugs with install and builddir

fredboudon changed the title ~~Improve conda support in qt4 and qhull modularity~~ Improve conda support on windows Dec 5, 2017

pradal reviewed Dec 5, 2017

View reviewed changes

fredboudon added 8 commits December 6, 2017 11:42

fix bug on window for the installation of dll. Now they go to bindir

78698dd

change CONDA_LIBRARYPREFIX with CONDA_LIBRARY_PREFIX

288b8b1

add bison and flex modularity.

bf2d945

Merge branch 'master' of https://github.com/fredboudon/sconsx

1e0d54b

change warning by print to avoid ugly messages

706324e

improve optionnality of bison and flex

3dee166

fix bug with auto detection of boost lib extension. add WITH_BOOST ex…

43b7c59

…tension to make it optional

replace tab by space

b0a1888

fredboudon merged commit 244fe9d into openalea:master Dec 11, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve conda support on windows #27

Improve conda support on windows #27

fredboudon commented Dec 4, 2017

fredboudon commented Dec 5, 2017

pradal left a comment

pradal Dec 5, 2017

pradal Dec 5, 2017

pradal Dec 5, 2017

pradal Dec 5, 2017

pradal Dec 5, 2017

pradal Dec 5, 2017

pradal Dec 5, 2017

fredboudon Dec 6, 2017

pradal Dec 6, 2017

pradal Dec 5, 2017

pradal Dec 5, 2017

pradal Dec 5, 2017

fredboudon Dec 6, 2017

pradal Dec 6, 2017

pradal Dec 5, 2017

fredboudon Dec 6, 2017

pradal Dec 6, 2017

Improve conda support on windows #27

Improve conda support on windows #27

Conversation

fredboudon commented Dec 4, 2017

fredboudon commented Dec 5, 2017

pradal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment