[Saga-devel] saga SVN commit 3268: /trunk/
amerzky at cct.lsu.edu
amerzky at cct.lsu.edu
Wed Jan 14 04:36:58 CST 2009
User: amerzky
Date: 2009/01/14 04:36 AM
Modified:
/trunk/
configure, configure.in
/trunk/config/
saga.config.boost.c.mk.in, saga_base.m4
Log:
add ssh adaptor suite
add separate flag for context adaptor
A
File Changes:
Directory: /trunk/config/
=========================
File [modified]: saga.config.boost.c.mk.in
Delta lines: +1 -1
===================================================================
--- trunk/config/saga.config.boost.c.mk.in 2009-01-14 07:58:54 UTC (rev 3267)
+++ trunk/config/saga.config.boost.c.mk.in 2009-01-14 10:36:41 UTC (rev 3268)
@@ -23,7 +23,7 @@
SAGA_BOOST_VERSION_MIN = @BOOST_VERSION_MIN@
SAGA_BOOST_VERSION_SUB = @BOOST_VERSION_SUB@
-# always add our local boost include paths, before teh system boost installation
+# always add our local boost include paths, before the system boost installation
ifdef SAGA_ROOT
BOOST_EXT_DIRS = futures plugin process spirit
File [modified]: saga_base.m4
Delta lines: +27 -7
===================================================================
--- trunk/config/saga_base.m4 2009-01-14 07:58:54 UTC (rev 3267)
+++ trunk/config/saga_base.m4 2009-01-14 10:36:41 UTC (rev 3268)
@@ -652,6 +652,7 @@
[
# first, get a list of possible/known adaptor sets
+ SAGA_HAVE_ADAPTOR_CONTEXT=no
SAGA_HAVE_ADAPTOR_JOB=no
SAGA_HAVE_ADAPTOR_FILE=no
SAGA_HAVE_ADAPTOR_REPLICA=no
@@ -667,21 +668,21 @@
AC_ARG_WITH([adaptors],
AS_HELP_STRING([--with-adaptors=all],
[comma separated list of SAGA adaptors to build.
- possible values: job, file, replica, stream,
+ possible values: context, job, file, replica, stream,
rpc, advert, sd, cpr, all (default is all w/o sd,cpr).]),
[
if test "$withval" = "no"; then
want_adaptors=""
elif test "$withval" = "yes"; then
want_adaptors="all"
- want_adaptors="job,namespace,file,replica,stream,rpc,advert"
+ want_adaptors="context,job,namespace,file,replica,stream,rpc,advert"
else
want_adaptors=$withval
fi
],
[
want_adaptors="all"
- want_adaptors="job,namespace,file,replica,stream,rpc,advert"
+ want_adaptors="context,job,namespace,file,replica,stream,rpc,advert"
])
if test "x$want_adaptors" = "x"; then
@@ -689,7 +690,7 @@
else
if test "x$want_adaptors" = "xall"; then
- want_adaptors="job,namespace,file,replica,stream,rpc,advert,sd,cpr"
+ want_adaptors="context,job,namespace,file,replica,stream,rpc,advert,sd,cpr"
fi
while $TRUE
@@ -703,6 +704,14 @@
case "$this_adaptor" in
+ context )
+ # no package check required - context is in SAGA core
+ AC_SUBST([SAGA_HAVE_ADAPTOR_CONTEXT])
+ AC_DEFINE([SAGA_HAVE_ADAPTOR_CONTEXT], [1])
+ SAGA_HAVE_ADAPTOR_CONTEXT=yes
+ build_adaptors="${build_adaptors}context "
+ ;;
+
job )
if test "$SAGA_HAVE_PACKAGE_JOB" = "yes"; then
AC_SUBST([SAGA_HAVE_ADAPTOR_JOB])
@@ -799,6 +808,7 @@
export SAGA_BUILD_ADAPTORS
AC_SUBST(SAGA_BUILD_ADAPTORS)
+ export SAGA_HAVE_ADAPTOR_CONTEXT
export SAGA_HAVE_ADAPTOR_JOB
export SAGA_HAVE_ADAPTOR_FILE
export SAGA_HAVE_ADAPTOR_REPLICA
@@ -809,6 +819,7 @@
export SAGA_HAVE_ADAPTOR_SD
export SAGA_HAVE_ADAPTOR_CPR
+ echo "export SAGA_HAVE_ADAPTOR_CONTEXT=$SAGA_HAVE_ADAPTOR_CONTEXT" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_JOB=$SAGA_HAVE_ADAPTOR_JOB" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_FILE=$SAGA_HAVE_ADAPTOR_FILE" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_REPLICA=$SAGA_HAVE_ADAPTOR_REPLICA" >> $CACHE
@@ -834,6 +845,7 @@
SAGA_HAVE_ADAPTOR_SUITE_CONDOR=no
SAGA_HAVE_ADAPTOR_SUITE_LSF=no
SAGA_HAVE_ADAPTOR_SUITE_AWS=no
+ SAGA_HAVE_ADAPTOR_SUITE_SSH=no
default="all"
@@ -841,7 +853,7 @@
AS_HELP_STRING([--with-adaptor_suites=<suites>],
[comma separated list of SAGA adaptor suites to build.
possible values: default, globus, omii, condor,
- lsf, aws, all (default is "all").]),
+ lsf, aws, ssh, all (default is "all").]),
[
if test "$withval" = "no"; then
want_adaptor_suites=""
@@ -854,7 +866,7 @@
[want_adaptor_suites="$default"])
if test "x$want_adaptor_suites" = "xall"; then
- want_adaptor_suites="default,globus,omii,condor,lsf,aws"
+ want_adaptor_suites="default,globus,omii,condor,lsf,aws,ssh"
fi
while $TRUE
@@ -906,6 +918,12 @@
AC_DEFINE([SAGA_HAVE_ADAPTOR_SUITE_AWS], [1])
;;
+ ssh )
+ SAGA_HAVE_ADAPTOR_SUITE_SSH=yes
+ AC_SUBST([SAGA_HAVE_ADAPTOR_SUITE_SSH])
+ AC_DEFINE([SAGA_HAVE_ADAPTOR_SUITE_SSH], [1])
+ ;;
+
* )
AC_MSG_ERROR(unknown adaptor_suite '$this_adaptor_suite')
build_this_adaptor_suite=""
@@ -913,7 +931,7 @@
esac
- build_adaptor_suites="$build_adaptor_suites$build_this_adaptor_suite"
+ build_adaptor_suites="$build_adaptor_suites, $build_this_adaptor_suite"
done
@@ -927,6 +945,7 @@
export SAGA_HAVE_ADAPTOR_SUITE_CONDOR
export SAGA_HAVE_ADAPTOR_SUITE_LSF
export SAGA_HAVE_ADAPTOR_SUITE_AWS
+ export SAGA_HAVE_ADAPTOR_SUITE_SSH
echo "export SAGA_HAVE_ADAPTOR_SUITE_DEFAULT=$SAGA_HAVE_ADAPTOR_SUITE_DEFAULT" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_SUITE_GLOBUS=$SAGA_HAVE_ADAPTOR_SUITE_GLOBUS" >> $CACHE
@@ -934,6 +953,7 @@
echo "export SAGA_HAVE_ADAPTOR_SUITE_CONDOR=$SAGA_HAVE_ADAPTOR_SUITE_CONDOR" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_SUITE_LSF=$SAGA_HAVE_ADAPTOR_SUITE_LSF" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_SUITE_AWS=$SAGA_HAVE_ADAPTOR_SUITE_AWS" >> $CACHE
+ echo "export SAGA_HAVE_ADAPTOR_SUITE_SSH=$SAGA_HAVE_ADAPTOR_SUITE_SSH" >> $CACHE
echo "" >> $CACHE
AC_MSG_RESULT([$build_adaptor_suites])
Directory: /trunk/
==================
File [modified]: configure
Delta lines: +49 -11
===================================================================
--- trunk/configure 2009-01-14 07:58:54 UTC (rev 3267)
+++ trunk/configure 2009-01-14 10:36:41 UTC (rev 3268)
@@ -801,6 +801,7 @@
SAGA_HAVE_PACKAGE_CPR
SAGA_PACKAGE_LDFLAGS
SAGA_BUILD_PACKAGES
+SAGA_HAVE_ADAPTOR_CONTEXT
SAGA_HAVE_ADAPTOR_JOB
SAGA_HAVE_ADAPTOR_FILE
SAGA_HAVE_ADAPTOR_REPLICA
@@ -817,6 +818,7 @@
SAGA_HAVE_ADAPTOR_SUITE_CONDOR
SAGA_HAVE_ADAPTOR_SUITE_LSF
SAGA_HAVE_ADAPTOR_SUITE_AWS
+SAGA_HAVE_ADAPTOR_SUITE_SSH
SAGA_BUILD_ADAPTOR_SUITES
SAGA_LOCATION
subdirs
@@ -843,7 +845,8 @@
adaptors/OMII
adaptors/condor
adaptors/lsf
-adaptors/aws'
+adaptors/aws
+adaptors/ssh'
# Initialize some variables set by options.
ac_init_help=
@@ -1431,12 +1434,13 @@
stream, rpc, advert, sd, cpr, all (default is all
w/o sd,cpr).
--with-adaptors=all comma separated list of SAGA adaptors to build.
- possible values: job, file, replica, stream, rpc,
- advert, sd, cpr, all (default is all w/o sd,cpr).
+ possible values: context, job, file, replica,
+ stream, rpc, advert, sd, cpr, all (default is all
+ w/o sd,cpr).
--with-adaptor_suites=<suites>
comma separated list of SAGA adaptor suites to
build. possible values: default, globus, omii,
- condor, lsf, aws, all (default is "all").
+ condor, lsf, aws, ssh, all (default is "all").
Some influential environment variables:
CC C compiler command
@@ -13446,6 +13450,7 @@
# first, get a list of possible/known adaptor sets
+ SAGA_HAVE_ADAPTOR_CONTEXT=no
SAGA_HAVE_ADAPTOR_JOB=no
SAGA_HAVE_ADAPTOR_FILE=no
SAGA_HAVE_ADAPTOR_REPLICA=no
@@ -13467,7 +13472,7 @@
want_adaptors=""
elif test "$withval" = "yes"; then
want_adaptors="all"
- want_adaptors="job,namespace,file,replica,stream,rpc,advert"
+ want_adaptors="context,job,namespace,file,replica,stream,rpc,advert"
else
want_adaptors=$withval
fi
@@ -13475,7 +13480,7 @@
else
want_adaptors="all"
- want_adaptors="job,namespace,file,replica,stream,rpc,advert"
+ want_adaptors="context,job,namespace,file,replica,stream,rpc,advert"
fi
@@ -13486,7 +13491,7 @@
else
if test "x$want_adaptors" = "xall"; then
- want_adaptors="job,namespace,file,replica,stream,rpc,advert,sd,cpr"
+ want_adaptors="context,job,namespace,file,replica,stream,rpc,advert,sd,cpr"
fi
while $TRUE
@@ -13500,6 +13505,17 @@
case "$this_adaptor" in
+ context )
+ # no package check required - context is in SAGA core
+
+ cat >>confdefs.h <<\_ACEOF
+#define SAGA_HAVE_ADAPTOR_CONTEXT 1
+_ACEOF
+
+ SAGA_HAVE_ADAPTOR_CONTEXT=yes
+ build_adaptors="${build_adaptors}context "
+ ;;
+
job )
if test "$SAGA_HAVE_PACKAGE_JOB" = "yes"; then
@@ -13625,6 +13641,7 @@
export SAGA_BUILD_ADAPTORS
+ export SAGA_HAVE_ADAPTOR_CONTEXT
export SAGA_HAVE_ADAPTOR_JOB
export SAGA_HAVE_ADAPTOR_FILE
export SAGA_HAVE_ADAPTOR_REPLICA
@@ -13635,6 +13652,7 @@
export SAGA_HAVE_ADAPTOR_SD
export SAGA_HAVE_ADAPTOR_CPR
+ echo "export SAGA_HAVE_ADAPTOR_CONTEXT=$SAGA_HAVE_ADAPTOR_CONTEXT" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_JOB=$SAGA_HAVE_ADAPTOR_JOB" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_FILE=$SAGA_HAVE_ADAPTOR_FILE" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_REPLICA=$SAGA_HAVE_ADAPTOR_REPLICA" >> $CACHE
@@ -13659,6 +13677,7 @@
SAGA_HAVE_ADAPTOR_SUITE_CONDOR=no
SAGA_HAVE_ADAPTOR_SUITE_LSF=no
SAGA_HAVE_ADAPTOR_SUITE_AWS=no
+ SAGA_HAVE_ADAPTOR_SUITE_SSH=no
default="all"
@@ -13680,7 +13699,7 @@
if test "x$want_adaptor_suites" = "xall"; then
- want_adaptor_suites="default,globus,omii,condor,lsf,aws"
+ want_adaptor_suites="default,globus,omii,condor,lsf,aws,ssh"
fi
while $TRUE
@@ -13750,6 +13769,15 @@
;;
+ ssh )
+ SAGA_HAVE_ADAPTOR_SUITE_SSH=yes
+
+ cat >>confdefs.h <<\_ACEOF
+#define SAGA_HAVE_ADAPTOR_SUITE_SSH 1
+_ACEOF
+
+ ;;
+
* )
{ { echo "$as_me:$LINENO: error: unknown adaptor_suite '$this_adaptor_suite'" >&5
echo "$as_me: error: unknown adaptor_suite '$this_adaptor_suite'" >&2;}
@@ -13759,7 +13787,7 @@
esac
- build_adaptor_suites="$build_adaptor_suites$build_this_adaptor_suite"
+ build_adaptor_suites="$build_adaptor_suites, $build_this_adaptor_suite"
done
@@ -13773,6 +13801,7 @@
export SAGA_HAVE_ADAPTOR_SUITE_CONDOR
export SAGA_HAVE_ADAPTOR_SUITE_LSF
export SAGA_HAVE_ADAPTOR_SUITE_AWS
+ export SAGA_HAVE_ADAPTOR_SUITE_SSH
echo "export SAGA_HAVE_ADAPTOR_SUITE_DEFAULT=$SAGA_HAVE_ADAPTOR_SUITE_DEFAULT" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_SUITE_GLOBUS=$SAGA_HAVE_ADAPTOR_SUITE_GLOBUS" >> $CACHE
@@ -13780,6 +13809,7 @@
echo "export SAGA_HAVE_ADAPTOR_SUITE_CONDOR=$SAGA_HAVE_ADAPTOR_SUITE_CONDOR" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_SUITE_LSF=$SAGA_HAVE_ADAPTOR_SUITE_LSF" >> $CACHE
echo "export SAGA_HAVE_ADAPTOR_SUITE_AWS=$SAGA_HAVE_ADAPTOR_SUITE_AWS" >> $CACHE
+ echo "export SAGA_HAVE_ADAPTOR_SUITE_SSH=$SAGA_HAVE_ADAPTOR_SUITE_SSH" >> $CACHE
echo "" >> $CACHE
{ echo "$as_me:$LINENO: result: $build_adaptor_suites" >&5
@@ -13926,6 +13956,7 @@
echo " SAGA CORE - CPI Packages (Adaptors) " | $TEE $OUT
echo " ======================================================== " | $TEE $OUT
echo " " | $TEE $OUT
+echo " SAGA ADAPTOR CONTEXT : $SAGA_HAVE_ADAPTOR_CONTEXT " | $TEE $OUT
echo " SAGA ADAPTOR JOB : $SAGA_HAVE_ADAPTOR_JOB " | $TEE $OUT
echo " SAGA ADAPTOR NAMESPACE : $SAGA_HAVE_ADAPTOR_NAMESPACE " | $TEE $OUT
echo " SAGA ADAPTOR FILE : $SAGA_HAVE_ADAPTOR_FILE " | $TEE $OUT
@@ -14006,6 +14037,11 @@
fi
+if test "x$SAGA_HAVE_ADAPTOR_SUITE_SSH" = "xyes"; then
+ subdirs="$subdirs adaptors/ssh"
+
+fi
+
# echo " ======================================================== " | $TEE $OUT
# echo " SAGA CORE - Adaptor Suites " | $TEE $OUT
# echo " ======================================================== " | $TEE $OUT
@@ -14913,12 +14949,12 @@
SAGA_HAVE_PACKAGE_CPR!$SAGA_HAVE_PACKAGE_CPR$ac_delim
SAGA_PACKAGE_LDFLAGS!$SAGA_PACKAGE_LDFLAGS$ac_delim
SAGA_BUILD_PACKAGES!$SAGA_BUILD_PACKAGES$ac_delim
+SAGA_HAVE_ADAPTOR_CONTEXT!$SAGA_HAVE_ADAPTOR_CONTEXT$ac_delim
SAGA_HAVE_ADAPTOR_JOB!$SAGA_HAVE_ADAPTOR_JOB$ac_delim
SAGA_HAVE_ADAPTOR_FILE!$SAGA_HAVE_ADAPTOR_FILE$ac_delim
SAGA_HAVE_ADAPTOR_REPLICA!$SAGA_HAVE_ADAPTOR_REPLICA$ac_delim
SAGA_HAVE_ADAPTOR_NAMESPACE!$SAGA_HAVE_ADAPTOR_NAMESPACE$ac_delim
SAGA_HAVE_ADAPTOR_STREAM!$SAGA_HAVE_ADAPTOR_STREAM$ac_delim
-SAGA_HAVE_ADAPTOR_RPC!$SAGA_HAVE_ADAPTOR_RPC$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -14960,6 +14996,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+SAGA_HAVE_ADAPTOR_RPC!$SAGA_HAVE_ADAPTOR_RPC$ac_delim
SAGA_HAVE_ADAPTOR_ADVERT!$SAGA_HAVE_ADAPTOR_ADVERT$ac_delim
SAGA_HAVE_ADAPTOR_SD!$SAGA_HAVE_ADAPTOR_SD$ac_delim
SAGA_HAVE_ADAPTOR_CPR!$SAGA_HAVE_ADAPTOR_CPR$ac_delim
@@ -14970,6 +15007,7 @@
SAGA_HAVE_ADAPTOR_SUITE_CONDOR!$SAGA_HAVE_ADAPTOR_SUITE_CONDOR$ac_delim
SAGA_HAVE_ADAPTOR_SUITE_LSF!$SAGA_HAVE_ADAPTOR_SUITE_LSF$ac_delim
SAGA_HAVE_ADAPTOR_SUITE_AWS!$SAGA_HAVE_ADAPTOR_SUITE_AWS$ac_delim
+SAGA_HAVE_ADAPTOR_SUITE_SSH!$SAGA_HAVE_ADAPTOR_SUITE_SSH$ac_delim
SAGA_BUILD_ADAPTOR_SUITES!$SAGA_BUILD_ADAPTOR_SUITES$ac_delim
SAGA_LOCATION!$SAGA_LOCATION$ac_delim
subdirs!$subdirs$ac_delim
@@ -14977,7 +15015,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
File [modified]: configure.in
Delta lines: +5 -0
===================================================================
--- trunk/configure.in 2009-01-14 07:58:54 UTC (rev 3267)
+++ trunk/configure.in 2009-01-14 10:36:41 UTC (rev 3268)
@@ -190,6 +190,7 @@
echo " SAGA CORE - CPI Packages (Adaptors) " | $TEE $OUT
echo " ======================================================== " | $TEE $OUT
echo " " | $TEE $OUT
+echo " SAGA ADAPTOR CONTEXT : $SAGA_HAVE_ADAPTOR_CONTEXT " | $TEE $OUT
echo " SAGA ADAPTOR JOB : $SAGA_HAVE_ADAPTOR_JOB " | $TEE $OUT
echo " SAGA ADAPTOR NAMESPACE : $SAGA_HAVE_ADAPTOR_NAMESPACE " | $TEE $OUT
echo " SAGA ADAPTOR FILE : $SAGA_HAVE_ADAPTOR_FILE " | $TEE $OUT
@@ -262,6 +263,10 @@
AC_CONFIG_SUBDIRS(adaptors/aws)
fi
+if test "x$SAGA_HAVE_ADAPTOR_SUITE_SSH" = "xyes"; then
+ AC_CONFIG_SUBDIRS(adaptors/ssh)
+fi
+
# echo " ======================================================== " | $TEE $OUT
# echo " SAGA CORE - Adaptor Suites " | $TEE $OUT
# echo " ======================================================== " | $TEE $OUT
More information about the saga-devel
mailing list