Commit a7a73a41 authored by whitlocb's avatar whitlocb

I merged the RC into the trunk.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7469 18c085ea-50e0-402c-830e-de6fd14e8384
parent 993e1b64
......@@ -142,6 +142,9 @@
# Mark C. Miller, Wed Mar 4 18:02:00 PST 2009
# Made it work for dbio-only build.
#
# Brad Whitlock, Wed Jun 3 15:45:55 PST 2009
# I added an engine-only build option.
#
##############################################################################
@SET_MAKE@
......@@ -149,6 +152,13 @@
@DIRTARGETS@
SUBDIRS_DBIO_ONLY=include lib bin third_party_builtin common visit_vtk avt databases tools
SUBDIRS_ENGINE_ONLY=include lib bin third_party_builtin common visit_vtk avt engine \
sim plots operators databases
SUBDIRS_SERVER_COMPONENTS_ONLY=include lib bin third_party_builtin common visit_vtk \
avt engine launcher mdserver sim plots operators databases
SUBDIRS_STD=include lib bin third_party_builtin common @VTKQT@ visit_vtk \
avt engine launcher @METADATA_SERVER@ winutil @VIEWER@ \
@GUI@ @VISITPY@ @JAVA_TARGET@ sim plots operators databases @HELP@ \
......
......@@ -91,6 +91,10 @@
#
# Mark C. Miller, Wed Mar 4 17:59:14 PST 2009
# Enabled dbio-only build
#
# Brad Whitlock, Wed Jun 3 15:42:02 PST 2009
# I added an engine-only build option.
#
##############################################################################
@SET_MAKE@
......@@ -99,9 +103,13 @@
SUBDIRS_DBIO_ONLY=DBAtts Pipeline Database
SUBDIRS_STD=DBAtts Math IVP Pipeline DDF MIR Shapelets\
SUBDIRS_ENGINE_ONLY=DBAtts Math IVP Pipeline DDF MIR Shapelets\
View Filters Database Expressions Queries Plotter FileWriter \
@VISWINDOW@ QtVisWindow
VisWindow
SUBDIRS_SERVER_COMPONENTS_ONLY=$(SUBDIRS_ENGINE_ONLY)
SUBDIRS_STD=$(SUBDIRS_ENGINE_ONLY) QtVisWindow
SUBDIRS=@SUBDIRS@
......
##
## Compiler flags.
##
if test "$BUILD_MODE" == "EngineOnly"; then
if test "$BUILD_MODE" == "ComputeNode"; then
CC="/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin/gcc"
CXX="/bgsys/drivers/ppcfloor/gnu-linux/powerpc-bgp-linux/bin/g++"
CFLAGS="-O2 -fPIC"
CXXFLAGS="-O2 -fPIC"
VISITARCH="linux-ppc64_bgp_gcc-4.1.2"
QTARCH="linux-ppc64_gcc-4.1.2"
XML2MAKEFILE_CXX="g++"
MESA_VERSION="6.4.2"
else
......@@ -24,6 +26,7 @@ else
CFLAGS="-O2 -fPIC"
CXXFLAGS="-O2 -fPIC"
VISITARCH="linux-ppc64_gcc-4.1.2"
QTARCH="linux-ppc64_gcc-4.1.2"
MESA_VERSION="5.0"
fi
......@@ -51,9 +54,9 @@ DEFAULT_CMAKE=$VISITHOME/cmake/2.4.5/$VISITARCH/bin/cmake
##
## Specify the location of the qt include files and libraries.
##
QT_BIN=$VISITHOME/qt/3.3.8/$VISITARCH/bin
QT_INCLUDE=$VISITHOME/qt/3.3.8/$VISITARCH/include
QT_LIB=$VISITHOME/qt/3.3.8/$VISITARCH/lib
QT_BIN=$VISITHOME/qt/3.3.8/$QTARCH/bin
QT_INCLUDE=$VISITHOME/qt/3.3.8/$QTARCH/include
QT_LIB=$VISITHOME/qt/3.3.8/$QTARCH/lib
##
## Specify the location of the python include and libraries.
......
This diff is collapsed.
......@@ -1115,6 +1115,28 @@ fi
AC_SUBST(NON_DBIO_SERLIBS)
AC_SUBST(NON_DBIO_PARLIBS)
#
# Check for engine-only build. Disable clients,etc. Just build the engine.
#
AC_ARG_ENABLE(engine-only,
AC_HELP_STRING([--enable-engine-only], [build only the compute engine]))
if test "$enable_engine_only" = yes && test "$enable_dbio_only" = yes; then
AC_MSG_ERROR([--enable-dbio-only is not compatible with --enable-engine-only])
fi
#
# Check for server-components-only build. Disable clients,etc. Just build the engine,mdserver,vcl.
#
AC_ARG_ENABLE(server-components-only,
AC_HELP_STRING([--enable-server-components-only], [build only the server components (engine,mdserver,vcl)]))
if test "$enable_server_components_only" = yes && test "$enable_dbio_only" = yes; then
AC_MSG_ERROR([--enable-server-components-only is not compatible with --enable-engine-only])
fi
if test "$enable_server_components_only" = yes && test "$enable_engine_only" = yes; then
AC_MSG_WARN([--enable-server-components-only overrides --enable-engine-only])
enable_engine_only=no
fi
#
# Check for CMake
#
......@@ -1306,7 +1328,7 @@ AC_ARG_ENABLE(viewer-mesa-stub,
[ --enable-viewer-mesa-stub use the mesa stub library in the viewer],
UseViewerMesaStub=$enableval, UseViewerMesaStub=yes)
if test "$UseViewerMesaStub" = "yes"; then
if test "$UseViewerMesaStub" = "yes" && test ! "$enable_engine_only" = yes && test ! "$enable_server_components_only" = yes ; then
AC_MSG_RESULT(enabled)
VIEWER_MESA_STUB_CPPFLAGS="-DMESA_STUB"
VIEWER_MESA_LIBS="-lMesaStub"
......@@ -1380,17 +1402,6 @@ AC_SUBST(VTK_INCLUDES)
AC_SUBST(VTK_LIBS)
AC_SUBST(VTK_LIGHTWEIGHT_LIBS)
#
# Check for the common directory
#
AC_MSG_CHECKING(for common)
if test -d common; then
AC_MSG_RESULT(found)
COMMON="common"
else
AC_MSG_RESULT(not found)
COMMON=""
fi
#
# Check for the avtprep directory
......@@ -1488,15 +1499,9 @@ AC_SUBST(ENGINELIBSER)
AC_SUBST(ENGINELIBPAR)
#
# Check to see if the mdserver was enabled.
# The mdserver is enabled unless we're doing an engine-only build.
#
AC_MSG_CHECKING(if mdserver is enabled)
AC_ARG_ENABLE(mdserver,
[ --disable-mdserver build without mdserver],
UseMDSERVER="$enable_mdserver", UseMDSERVER=yes)
if test "$UseMDSERVER" = "yes"; then
AC_MSG_RESULT(yes)
if test ! "$enable_engine_only" = yes; then
dnl
dnl Check for the mdserver directory
dnl
......@@ -1511,7 +1516,6 @@ if test "$UseMDSERVER" = "yes"; then
METADATA_SERVER=""
fi
else
AC_MSG_RESULT(no)
METADATA_SERVER=""
fi
AC_SUBST(METADATA_SERVER)
......@@ -1525,7 +1529,7 @@ AC_MSG_CHECKING(if scripting features are enabled)
AC_ARG_ENABLE(scripting,
[ --disable-scripting build without CLI Python scripting capability],
UseScripting="$enable_scripting", UseScripting=yes)
if test "X$UseScripting" = "Xyes"; then
if test "X$UseScripting" = "Xyes" && test ! "$enable_engine_only" = yes && test ! "$enable_server_components_only" = yes; then
AC_MSG_RESULT(yes)
enable_scripting=yes
......@@ -1563,13 +1567,10 @@ AC_SUBST(PY_BUILD_VISITMODULE)
dnl
dnl Check for the viewer directory
dnl The viewer is enabled unless we're doing an engine-only or server-components-only build.
dnl
AC_MSG_CHECKING(for viewer)
if test -d viewer; then
AC_MSG_RESULT(found)
if test ! "$enable_engine_only" = yes && test ! "$enable_server_components_only" = yes; then
VIEWER="viewer"
VISWINDOW="VisWindow"
VIEWERLIB="$""(VDSO)"
VIEWEROBJ="$""(VOBJ)"
# The private source can go into the executable on all UNIX versions
......@@ -1583,25 +1584,21 @@ if test -d viewer; then
fi
else
VIEWER=""
VISWINDOW=""
VIEWERLIB=""
VIEWEROBJ=""
VIEWERLIB_SRC=""
VIEWEREXE_SRC=""
fi
AC_SUBST(VIEWER)
AC_SUBST(VISWINDOW)
AC_SUBST(VIEWERLIB)
AC_SUBST(VIEWEROBJ)
AC_SUBST(VIEWERLIB_SRC)
AC_SUBST(VIEWEREXE_SRC)
dnl
dnl Gui checking is enabled, look for the gui directory.
dnl The gui is enabled unless we're doing an engine-only or server-components-only build.
dnl
AC_MSG_CHECKING(for gui)
if test -d gui; then
AC_MSG_RESULT(found)
if test ! "$enable_engine_only" = yes && test ! "$enable_server_components_only" = yes; then
GUI="gui"
GUILIB="$""(GDSO)"
GUIOBJ="$""(GOBJ)"
......@@ -1611,7 +1608,6 @@ if test -d gui; then
GUIFRAMEWORKS=""
fi
else
AC_MSG_RESULT(not found)
GUI=""
GUILIB=""
GUIOBJ=""
......@@ -1952,6 +1948,14 @@ if test $emptycxxflags = "yes"; then
fi
fi
# Give the option of using a different C++ compiler for xml2makefile since we
# might want to give the local C++ compiler to generate a local tool, even if
# we're cross-compiling
if test -z "$XML2MAKEFILE_CXX"; then
XML2MAKEFILE_CXX="$""(CXX)"
fi
AC_SUBST(XML2MAKEFILE_CXX)
# Set the compilation rule to include the OS, so that clearmake won't wink
# in object files across OSes.
#
......@@ -3314,7 +3318,7 @@ fi # if test ! "$enable_dbio_only" = yes; then
#
# Only enable VTKQT if we're building the viewer.
#
if test -n "$VIEWER"; then
if test ! "$enable_dbio_only" = yes && test ! "$enable_engine_only" = yes && test ! "$enable_server_components_only" = yes; then
VTKQT_CPPFLAGS="-I$""(TOPDIR)/vtkqt"
VTKQT="vtkqt"
#
......@@ -4228,6 +4232,72 @@ if test "$enable_dbio_only" = yes; then
avt/Database/Makefile
avt/Pipeline/Makefile"
fi
if test "$enable_engine_only" = yes; then
CONVERT_SER=""
CONVERT_PAR=""
SUBDIRS="$""(SUBDIRS_ENGINE_ONLY)"
ALLSUBDIRS="$""(ALLSUBDIRS_ENGINE_ONLY)"
GUI_FILES=""
HELP_FILES=""
WINUTIL_FILES=""
VIEWER_FILES=""
MDSERVER_FILES=""
LAUNCHER_FILES=""
VTKQT_FILES=""
VISITPY_FILES=""
CQSCORE_FILES=""
JAVA_FILES=""
TOOLS_FILES=""
COMPONENT_FILES="avt/Makefile
avt/DBAtts/Makefile
avt/DDF/Makefile
avt/Database/Makefile
avt/Expressions/Makefile
avt/FileWriter/Makefile
avt/Filters/Makefile
avt/IVP/Makefile
avt/Math/Makefile
avt/MIR/Makefile
avt/Pipeline/Makefile
avt/Plotter/Makefile
avt/Preprocessor/Makefile
avt/Queries/Makefile
avt/Shapelets/Makefile
avt/View/Makefile
avt/VisWindow/Makefile"
fi
if test "$enable_server_components_only" = yes; then
CONVERT_SER=""
CONVERT_PAR=""
SUBDIRS="$""(SUBDIRS_SERVER_COMPONENTS_ONLY)"
ALLSUBDIRS="$""(ALLSUBDIRS_SERVER_COMPONENTS_ONLY)"
GUI_FILES=""
HELP_FILES=""
WINUTIL_FILES=""
VIEWER_FILES=""
VTKQT_FILES=""
VISITPY_FILES=""
CQSCORE_FILES=""
JAVA_FILES=""
TOOLS_FILES=""
COMPONENT_FILES="avt/Makefile
avt/DBAtts/Makefile
avt/DDF/Makefile
avt/Database/Makefile
avt/Expressions/Makefile
avt/FileWriter/Makefile
avt/Filters/Makefile
avt/IVP/Makefile
avt/Math/Makefile
avt/MIR/Makefile
avt/Pipeline/Makefile
avt/Plotter/Makefile
avt/Preprocessor/Makefile
avt/Queries/Makefile
avt/Shapelets/Makefile
avt/View/Makefile
avt/VisWindow/Makefile"
fi
AC_OUTPUT($STANDARD_FILES
$GUI_FILES
......
This diff is collapsed.
......@@ -63,6 +63,9 @@
# Tom Fogal, Thu Mar 5 11:22:35 MST 2009
# Lowercased `Tuvok'.
#
# Brad Whitlock, Wed Jun 3 15:43:54 PST 2009
# I added engine only build options.
#
##############################################################################
@SET_MAKE@
......@@ -72,6 +75,13 @@
SUBDIRS_DBIO_ONLY=@BUILD_BILIB@ bow
ALLSUBDIRS_DBIO_ONLY=@BUILD_BILIB@ bow
SUBDIRS_ENGINE_ONLY=@BUILD_ZLIB@ @BUILD_GLEW@ @BUILD_BILIB@ \
@BUILD_SLIVR@ @BUILD_COGNOMEN@ @BUILD_TUVOK@ bow verdict
ALLSUBDIRS_ENGINE_ONLY=zlib glew bilib slivr bow cognomen tuvok verdict
SUBDIRS_SERVER_COMPONENTS_ONLY=$(SUBDIRS_ENGINE_ONLY)
ALLSUBDIRS_SERVER_COMPONENTS_ONLY=$(ALLSUBDIRS_ENGINE_ONLY)
SUBDIRS_STD=@BUILD_MESA_STUB@ @BUILD_ZLIB@ @BUILD_GLEW@ @BUILD_BILIB@ \
@BUILD_SLIVR@ @BUILD_COGNOMEN@ @BUILD_TUVOK@ bow verdict
ALLSUBDIRS_STD=mesa_stub zlib glew bilib slivr bow cognomen tuvok verdict
......
......@@ -101,6 +101,9 @@
# Eric Brugger, Fri May 1 13:02:00 PDT 2009
# Added mcurvit directory.
#
# Brad Whitlock, Wed Jun 3 15:47:33 PST 2009
# I added an engine-only build option.
#
##############################################################################
@SET_MAKE@
......@@ -109,16 +112,19 @@
MILI=makemili
OPTIONAL=avtprep classwriter doxygenate embedviewer windowmaker \
OPTIONAL=avtprep classwriter doxygenate windowmaker \
escan mpeg_encode clidriver DataManualExamples clipeditor mcurvit
SILO_TARGET=curv3dprep
SUBDIRS_DBIO_ONLY=convert
SUBDIRS_ENGINE_ONLY=xml
SUBDIRS_SERVER_COMPONENTS_ONLY=xml
SUBDIRS_STD=imagetools annotations convert @SILO_TARGET@ embedviewer @MILI@ mpeg2encode \
protocol surfcomp writer xml xmledit
ALLSUBDIRS_DBIO_ONLY=$(SUBDIRS_DBIO_ONLY)
ALLSUBDIRS_ENGINE_ONLY=$(SUBDIRS_ENGINE_ONLY)
ALLSUBDIRS_STD=$(SUBDIRS_STD) $(MILI) $(OPTIONAL)
SUBDIRS=@SUBDIRS@
......
......@@ -67,6 +67,10 @@
# Brad Whitlock, Wed May 7 15:57:51 PDT 2008
# Qt 4.
#
# Brad Whitlock, Thu Jun 4 08:51:01 PDT 2009
# I made it possible to compile xml2makefile with a different compiler
# in case we're cross-compiling.
#
##############################################################################
@SET_MAKE@
......@@ -139,7 +143,7 @@ $(PROGRAM4) xml2info: $(SRC) GenerateInfo.h $(DEPENDENT_HEADERS)
$(CXX) main4.C -o $@ $(CXXFLAGS) $(LDFLAGS) $(DEFINES4)
$(PROGRAM5) xml2makefile: $(SRC) GenerateMakefile.h $(DEPENDENT_HEADERS)
$(CXX) main5.C -o $@ $(CXXFLAGS) $(LDFLAGS) $(DEFINES5)
@XML2MAKEFILE_CXX@ main5.C -o $@ $(CXXFLAGS) $(LDFLAGS) $(DEFINES5)
$(PROGRAM6) xml2avt: $(SRC) GenerateAVT.h $(DEPENDENT_HEADERS)
$(CXX) main6.C -o $@ $(CXXFLAGS) $(LDFLAGS) $(DEFINES6)
......
......@@ -45,6 +45,10 @@
#
# Mark C. Miller, Wed Mar 4 17:57:55 PST 2009
# Enabled dbio-only build.
#
# Brad Whitlock, Thu Jun 4 08:50:02 PDT 2009
# I added SUBDIRS_ENGINE_ONLY.
#
##############################################################################
@SET_MAKE@
......@@ -52,6 +56,8 @@
@DIRTARGETS@
SUBDIRS_DBIO_ONLY=lightweight full
SUBDIRS_ENGINE_ONLY=lightweight full rendering parallel
SUBDIRS_SERVER_COMPONENTS_ONLY=lightweight full rendering parallel
SUBDIRS_STD=lightweight full rendering parallel
SUBDIRS=@SUBDIRS@
......
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