Commit bac1fbd0 authored by cyrush's avatar cyrush
Browse files

merge from 2.1RC, SVN_SOURCE_PATH addition to build_visit

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12837 18c085ea-50e0-402c-830e-de6fd14e8384
parent a5cee0cc
......@@ -967,6 +967,13 @@
# Brad Whitlock, Tue Oct 19 11:28:16 PDT 2010
# I added support for cgns 3.0.8
#
# Cyrus Harrison, Wed Oct 27 09:33:22 PDT 2010
# Added SVN_SOURCE_PATH, to allow us to tie a versioned build_visit
# release to a specific svn tag.
#
# *****************************************************************************
# *****************************************************************************
# #
# *************************************************************************** #
......@@ -1241,7 +1248,7 @@ if [[ "$CXX_COMPILER" == "g++" ]] ; then
fi
export SVN_ANON_ROOT_PATH="http://portal.nersc.gov/svn/visit/"
export SVN_ANON_ROOT_PATH="http://portal.nersc.gov/svn/visit"
# Setup svn path: use SVN_NERSC_NAME if set
if test -z "$SVN_NERSC_NAME" ; then
export SVN_REPO_ROOT_PATH="svn+ssh://svn.nersc.gov/svn/visit"
......@@ -1249,6 +1256,24 @@ else
export SVN_REPO_ROOT_PATH="svn+ssh://$SVN_NERSC_NAME@svn.nersc.gov/svn/visit"
fi
############################################################################
# Path of VisIt src directory in svn.
# For trunk use "trunk/src"
# For versioned build_visit releases change this to point to the proper
# release tag.
############################################################################
####
# Trunk:
####
export SVN_SOURCE_PATH="trunk/src"
###
# Release:
###
#export SVN_SOURCE_PATH="tags/2.1.0/src"
if [[ "$OPSYS" != "Darwin" ]]; then
WGET_MINOR_VERSION=$(wget --version| head -n 1|cut -d. -f 2)
# version 1.7 pre-dates ssl integration
......@@ -2018,15 +2043,15 @@ function check_visit_source_code
# Check-out the latest svn sources, before building VisIt
if [[ "$DO_SVN" == "yes" && "$USE_VISIT_FILE" == "no" ]] ; then
if [[ -d src ]] ; then
info "Found VisIt SVN src directory, using that . . ."
info "Found existing VisIt SVN src directory, using that . . ."
else
# Print a dialog screen
info "SVN check-out of VisIt . . ."
info "SVN check-out of VisIt ($SVN_ROOT_PATH/$SVN_SOURCE_PATH) . . ."
if [[ "$DO_REVISION" == "yes" && "$SVNREVISION" != "" ]] ; then
svn co --quiet --non-interactive --revision "$SVNREVISION" \
$SVN_ROOT_PATH/trunk/src
$SVN_ROOT_PATH/$SVN_SOURCE_PATH
else
svn co --quiet --non-interactive $SVN_ROOT_PATH/trunk/src
svn co --quiet --non-interactive $SVN_ROOT_PATH/$SVN_SOURCE_PATH
fi
if [[ $? != 0 ]] ; then
warn "Unable to build VisIt. SVN download failed."
......@@ -8447,10 +8472,10 @@ usage () {
printf "%-11s <%s> %s [%s]\n" "--makeflags" "flags" "Flags to 'make'" "$MAKE_OPT_FLAGS"
printf "%s <%s> %s\n" "--svn" \
"Obtain VisIt source code and third party libraries from the SVN server"
printf "\t%s\n" " [svn co $SVN_REPO_ROOT_PATH/trunk/src]"
printf "\t%s\n" " [svn co $SVN_REPO_ROOT_PATH/$SVN_SOURCE_PATH]"
printf "%s <%s> %s\n" "--svn-anonymous" \
"Obtain VisIt source code and third party libraries using the anonymous SVN mirror."
printf "\t%s\n" " [svn co $SVN_ANON_ROOT_PATH/trunk/src]"
printf "\t%s\n" " [svn co $SVN_ANON_ROOT_PATH/$SVN_SOURCE_PATH]"
printf "%s <%s> %s\n" "--svn-revision" "revision" \
"Specify the SVN revision of the VisIt source code and third party libraries to download. Used in conjunction with --svn or --svn-anonymous."
printf "%s <%s> %s [%s]\n" "--tarball" "file" "tarball to extract VisIt from" "$VISIT_FILE"
......
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