[Mesa-dev] [PATCH v2 01/24] mesa: correctly use os.path.join in our python scripts

[Erik Faye-Lund]

Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>

On Fri, 2018-12-14 at 14:04 +0000, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> 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.
> 
> Cc: Dylan Baker <dylan at pnwbakers.com>
> Suggested-by: Dylan Baker <dylan at pnwbakers.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  src/mapi/mapi_abi.py                | 4 ++--
>  src/mesa/main/get_hash_generator.py | 7 +++----
>  2 files changed, 5 insertions(+), 6 deletions(-)
> 
> diff --git a/src/mapi/mapi_abi.py b/src/mapi/mapi_abi.py
> index dc48fa5935f..bb505561e7c 100644
> --- a/src/mapi/mapi_abi.py
> +++ b/src/mapi/mapi_abi.py
> @@ -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
> diff --git a/src/mesa/main/get_hash_generator.py
> b/src/mesa/main/get_hash_generator.py
> index f742ebff4b8..3e9032bd4c8 100644
> --- a/src/mesa/main/get_hash_generator.py
> +++ b/src/mesa/main/get_hash_generator.py
> @@ -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