Commit 2e936330 authored by bonnell's avatar bonnell
Browse files

Remove gui(graphical) run mode from build_visit, fix dependency errors with...

Remove gui(graphical) run mode from build_visit, fix dependency errors with --dbio-only and --all-io.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31415 18c085ea-50e0-402c-830e-de6fd14e8384
parent d8bf3a48
......@@ -105,6 +105,7 @@ enhancements and bug-fixes that were added to this release.</p>
<ul>
<li>PySide 2 has been added to build_visit when Qt 5 is chosen.</li>
<li>Build_visit has been updated to build CMake version 3.8.1.</li>
<li>Build_visit no longer has a gui option.</li>
</ul>
<p>Click the following link to view the release notes for the previous version
......
......@@ -429,7 +429,7 @@ function build_cmake
(export BUILD_VISIT_BGQ="yes"
eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static --no-visit $SVN $TARBALL\
--static --no-visit $SVN $TARBALL\
--no-thirdparty --cmake\
--log-file building_cmake.txt \
--arch "${ARCH}" \
......@@ -478,7 +478,7 @@ function build_zlib_BGQ
banner "Building zlib (Compute Node)"
(eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static --no-visit $SVN $TARBALL --engine-only \
--static --no-visit $SVN $TARBALL --engine-only \
--log-file compute_node.txt \
--arch "${ARCH}_BGQ" \
--prefix "${PREFIX}" \
......@@ -556,7 +556,7 @@ function build_vtk_BGQ
export BUILD_VISIT_BGQ="yes"
eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static --no-visit $SVN $TARBALL --engine-only \
--static --no-visit $SVN $TARBALL --engine-only \
--no-thirdparty --cmake --vtk \
--log-file compute_node.txt \
--arch "${ARCH}_BGQ" \
......@@ -595,7 +595,7 @@ function build_icet_BGQ
export C_COMPILER=$BG_CC
eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static --no-visit $SVN $TARBALL --engine-only \
--static --no-visit $SVN $TARBALL --engine-only \
--no-thirdparty --cmake --icet \
--log-file compute_node.txt \
--arch "${ARCH}_BGQ" \
......@@ -671,7 +671,7 @@ function build_for_compute_node
export BUILD_VISIT_BGQ="yes"
eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static --no-visit $SVN $TARBALL --engine-only \
--static --no-visit $SVN $TARBALL --engine-only \
--log-file compute_node.txt \
--arch "${ARCH}_BGQ" \
--prefix "${PREFIX}" \
......@@ -706,7 +706,7 @@ function build_for_compute_node
export BUILD_VISIT_BGQ="yes"
eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static $NO_VISIT $SVN $TARBALL --engine-only\
--static $NO_VISIT $SVN $TARBALL --engine-only\
--log-file compute_node.txt \
--arch "${ARCH}_BGQ" \
--prefix "${PREFIX}" \
......@@ -777,7 +777,7 @@ function build_for_login_node
banner "Building Dependencies (Login Node)"
(eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static --no-visit $SVN $TARBALL --server-components-only \
--static --no-visit $SVN $TARBALL --server-components-only \
--log-file login_node.txt \
--arch $ARCH \
--prefix "${PREFIX}" \
......@@ -798,7 +798,7 @@ function build_for_login_node
banner "Building VisIt (Login Node)"
(eval $bv_PATH/build_visit \
--version ${VISIT_VERSION} \
--console --static $NO_VISIT $SVN $TARBALL --server-components-only \
--static $NO_VISIT $SVN $TARBALL --server-components-only \
--log-file login_node.txt \
--arch $ARCH \
--prefix "${PREFIX}" \
......
function bv_R_initialize
{
export DO_R="no"
export ON_R="off"
export USE_SYSTEM_R="no"
add_extra_commandline_args "R" "alt-R-dir" 1 "Use alternative directory for R"
}
......@@ -9,13 +8,11 @@ function bv_R_initialize
function bv_R_enable
{
DO_R="yes"
ON_R="on"
}
function bv_R_disable
{
DO_R="no"
ON_R="off"
}
function bv_R_alt_R_dir
......@@ -59,12 +56,7 @@ function bv_R_print_usage
{
printf "%-15s %s [%s]\n" "--R" "Build R" "$DO_R"
printf "%-15s %s [%s]\n" "--alt-R-dir" "Use R from an alternative directory"
}
function bv_R_graphical
{
local graphical_out="R $R_VERSION($R_FILE) $ON_R"
echo $graphical_out
}
function bv_R_host_profile
......
......@@ -2,7 +2,6 @@ function bv_adios_initialize
{
export FORCE_ADIOS="no"
export DO_ADIOS="no"
export ON_ADIOS="off"
export USE_SYSTEM_ADIOS="no"
add_extra_commandline_args "adios" "alt-adios-dir" 1 "Use alternative directory for adios"
......@@ -15,13 +14,11 @@ function bv_adios_enable
fi
DO_ADIOS="yes"
ON_ADIOS="on"
}
function bv_adios_disable
{
DO_ADIOS="no"
ON_ADIOS="off"
}
function bv_adios_alt_adios_dir
......@@ -88,12 +85,6 @@ function bv_adios_print_usage
printf "%-15s %s [%s]\n" "--alt-adios-dir" "Use ADIOS from an alternative directory"
}
function bv_adios_graphical
{
local graphical_out="ADIOS $ADIOS_VERSION($ADIOS_FILE) $ON_ADIOS"
echo $graphical_out
}
function bv_adios_host_profile
{
if [[ "$DO_ADIOS" == "yes" ]] ; then
......
function bv_advio_initialize
{
export DO_ADVIO="no"
export ON_ADVIO="off"
}
function bv_advio_enable
{
DO_ADVIO="yes"
ON_ADVIO="on"
}
function bv_advio_disable
{
DO_ADVIO="no"
ON_ADVIO="off"
}
function bv_advio_depends_on
......@@ -44,12 +41,6 @@ function bv_advio_print_usage
printf "%-15s %s [%s]\n" "--advio" "Build AdvIO" "$DO_ADVIO"
}
function bv_advio_graphical
{
local graphical_out="AdvIO $ADVIO_VERSION($ADVIO_FILE) $ON_ADVIO"
echo $graphical_out
}
function bv_advio_host_profile
{
if [[ "$DO_ADVIO" == "yes" ]] ; then
......
function bv_boost_initialize
{
export DO_BOOST="no"
export ON_BOOST="off"
export USE_SYSTEM_BOOST="no"
add_extra_commandline_args "boost" "alt-boost-dir" 1 "Use alternative directory for boost"
}
......@@ -9,13 +8,11 @@ function bv_boost_initialize
function bv_boost_enable
{
DO_BOOST="yes"
ON_BOOST="on"
}
function bv_boost_disable
{
DO_BOOST="no"
ON_BOOST="off"
}
function bv_boost_alt_boost_dir
......@@ -64,12 +61,6 @@ function bv_boost_print_usage
printf "%-15s %s [%s]\n" "--alt-boost-dir" "Use Boost from an alternative directory"
}
function bv_boost_graphical
{
local graphical_out="BOOST $BOOST_VERSION($BOOST_FILE) $ON_BOOST"
echo $graphical_out
}
function bv_boost_host_profile
{
if [[ "$DO_BOOST" == "yes" ]] ; then
......
function bv_boxlib_initialize
{
export DO_BOXLIB="no"
export ON_BOXLIB="off"
}
function bv_boxlib_enable
{
DO_BOXLIB="yes"
ON_BOXLIB="on"
}
function bv_boxlib_disable
{
DO_BOXLIB="no"
ON_BOXLIB="off"
}
function bv_boxlib_depends_on
......@@ -45,12 +42,6 @@ function bv_boxlib_print_usage
printf "%-15s %s [%s]\n" "--boxlib" "Build Boxlib" "$DO_BOXLIB"
}
function bv_boxlib_graphical
{
local graphical_output="Boxlib $BOXLIB_VERSION($BOXLIB_FILE) $ON_BOXLIB"
echo $graphical_output
}
function bv_boxlib_host_profile
{
if [[ "$DO_BOXLIB" == "yes" ]] ; then
......
function bv_ccmio_initialize
{
export DO_CCMIO="no"
export ON_CCMIO="off"
}
function bv_ccmio_enable
{
DO_CCMIO="yes"
ON_CCMIO="on"
}
function bv_ccmio_disable
{
DO_CCMIO="no"
ON_CCMIO="off"
}
function bv_ccmio_depends_on
......@@ -44,12 +41,6 @@ function bv_ccmio_print_usage
printf "%-15s %s [%s]\n" "--ccmio" "Build Star-CD support" "$DO_CCMIO"
}
function bv_ccmio_graphical
{
local graphical_out="CCMIO $CCMIO_VERSION($CCMIO_FILE) $ON_CCMIO"
echo $graphical_out
}
function bv_ccmio_host_profile
{
if [[ "$DO_CCMIO" == "yes" ]] ; then
......
function bv_cfitsio_initialize
{
export DO_CFITSIO="no"
export ON_CFITSIO="off"
}
function bv_cfitsio_enable
{
DO_CFITSIO="yes"
ON_CFITSIO="on"
}
function bv_cfitsio_disable
{
DO_CFITSIO="no"
ON_CFITSIO="off"
}
function bv_cfitsio_depends_on
......@@ -44,12 +41,6 @@ function bv_cfitsio_print_usage
printf "%-15s %s [%s]\n" "--cfitsio" "Build CFITSIO" "$DO_CFITSIO"
}
function bv_cfitsio_graphical
{
local graphical_out="CFITSIO $CFITSIO_VERSION($CFITSIO_FILE) $ON_CFITSIO"
echo $graphical_out
}
function bv_cfitsio_host_profile
{
if [[ "$DO_CFITSIO" == "yes" ]] ; then
......
function bv_cgns_initialize
{
export DO_CGNS="no"
export ON_CGNS="off"
}
function bv_cgns_enable
{
DO_CGNS="yes"
ON_CGNS="on"
}
function bv_cgns_disable
{
DO_CGNS="no"
ON_CGNS="off"
}
function bv_cgns_depends_on
......@@ -53,12 +50,6 @@ function bv_cgns_print_usage
printf "%-15s %s [%s]\n" "--cgns" "Build CGNS" "$DO_CGNS"
}
function bv_cgns_graphical
{
local graphical_out="CGNS $CGNS_VERSION($CGNS_FILE) $ON_CGNS"
echo $graphical_out
}
function bv_cgns_host_profile
{
if [[ "$DO_CGNS" == "yes" ]] ; then
......
function bv_cmake_initialize
{
export DO_CMAKE="yes"
export ON_CMAKE="on"
export FORCE_CMAKE="no"
export USE_SYSTEM_CMAKE="no"
add_extra_commandline_args "cmake" "system-cmake" 0 "Use cmake found on system"
......@@ -12,14 +11,12 @@ function bv_cmake_initialize
function bv_cmake_enable
{
DO_CMAKE="yes"
ON_CMAKE="on"
FORCE_CMAKE="yes"
}
function bv_cmake_disable
{
DO_CMAKE="no"
ON_CMAKE="off"
FORCE_CMAKE="no"
}
......
function bv_conduit_initialize
{
export DO_CONDUIT="no"
export ON_CONDUIT="off"
}
function bv_conduit_enable
{
DO_CONDUIT="yes"
ON_CONDUIT="on"
}
function bv_conduit_disable
{
DO_CONDUIT="no"
ON_CONDUIT="off"
}
function bv_conduit_depends_on
......@@ -50,12 +47,6 @@ function bv_conduit_print_usage
printf "%-15s %s [%s]\n" "--conduit" "Build Conduit" "$DO_CONDUIT"
}
function bv_conduit_graphical
{
local graphical_out="Conduit $CONDUIT_VERSION($CONDUIT_FILE) $ON_CONDUIT"
echo $graphical_out
}
function bv_conduit_host_profile
{
if [[ "$DO_CONDUIT" == "yes" ]] ; then
......
function bv_damaris_initialize
{
export DO_DAMARIS="no"
export ON_DAMARIS="off"
}
function bv_damaris_enable
{
DO_DAMARIS="yes"
ON_DAMARIS="on"
}
function bv_damaris_disable
{
DO_DAMARIS="no"
ON_DAMARIS="off"
}
function bv_damaris_depends_on
......@@ -50,12 +47,6 @@ function bv_damaris_print_usage
printf "%-15s %s [%s]\n" "--damaris" "Build DAMARIS" "$DO_DAMARIS"
}
function bv_damaris_graphical
{
local graphical_out="DAMARIS $DAMARIS_VERSION($DAMARIS_FILE) $ON_DAMARIS"
echo $graphical_out
}
function bv_damaris_host_profile
{
if [[ "$DO_DAMARIS" == "yes" ]] ; then
......
function bv_eavl_initialize
{
export DO_EAVL="no"
export ON_EAVL="off"
export USE_SYSTEM_EAVL="no"
add_extra_commandline_args "eavl" "alt-eavl-dir" 1 "Use alternative directory for EAVL"
}
......@@ -9,13 +8,11 @@ function bv_eavl_initialize
function bv_eavl_enable
{
DO_EAVL="yes"
ON_EAVL="on"
}
function bv_eavl_disable
{
DO_EAVL="no"
ON_EAVL="off"
}
function bv_eavl_alt_eavl_dir
......@@ -65,12 +62,6 @@ function bv_eavl_print_usage
printf "%-15s %s [%s]\n" "--alt-eavl-dir" "Use eavl from an alternative directory"
}
function bv_eavl_graphical
{
local graphical_out="eavl $EAVL_VERSION($EAVL_FILE) $ON_EAVL"
echo "$graphical_out"
}
function bv_eavl_host_profile
{
if [[ "$DO_EAVL" == "yes" ]] ; then
......
function bv_fastbit_initialize
{
export DO_FASTBIT="no"
export ON_FASTBIT="off"
}
function bv_fastbit_enable
{
DO_FASTBIT="yes"
ON_FASTBIT="on"
}
function bv_fastbit_disable
{
DO_FASTBIT="no"
ON_FASTBIT="off"
}
function bv_fastbit_depends_on
......@@ -45,12 +42,6 @@ function bv_fastbit_print_usage
printf "%-15s %s [%s]\n" "--fastbit" "Build FastBit" "$DO_FASTBIT"
}
function bv_fastbit_graphical
{
local graphical_out="FastBit $FASTBIT_VERSION($FASTBIT_FILE) $ON_FASTBIT"
echo $graphical_out
}
function bv_fastbit_host_profile
{
if [[ "$DO_FASTBIT" == "yes" ]] ; then
......
function bv_fastquery_initialize
{
export DO_FASTQUERY="no"
export ON_FASTQUERY="off"
}
function bv_fastquery_enable
{
DO_FASTQUERY="yes"
ON_FASTQUERY="on"
}
function bv_fastquery_disable
{
DO_FASTQUERY="no"
ON_FASTQUERY="off"
}
function bv_fastquery_depends_on
......@@ -61,12 +58,6 @@ function bv_fastquery_print_usage
printf "%-15s %s [%s]\n" "--fastquery" "Build FastQuery" "$DO_FASTQUERY"
}
function bv_fastquery_graphical
{
local graphical_out="FastQuery $FASTQUERY_VERSION($FASTQUERY_FILE) $ON_FASTQUERY"
echo $graphical_out
}
function bv_fastquery_host_profile
{
if [[ "$DO_FASTQUERY" == "yes" ]] ; then
......
function bv_gdal_initialize
{
export DO_GDAL="no"
export ON_GDAL="off"
}
function bv_gdal_enable
{
DO_GDAL="yes"
ON_GDAL="on"
}
function bv_gdal_disable
{
DO_GDAL="no"
ON_GDAL="off"
}
function bv_gdal_depends_on
......@@ -45,12 +42,6 @@ function bv_gdal_print_usage
printf "%-15s %s [%s]\n" "--gdal" "Build GDAL" "$DO_GDAL"
}
function bv_gdal_graphical
{
local graphical_out="GDAL $GDAL_VERSION($GDAL_FILE) $ON_GDAL"
echo $graphical_out
}
function bv_gdal_host_profile
{
if [[ "$DO_GDAL" == "yes" ]] ; then
......
function bv_glu_initialize
{
export DO_GLU="no"
export ON_GLU="off"
}
function bv_glu_enable
{
if [[ "$DO_MESA" == "yes" || "$DO_OPENSWR" == "yes" ]] ; then
DO_GLU="yes"
ON_GLU="on"
fi
}
function bv_glu_disable
{
DO_GLU="no"
ON_GLU="off"
}
function bv_glu_depends_on
......@@ -47,12 +44,6 @@ function bv_glu_print_usage
printf "%-15s %s [%s]\n" "--glu" "Build GLU" "$DO_GLU"
}
function bv_glu_graphical
{
local graphical_out="GLU $GLU_VERSION($GLU_FILE) $ON_GLU"
echo $graphical_out
}
function bv_glu_host_profile
{
# if [[ "$DO_GLU" == "yes" ]] ; then
......@@ -70,7 +61,6 @@ function bv_glu_selected
args=$@
if [[ $args == "--glu" ]]; then
DO_GLU="yes"
ON_GLU="on"
return 1
fi
......
function bv_h5part_initialize
{
export DO_H5PART="no"
export ON_H5PART="off"
}
function bv_h5part_enable
{
DO_H5PART="yes"
ON_H5PART="on"
DO_HDF5="yes"
ON_HDF5="on"
DO_SZIP="yes"
ON_SZIP="on"
DO_SZIP="yes"
}
function bv_h5part_disable
{
DO_H5PART="no"
ON_H5PART="off"
}
function bv_h5part_depends_on
......@@ -49,12 +44,6 @@ function bv_h5part_print_usage
printf "%-15s %s [%s]\n" "--h5part" "Build H5Part" "$DO_H5PART"
}
function bv_h5part_graphical