Try to update paths for TDD system (TriBITS #26)

This system is terrible.

tribits/dashboard_driver/TribitsDriverCMakeLists.cmake

@@ -57,18 +57,18 @@ endif()
 
 # Locate the TriBITS dependencies.
 IF (NOT TRIBITS_ROOT)
-  get_filename_component(TRIBITS_ROOT "${CMAKE_CURRENT_LIST_DIR}/../..")
+  get_filename_component(TRIBITS_ROOT "${CMAKE_CURRENT_LIST_DIR}/..")
 ENDIF()
 get_filename_component(TRIBITS_ROOT "${TRIBITS_ROOT}" ABSOLUTE)
 
 set(CMAKE_MODULE_PATH
   ${CMAKE_CURRENT_LIST_DIR}
-  ${TRIBITS_ROOT}/utils
-  ${TRIBITS_ROOT}/package_arch
-  ${TRIBITS_ROOT}/config_tests
+  ${TRIBITS_ROOT}/core/utils
+  ${TRIBITS_ROOT}/core/package_arch
+  ${TRIBITS_ROOT}/core/config_tests
   )
 
-set(TRIBITS_PYTHON_DIR "${TRIBITS_ROOT}/python")
+set(TRIBITS_PYTHON_UTILS_DIR "${TRIBITS_ROOT}/python_utils")
 
 include(CTest)
 include(TribitsDriverSupport)

tribits/dashboard_driver/TribitsDriverSupport.cmake

@@ -93,8 +93,8 @@ function(TRIBITS_DRIVER_ADD_TEST_THAT_INSTALLS_CMAKE cmake_type)
     message(FATAL_ERROR "TD_BASE_DIR must be defined before calling this function")
   endif()
 
-  if(NOT TRIBITS_PYTHON_DIR)
-    message(FATAL_ERROR "TRIBITS_PYTHON_DIR must be defined before calling this function")
+  if(NOT TRIBITS_PYTHON_UTILS_DIR)
+    message(FATAL_ERROR "TRIBITS_PYTHON_UTILS_DIR must be defined before calling this function")
   endif()
 
   find_program(PYTHON_EXE python)
@@ -111,7 +111,7 @@ function(TRIBITS_DRIVER_ADD_TEST_THAT_INSTALLS_CMAKE cmake_type)
     )
 
   add_test(install-cmake-${cmake_type} ${PYTHON_EXE}
-    "${TRIBITS_PYTHON_DIR}/download-cmake.py"
+    "${TRIBITS_PYTHON_UTILS_DIR}/download-cmake.py"
     "--skip-detect"
     "--install-dir=${TD_BASE_DIR}/tools/cmake-${cmake_type}"
     "--installer-type=${cmake_type}"

tribits/dashboard_driver/tdd_driver.py

@@ -58,15 +58,15 @@
   verbose = False
 
 
-# tribitsTddDriverDir is the directory where *this* script is:
+# tribitsDDDir is the directory where *this* script is:
 #
 this_path = os.path.abspath(os.path.realpath(__file__))
-tribitsTddDriverDir = os.path.dirname(this_path)
-print "tribitsTddDriverDir = '"+tribitsTddDriverDir+"'"
-
+tribitsDDDir = os.path.dirname(this_path)
+print "tribitsDDDir = '"+tribitsDDDir+"'"
 
 # Load the general script support python code
-sys.path.insert(0, tribitsTddDriverDir+"/../../python")
+pythonUtilsDir = os.path.join(tribitsDDDir, "../python_utils")
+sys.path = [pythonUtilsDir] + sys.path
 from GeneralScriptSupport import *
 
 
@@ -212,11 +212,11 @@ def run_driver(ctestSourceDirectory, projectRepoBaseDir):
 
     print "\nPWD=\""+os.getcwd()+"\"...\n"
     print "projectRepoBaseDir = '" + projectRepoBaseDir + "'"
-    print "tribitsTddDriverDir = '" + tribitsTddDriverDir + "'"
+    print "tribitsDDDir = '" + tribitsDDDir + "'"
 
     # tribitsDir is the root directory of the TriBITS system:
     #
-    tribitsDir = os.path.dirname(os.path.dirname(tribitsTddDriverDir))
+    tribitsDir = os.path.abspath(os.path.join(tribitsDDDir, ".."))
     print "tribitsDir = '"+tribitsDir+"'"
 
     # dashboardBaseDir is the parent directory of our containing source tree,
@@ -267,7 +267,7 @@ def run_driver(ctestSourceDirectory, projectRepoBaseDir):
     print "***\n"
     sys.exit(
       invoke_ctest(ctestExe,
-        os.path.join(tribitsTddDriverDir, "TribitsDriverDashboard.cmake"),
+        os.path.join(tribitsDDDir, "TribitsDriverDashboard.cmake"),
         tddDashboardRootDir,
         {
          "TDD_DASHBOARD_ROOT" : tddDashboardRootDir,