fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 11:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: correctly use os.path.join in our python scripts

Browse source 
With Windows in mind, using forward slash isn't the right thing to do.
Even if it just works, we might want to fix it.

As here, use __file__ instead of argv[0] and sys.path.insert over
sys.path.append. With the path tweak being reportedly faster.

Suggested-by: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
This commit is contained in:
Emil Velikov 2018-12-09 20:09:49 +00:00 • committed by Emil Velikov
parent 9cc8e12505
commit ca152234e1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mapi/mapi_abi.py
View file

@ -29,8 +29,8 @@ from __future__ import print_function
import sys
# make it possible to import glapi
import os
GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "glapi/gen")
sys.path.append(GLAPI)
GLAPI = os.path.join(".", os.path.dirname(__file__), "glapi", "gen")
sys.path.insert(0, GLAPI)
from operator import attrgetter
import re

7
src/mesa/main/get_hash_generator.py
View file

@ -34,11 +34,10 @@ import os, sys, getopt
from collections import defaultdict
import get_hash_params
cur_dir = os.path.dirname(sys.argv[0])
param_desc_file = "%s/get_hash_params.py" % cur_dir
param_desc_file = os.path.join(os.path.dirname(__file__), "get_hash_params.py")
GLAPI = "%s/../../mapi/glapi/gen" % cur_dir
sys.path.append(GLAPI)
GLAPI = os.path.join(os.path.dirname(__file__), "..", "..", "mapi", "glapi", "gen")
sys.path.insert(0, GLAPI)
import gl_XML
prime_factor = 89