Commit e5b01d70 authored by cyrush's avatar cyrush

merge from 2.0RC to trunk: remove pyparsing configure time test

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11161 18c085ea-50e0-402c-830e-de6fd14e8384
parent 4d75c5c9
......@@ -340,7 +340,7 @@ IF(PYTHONLIBS_FOUND)
WORLD_READ WORLD_EXECUTE
PATTERN "*.pyc" EXCLUDE
PATTERN "*.pyo" EXCLUDE
PATTERN "lib-tk" EXCLUDE
PATTERN "lib-tk" EXCLUDE
PATTERN "visit*" EXCLUDE
PATTERN ".svn" EXCLUDE
PATTERN "Python-2.6-py2.6.egg-info" EXCLUDE
......@@ -349,12 +349,3 @@ IF(PYTHONLIBS_FOUND)
ENDIF((NOT ${PYTHON_DIR} STREQUAL "/usr"))
ENDIF(Python_FRAMEWORKS)
ENDIF(PYTHONLIBS_FOUND)
# See if we have pyparsing
IF(PYTHONLIBS_FOUND)
SET(cfgLibPy "config/libpython${PYTHON_VERSION}.so")
STRING(REPLACE ${cfgLibPy} "site-packages/pyparsing.py" pyParsingFile ${PYTHON_LIBRARIES})
IF(EXISTS ${pyParsingFile})
SET(HAVE_PYPARSING 1 CACHE BOOL "Defined if Python has pyparsing")
ENDIF(EXISTS ${pyParsingFile})
ENDIF(PYTHONLIBS_FOUND)
......@@ -271,9 +271,6 @@
/* Define the largest image that VisIt can save. */
#cmakedefine VISIT_RENDERING_SIZE_LIMIT @VISIT_RENDERING_SIZE_LIMIT@
/* Define if you have pyparsing. */
#cmakedefine HAVE_PYPARSING
/* Define to `int' if <sys/types.h> doesn't define. */
#cmakedefine gid_t
......
import os, sys, inspect
try:
import pyparsing
except:
raise VisItException("LoadUltra requires PyParsing to be installed in python's site-packages.")
#make the ultrawrapper modules available for import
sys.path.append(os.path.dirname(os.path.realpath(inspect.getfile(inspect.currentframe()))))
......
......@@ -13161,9 +13161,8 @@ visit_GetUltraScript(PyObject *self, PyObject *args)
STATIC PyObject *
visit_LoadUltra(PyObject *self, PyObject *args)
{
#ifdef HAVE_PYPARSING
NO_ARGUMENTS();
string parserFile = string(getenv("VISITULTRAHOME")) +
string("/ultraparse.py");
......@@ -13171,10 +13170,6 @@ visit_LoadUltra(PyObject *self, PyObject *args)
PyTuple_SetItem(argTuple, 0, PyString_FromString(parserFile.c_str()));
visit_Source(self, argTuple);
return PyInt_FromLong(1);
#else
VisItErrorFunc("LoadUltra requires PyParsing to be installed in pythons site-packages.");
return NULL;
#endif
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment