aboutsummaryrefslogtreecommitdiff
path: root/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-02-23 19:39:27 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2013-02-23 19:39:27 +0200
commit40012fad4550001c8dd181786608188d3a97ae4b (patch)
tree1a55c6ad59efc39c559dfd9bf731ac33fa74eb8c /environment.py
parentd200ad2e2e1a800e6fd7072931588b0bdb9472b2 (diff)
downloadmeson-40012fad4550001c8dd181786608188d3a97ae4b.zip
meson-40012fad4550001c8dd181786608188d3a97ae4b.tar.gz
meson-40012fad4550001c8dd181786608188d3a97ae4b.tar.bz2
Started work on pipelines by adding generator test case skeleton.
Diffstat (limited to 'environment.py')
-rwxr-xr-xenvironment.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/environment.py b/environment.py
index 86b015a..2a523c6 100755
--- a/environment.py
+++ b/environment.py
@@ -228,6 +228,7 @@ header_suffixes = ['h', 'hh', 'hpp', 'hxx', 'H']
class Environment():
def __init__(self, source_dir, build_dir, main_script_file, options):
assert(main_script_file[0] == '/')
+ assert(not os.path.islink(main_script_file))
self.source_dir = source_dir
self.build_dir = build_dir
self.meson_script_file = main_script_file
@@ -245,16 +246,9 @@ class Environment():
self.static_lib_suffix = 'a'
self.static_lib_prefix = 'lib'
self.object_suffix = 'o'
-
+
def get_script_dir(self):
- fullfile = self.meson_script_file
- while os.path.islink(fullfile):
- resolved = os.readlink(fullfile)
- if resolved[0] != '/':
- fullfile = os.path.join(os.path.dirname(fullfile), resolved)
- else:
- fullfile = resolved
- return os.path.dirname(fullfile)
+ return os.path.dirname(self.meson_script_file)
def get_build_command(self):
return self.meson_script_file