Always pushd/popd project directory when executing project steps (#128)

* Always pushd/popd project directory when executing project steps

* Fixed cmake paths to be absolute

* Fixed macos-11

Author: Justin Boswell

.github/workflows/sanity-test.yml

@@ -79,7 +79,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        host: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11.0, windows-2019]
+        host: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, macos-10.15, macos-11, windows-2019]
     needs: package
     runs-on: ${{ matrix.host }}
     steps:

builder/actions/cmake.py

@@ -34,17 +34,18 @@ def _project_dirs(env, project):
     if not project.resolved():
         raise Exception('Project is not resolved: {}'.format(project.name))
 
-    source_dir = str(Path(project.path).relative_to(env.root_dir))
-    build_dir = str(Path(os.path.join(env.build_dir, project.name)).relative_to(env.root_dir))
+    source_dir = project.path
+    build_dir = os.path.join(env.build_dir, project.name)
+    install_dir = env.install_dir
 
     # cross compiles are effectively chrooted to the source_dir, normal builds need absolute paths
     # or cmake gets lost because it wants directories relative to source
     if env.toolchain.cross_compile:
         # all dirs used should be relative to env.source_dir, as this is where the cross
         # compilation will be mounting to do its work
-        install_dir = str(Path(env.install_dir).relative_to(env.root_dir))
-    else:
-        install_dir = env.install_dir
+        source_dir = str(Path(source_dir).relative_to(env.root_dir))
+        build_dir = str(Path(build_dir).relative_to(env.root_dir))
+        install_dir = str(Path(install_dir).relative_to(env.root_dir))
 
     return source_dir, build_dir, install_dir
 

builder/core/project.py

@@ -513,7 +513,13 @@ def pre_build(self, env):
         all_steps = build_imports + build_deps + self.config.get('pre_build_steps', [])
         if len(all_steps) == 0:
             return None
-        all_steps = [partial(_pushenv, self, 'pre_build_env'), *all_steps, _popenv]
+        all_steps = [
+            partial(_pushd, self.path),
+            partial(_pushenv, self, 'pre_build_env'),
+            *all_steps,
+            _popenv,
+            _popd
+        ]
         return Script(all_steps, name='pre_build {}'.format(self.name))
 
     def build(self, env):
@@ -527,7 +533,13 @@ def build(self, env):
 
         if len(build_project) == 0:
             return None
-        build_project = [partial(_pushenv, self, 'build_env'), *build_project, _popenv]
+        build_project = [
+            partial(_pushd, self.path),
+            partial(_pushenv, self, 'build_env'),
+            *build_project,
+            _popenv,
+            _popd
+        ]
         return Script(build_project, name='build project {}'.format(self.name))
 
     def build_consumers(self, env):
@@ -547,7 +559,13 @@ def post_build(self, env):
         steps = self.config.get('post_build_steps', [])
         if len(steps) == 0:
             return None
-        steps = [partial(_pushenv, self, 'post_build_env'), *steps, _popenv]
+        steps = [
+            partial(_pushd, self.path),
+            partial(_pushenv, self, 'post_build_env'),
+            *steps,
+            _popenv,
+            _popd
+        ]
         return Script(steps, name='post_build {}'.format(self.name))
 
     def test(self, env):
@@ -562,7 +580,13 @@ def test(self, env):
             steps = _transform_steps(steps, env, self)
         if len(steps) == 0:
             return None
-        steps = [partial(_pushenv, self, 'test_env'), *steps, _popenv]
+        steps = [
+            partial(_pushd, self.path),
+            partial(_pushenv, self, 'test_env'),
+            *steps,
+            _popenv,
+            _popd
+        ]
         return Script(steps, name='test {}'.format(self.name))
 
     def install(self, env):