projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: add EXT_dsa NamedProgram functions
[mesa.git]
/
bin
/
install_megadrivers.py
diff --git
a/bin/install_megadrivers.py
b/bin/install_megadrivers.py
old mode 100755
(executable)
new mode 100644
(file)
index
551e385
..
470137e
--- a/
bin/install_megadrivers.py
+++ b/
bin/install_megadrivers.py
@@
-1,4
+1,3
@@
-#!/usr/bin/env python
# encoding=utf-8
# Copyright © 2017-2018 Intel Corporation
# encoding=utf-8
# Copyright © 2017-2018 Intel Corporation
@@
-25,7
+24,6
@@
from __future__ import print_function
import argparse
import os
from __future__ import print_function
import argparse
import os
-import shutil
def main():
def main():
@@
-36,7
+34,11
@@
def main():
args = parser.parse_args()
if os.path.isabs(args.libdir):
args = parser.parse_args()
if os.path.isabs(args.libdir):
- to = os.path.join(os.environ.get('DESTDIR', '/'), args.libdir[1:])
+ destdir = os.environ.get('DESTDIR')
+ if destdir:
+ to = os.path.join(destdir, args.libdir[1:])
+ else:
+ to = args.libdir
else:
to = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.libdir)
else:
to = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], args.libdir)
@@
-46,7
+48,6
@@
def main():
if os.path.lexists(to):
os.unlink(to)
os.makedirs(to)
if os.path.lexists(to):
os.unlink(to)
os.makedirs(to)
- shutil.copy(args.megadriver, master)
for driver in args.drivers:
abs_driver = os.path.join(to, driver)
for driver in args.drivers:
abs_driver = os.path.join(to, driver)
@@
-68,7
+69,14
@@
def main():
name, ext = os.path.splitext(name)
finally:
os.chdir(ret)
name, ext = os.path.splitext(name)
finally:
os.chdir(ret)
+
+ # Remove meson-created master .so and symlinks
os.unlink(master)
os.unlink(master)
+ name, ext = os.path.splitext(master)
+ while ext != '.so':
+ if os.path.lexists(name):
+ os.unlink(name)
+ name, ext = os.path.splitext(name)
if __name__ == '__main__':
if __name__ == '__main__':