diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/ci/dirs.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/project/ci/dirs.py b/project/ci/dirs.py index 946a315..6513455 100644 --- a/project/ci/dirs.py +++ b/project/ci/dirs.py @@ -56,9 +56,8 @@ class Dirs(abc.ABC): def get_src_dir(self): pass - @abc.abstractmethod def get_build_dir(self): - pass + return os.path.join(os.path.dirname(self.get_src_dir()), 'build') @abc.abstractmethod def get_prebuilt_boost_dir(self): @@ -71,7 +70,7 @@ class Dirs(abc.ABC): return os.path.join(self.get_build_dir(), 'boost') def get_cmake_dir(self): - return os.path.join(self.get_build_dir(), 'build') + return os.path.join(self.get_build_dir(), 'cmake') def get_install_dir(self): return os.path.join(self.get_build_dir(), 'install') @@ -120,9 +119,6 @@ class Travis(Dirs): def get_src_dir(self): return env('TRAVIS_BUILD_DIR') - def get_build_dir(self): - return env('HOME') - def get_prebuilt_boost_dir(self): # Travis doesn't have pre-built Boost (available for installation from # the official Ubuntu repositories though). @@ -149,9 +145,6 @@ class AppVeyor(Dirs): def get_src_dir(self): return env('APPVEYOR_BUILD_FOLDER') - def get_build_dir(self): - return R'C:\projects' - def get_prebuilt_boost_dir(self): return Image.get().get_prebuilt_boost_dir() @@ -176,9 +169,6 @@ class GitHub(Dirs): def get_src_dir(self): return env('GITHUB_WORKSPACE') - def get_build_dir(self): - return os.path.dirname(env('GITHUB_WORKSPACE')) - def get_prebuilt_boost_dir(self): # As of 2021-01-25, Boost 1.72.0 is pre-built (on all images except for # ubuntu-20.04 for some reason). The path is stored in environment |