Commit f89f61b2 authored by whitlocb's avatar whitlocb

This update merges the 1.12RC to the trunk. I reverted many of the changes...

This update merges the 1.12RC to the trunk. I reverted many of the changes that were no-ops or just very slight changes that had already occured on the trunk.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7463 18c085ea-50e0-402c-830e-de6fd14e8384
parent 84a7c18b
......@@ -154,7 +154,6 @@ SUBDIRS_STD=include lib bin third_party_builtin common @VTKQT@ visit_vtk \
@GUI@ @VISITPY@ @JAVA_TARGET@ sim plots operators databases @HELP@ \
tools
SUBDIRS=@SUBDIRS@
SUBDIRS=@SUBDIRS@
#
# Make sure that the installation directories exist
......
......@@ -184,8 +184,10 @@ PAROBJ=$(SRC:.C=_par.o)
LIB=libdatabase
LIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS)
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lmir_ser -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lmir_par -lpipeline_par -lavtmath_par $(VTK_LIBS) @SHLIB_MPI_LIBS@
NON_DBIO_SERLIBS=-lmir_ser
NON_DBIO_PARLIBS=-lmir_par
SERLIBS=$(COMMONLIBS) @NON_DBIO_SERLIBS@ -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) @NON_DBIO_PARLIBS@ -lpipeline_par -lavtmath_par $(VTK_LIBS)
##
## Standard targets...
......
......@@ -52,15 +52,14 @@ VIEWER_LIBS_FORCED=
ELIBS_FOR_MACOSX_PREBINDING=$(ZLIB_LIB) $(GLEW_LIBS) $(MESA_LIBS) $(GL_LIBS)
MLIBS_FOR_MACOSX_PREBINDING=$(GLEW_LIBS) $(ZLIB_LIB) $(MESA_LIBS) $(GL_LIBS)
ILIBS=
MLIBS=-lpipeline_ser -ldatabase_ser -lmir_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lmisc -lcomm -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk $(MLIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
ESERLIBS=-lpipeline_ser -ldatabase_ser -lmir_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
EPARLIBS=-lpipeline_par -ldatabase_par -lmir_par -lavtmath_par -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)
MLIBS=-lpipeline_ser -ldatabase_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lmisc -lcomm -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk $(MLIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
ESERLIBS=-lpipeline_ser -ldatabase_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
EPARLIBS=-lpipeline_par -ldatabase_par -lavtmath_par -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)
IDSO=$(TOPDIR)/plugins/databases/libI@NAME@Database.so
MDSO=$(TOPDIR)/plugins/databases/libM@NAME@Database.so
MDSO=
ESERDSO=$(TOPDIR)/plugins/databases/libE@NAME@Database_ser.so
EPARDSO=$(TOPDIR)/plugins/databases/libE@NAME@Database_par.so
EPARDSO=@EPARDSO@
DISTRIB=
......
......@@ -167,6 +167,14 @@ else
fi
fi
# Use the presence of libvisitenginev1_par in the make-variables to determine
# whether we should build parallel plugins.
EPARDSO=""
EV1="`grep enginev1_par ../../include/make-variables`"
if test -n "$EV1" ; then
EPARDSO="\$(TOPDIR)/plugins/databases/libE${NAME}Database_par.so"
fi
sed -e "s%@TOPDIR@%$TOPDIR%" \
-e "s%@CXXFLAGS@%$CXXFLAGS%g" \
-e "s%@LIBS@%$LIBS%g" \
......@@ -176,4 +184,5 @@ sed -e "s%@TOPDIR@%$TOPDIR%" \
-e "s%@MSPECIFICSRC@%$MSPECIFICSRC%g" \
-e "s%@ESRC@%$ESRC%g" \
-e "s%@ESPECIFICSRC@%$ESPECIFICSRC%g" \
-e "s%@EPARDSO@%$EPARDSO%g" \
$binDir/db_mktmpl > Makefile
This diff is collapsed.
......@@ -1106,7 +1106,14 @@ AC_ARG_ENABLE(dbio-only,
if test "$enable_dbio_only" = yes; then
enable_scripting=no
AC_DEFINE(DBIO_ONLY, [1], [Define if this is a database I/O only build])
NON_DBIO_SERLIBS=""
NON_DBIO_PARLIBS=""
else
NON_DBIO_SERLIBS="$""(NON_DBIO_SERLIBS)"
NON_DBIO_PARLIBS="$""(NON_DBIO_SERLIBS)"
fi
AC_SUBST(NON_DBIO_SERLIBS)
AC_SUBST(NON_DBIO_PARLIBS)
#
# Check for CMake
......
##
## Programs and options...
##
include /apps/visit/branches/1.12RC_trunk/src/include/make-variables
TOPDIR=/apps/visit/branches/1.12RC_trunk/src
TOPDIR=/scratch/whitlocb/trunk/src
include $(TOPDIR)/include/make-variables
##
## Libraries and includes...
##
VTK_INCLUDE= \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/Common \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/Filtering \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/Graphics \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/Hybrid \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/IO \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/Imaging \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/Rendering \
-I/apps/visit/branches/1.12RC_trunk/src/include/vtk/Utilities
CXXFLAGS=$(CXXFLAGSORIG) $(NETCDF_INCLUDE)
CPPFLAGS=$(CPPFLAGSORIG) $(VTK_INCLUDE) -I. -I/apps/visit/branches/1.12RC_trunk/src/include -I/apps/visit/branches/1.12RC_trunk/src/include/visit $(PY_CXXFLAGS)
LDFLAGS=$(LDFLAGSORIG) $(PLUGIN_LDFLAGS) -L/apps/visit/branches/1.12RC_trunk/src/plugins/databases
-I$(TOPDIR)/include/vtk \
-I$(TOPDIR)/include/vtk/Common \
-I$(TOPDIR)/include/vtk/Filtering \
-I$(TOPDIR)/include/vtk/Graphics \
-I$(TOPDIR)/include/vtk/Hybrid \
-I$(TOPDIR)/include/vtk/IO \
-I$(TOPDIR)/include/vtk/Imaging \
-I$(TOPDIR)/include/vtk/Rendering \
-I$(TOPDIR)/include/vtk/Utilities
CXXFLAGS=$(CXXFLAGSORIG)
CPPFLAGS=$(CPPFLAGSORIG) $(VTK_INCLUDE) -I. -I$(TOPDIR)/include -I$(TOPDIR)/include/visit $(PY_CXXFLAGS)
LDFLAGS=$(LDFLAGSORIG) $(PLUGIN_LDFLAGS) -L$(TOPDIR)/plugins/databases
LIBG_QT_LIBS=$(QT_CORE_LIB) $(QT_GUI_LIB)
LIBV_QT_LIBS=$(QT_CORE_LIB) $(QT_GUI_LIB) $(QT_OPENGL_LIB)
##
## Files...
##
PLUGINDIR=databases
PLUGINNAME=PlasmaStateDatabase
PLUGINNAME=Database
WIDGETS=
VIEWERWIDGETS=
ISRC=PlasmaStatePluginInfo.C
COMMONSRC=PlasmaStatePluginInfo.C PlasmaStateCommonPluginInfo.C
MSRC=PlasmaStateMDServerPluginInfo.C avtPlasmaStateFileFormat.C
ESRC=PlasmaStateEnginePluginInfo.C avtPlasmaStateFileFormat.C
ISRC=PluginInfo.C
COMMONSRC=PluginInfo.C CommonPluginInfo.C
MSRC=MDServerPluginInfo.C avtFileFormat.C
MSPECIFICSRC=
ESRC=EnginePluginInfo.C avtFileFormat.C
ESPECIFICSRC=
SRC=$(ISRC) $(COMMONSRC) $(MSRC) $(ESRC)
SHLIB_FORCED=$(NETCDF_CXX_LIB) $(NETCDF_LIB)
SHLIB_FORCED=
GUI_LIBS_FORCED=
ENGINE_LIBS_FORCED=
MDSERVER_LIBS_FORCED=
VIEWER_LIBS_FORCED=
ELIBS_FOR_MACOSX_PREBINDING=$(ZLIB_LIB) $(GLEW_LIBS) $(MESA_LIBS) $(GL_LIBS)
MLIBS_FOR_MACOSX_PREBINDING=$(GLEW_LIBS) $(ZLIB_LIB) $(MESA_LIBS) $(GL_LIBS)
ILIBS=
MLIBS=-lpipeline_ser -ldatabase_ser -lmir_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lmisc -lcomm -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk $(MLIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
ESERLIBS=-lpipeline_ser -ldatabase_ser -lmir_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
EPARLIBS=-lpipeline_par -ldatabase_par -lmir_par -lavtmath_par -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)
IDSO=/apps/visit/branches/1.12RC_trunk/src/plugins/databases/libIPlasmaStateDatabase.so
MDSO=/apps/visit/branches/1.12RC_trunk/src/plugins/databases/libMPlasmaStateDatabase.so
ESERDSO=/apps/visit/branches/1.12RC_trunk/src/plugins/databases/libEPlasmaStateDatabase_ser.so
EPARDSO=/apps/visit/branches/1.12RC_trunk/src/plugins/databases/libEPlasmaStateDatabase_par.so
MLIBS=-lpipeline_ser -ldatabase_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lmisc -lcomm -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk $(MLIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
ESERLIBS=-lpipeline_ser -ldatabase_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
EPARLIBS=-lpipeline_par -ldatabase_par -lavtmath_par -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)
IDSO=$(TOPDIR)/plugins/databases/libIDatabase.so
MDSO=
ESERDSO=$(TOPDIR)/plugins/databases/libEDatabase_ser.so
EPARDSO=
DISTRIB=
......@@ -98,10 +106,10 @@ clean:
message:
@echo
@echo "****************************************************************************"
@echo "*** Building PlasmaState Database Plugin"
@echo "*** Building Database Plugin"
@echo "****************************************************************************"
##
## Automatic dependency stuff
##
include /apps/visit/branches/1.12RC_trunk/src/include/make-targets
include $(TOPDIR)/include/make-targets
......@@ -341,7 +341,7 @@ LIBS=-L../../lib -L../../vtkqt -lengineproxy -lenginerpc -lviewerrpc \
-lparser -lplugin -lqtviswindow -lviswindow_ser -lavtmath_ser -lplotter_ser \
-lavtfilters_ser -ldatabase_ser -lmir_ser -lvisit_verdict -lavtwriter_ser \
-lavtview -lpipeline_ser -lvisit_vtk -lrendering_visit_vtk -lavtivp_ser \
-llightweight_visit_vtk -lparallel_visit_vtk_ser -lvtkqt -lwinutil \
-llightweight_visit_vtk -lrendering_visit_vtk -lparallel_visit_vtk_ser -lvtkqt -lwinutil \
-lproxybase -lmisc -lcomm -lstate -lutility -lavtexceptions \
$(QT_CORE_LIB) $(QT_GUI_LIB) $(QT_NETWORK_LIB) $(QT_OPENGL_LIB) \
$(VTK_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) @LIBS@ @PTHREAD_LIB@
......
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