Commit 1804e5b7 authored by Salko Jr, Robert's avatar Salko Jr, Robert
Browse files

Fix previous commit

parent fac677d0

SubKit/build/InpParse.py

+7 −2
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..') 
import utils.utils as utils

from subprocess import Popen, PIPE, check_call

mypath = os.path.abspath(os.path.dirname(__file__))

localWaspPath = os.path.join(mypath, "../wasp")

localWaspPath = os.path.join(mypath, "../../wasp")

waspSitePackage = os.path.join(mypath, '../wasp')

inCTFpath = os.path.join(mypath, '../../../wasp')

inCTFInstall = os.path.join(mypath, '../../bin')

CIpath = "/Users/rsk/SubKit/SubKit/wasp/build/install"
@@ -16,7 +17,11 @@ if os.path.exists(os.path.join(localWaspPath, 'wasputils/ddivalid')): 
    # This is where users should have built and installed WASP

    sys.path.append(sys.path.append(os.path.join(localWaspPath, "wasppy")))

    waspPath = os.path.join(localWaspPath, 'wasputils')

elif os.path.exists(os.path.join(CIpath, 'wasputils/ddivalid')):

elif os.path.exists(os.path.join(waspSitePackage, 'wasputils/ddivalid')):

    # This is where wasp will be in the site packages dir when installed by pip

    sys.path.append(os.path.join(waspSitePackage, "wasppy"))

    waspPath = os.path.join(waspSitePackage, 'wasputils')

elif os.path.exists(os.path.join(waspSitePackage, 'wasputils/ddivalid')):

    # This is where the test CI will look for it on the testing machine

    sys.path.append(os.path.join(CIpath, "wasppy"))

    waspPath = os.path.join(CIpath, 'wasputils')