From f88164dae98c7fd6e8998c74a5d80295ebaf09ec Mon Sep 17 00:00:00 2001 From: Jules Villard Date: Mon, 9 Nov 2015 08:56:31 -0800 Subject: [PATCH] define INFER_INFER_DIRECTORY more concisely Summary: public paths look a bit silly prior to this diff, as they go up from infer/ to go back into infer/ right away, eg: /home/jul/infer/infer/lib/python/inferlib/../../../../infer/lib/java/processor.jar This changes this path to the less silly: /home/jul/infer/infer/lib/python/inferlib/../../../lib/java/processor.jar" Reviewed By: martinoluca Differential Revision: D2631775 fb-gh-sync-id: 6df5d4d --- infer/lib/python/inferlib/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infer/lib/python/inferlib/utils.py b/infer/lib/python/inferlib/utils.py index 3ca081589..e07e9f27c 100644 --- a/infer/lib/python/inferlib/utils.py +++ b/infer/lib/python/inferlib/utils.py @@ -33,9 +33,9 @@ import time # this assumes that this file lives in infer/lib/python/infer/ and the binaries # are in infer/bin/ INFER_PYTHON_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) -INFER_ROOT_DIRECTORY = os.path.join(INFER_PYTHON_DIRECTORY, - os.pardir, os.pardir, os.pardir, os.pardir) -INFER_INFER_DIRECTORY = os.path.join(INFER_ROOT_DIRECTORY, 'infer') +INFER_INFER_DIRECTORY = os.path.join(INFER_PYTHON_DIRECTORY, + os.pardir, os.pardir, os.pardir) +INFER_ROOT_DIRECTORY = os.path.join(INFER_INFER_DIRECTORY, os.pardir) FCP_DIRECTORY = os.path.join(INFER_ROOT_DIRECTORY, 'facebook-clang-plugins') LIB_DIRECTORY = os.path.join(INFER_INFER_DIRECTORY, 'lib') BIN_DIRECTORY = os.path.join(INFER_INFER_DIRECTORY, 'bin')