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

Modify the build/test process in Subkit 

Needs to know it is part of a parent package
parent dc68d968

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ ELSE(NOT TRIBITS_PROCESSING_PACKAGE) 
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})

  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})

  TRIBITS_PACKAGE_DECL(SubKit)

  TRIBITS_PROCESS_SUBPACKAGES()

  #TRIBITS_PROCESS_SUBPACKAGES()

  TRIBITS_PACKAGE_DEF()

  TRIBITS_PACKAGE_POSTPROCESS()

ENDIF(NOT TRIBITS_PROCESSING_PACKAGE)

MANIFEST.in

+2 −2
Original line number Diff line number Diff line 
include SubKit/build/input.sch

include SubKit/build/workbench/input.sch

recursive-include SubKit/wasp *

SubKit/build/InpParse.py

+11 −6
Original line number Diff line number Diff line
@@ -9,20 +9,25 @@ 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")

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

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

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

CIpath = "/Users/rsk/SubKit/SubKit/wasp/build/install"

if os.path.exists(localWaspPath):

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(CIpath):

elif os.path.exists(os.path.join(CIpath, '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')

elif os.path.exists(inCTFpath):

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

    # This is where wasppy will be when SubKit is installed as part of CTF

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

    waspPath = os.path.join(inCTFpath, 'bin')

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

elif os.path.exists(os.path.join(inCTFInstall, 'ddivalid')):

    # Thisis where wasp will be when in the install directory of an in-CTF build

    sys.pth.append(os.path.join(inCTFInstall, '../wasppy'))

    waspPath = os.path.join(inCTFInstall)

else:

    raise RuntimeError("WASP package was not found.  It must be installed in SubKit/wasp/build/install to use the input mode.")

from wasp2py import get_json_dict, get_wasp_utility_path
@@ -45,7 +50,7 @@ class InpParse(object): 


        # First run the validator to check if this is valid before loading it

        validator = os.path.join(waspPath, 'ddivalid')

        schemaPath = os.path.join(mypath, 'input.sch')

        schemaPath = os.path.join(mypath, 'workbench/input.sch')

        cmd = '"' + validator+ '" "' + schemaPath+ '" "' + inpFileName + '"'

        proc = Popen(cmd, shell=True)

        streamdata = proc.communicate()[0]

doc/docprint.py

+1 −1
Original line number Diff line number Diff line 
f = open('../SubKit/build/input.sch')

f = open('../SubKit/build/workbench/input.sch')



attr = ["ChildExactlyOne",

        "ChildCountEqual",