Mesa (master): Fix mapi code generator for out-of-tree build

Jon TURNEY jturney at kemper.freedesktop.org
Wed Jan 16 19:53:25 UTC 2013


Module: Mesa
Branch: master
Commit: e6e73089e5d78094dd5b36e37c824cc42f54c8c4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e6e73089e5d78094dd5b36e37c824cc42f54c8c4

Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Mon Jan 14 15:35:05 2013 +0000

Fix mapi code generator for out-of-tree build

Use os.path.join() rather than hand-rolling it, so path is correct if
sys.argv[0] returns an absolute path.

(According to the python documentation, it's platform dependent whether
sys.argv[0] is a full pathname or not.  It probably also depends on how
the process was started...)

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mapi/mapi/mapi_abi.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mapi/mapi/mapi_abi.py b/src/mapi/mapi/mapi_abi.py
index 30ffe7b..c645c02 100644
--- a/src/mapi/mapi/mapi_abi.py
+++ b/src/mapi/mapi/mapi_abi.py
@@ -29,7 +29,7 @@
 import sys
 # make it possible to import glapi
 import os
-GLAPI = "./%s/../glapi/gen" % (os.path.dirname(sys.argv[0]))
+GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "../glapi/gen")
 sys.path.append(GLAPI)
 
 import re




More information about the mesa-commit mailing list