diff options
Diffstat (limited to 'sca-cpp/trunk/components')
53 files changed, 149 insertions, 116 deletions
diff --git a/sca-cpp/trunk/components/cache/Makefile.am b/sca-cpp/trunk/components/cache/Makefile.am index 2f162bf8f5..b1ad26a246 100644 --- a/sca-cpp/trunk/components/cache/Makefile.am +++ b/sca-cpp/trunk/components/cache/Makefile.am @@ -28,19 +28,19 @@ memcached.prefix: $(top_builddir)/config.status EXTRA_DIST = cache.composite memcache.componentType datacache.componentType memocache.componentType *.scm comp_LTLIBRARIES = libmemcache.la libdatacache.la libmemocache.la -noinst_DATA = libmemcache.so libdatacache.so libmemocache.so +noinst_DATA = libmemcache${libsuffix} libdatacache${libsuffix} libmemocache${libsuffix} libmemcache_la_SOURCES = memcache.cpp -libmemcache.so: - ln -s .libs/libmemcache.so +libmemcache${libsuffix}: + ln -s .libs/libmemcache${libsuffix} libdatacache_la_SOURCES = datacache.cpp -libdatacache.so: - ln -s .libs/libdatacache.so +libdatacache${libsuffix}: + ln -s .libs/libdatacache${libsuffix} libmemocache_la_SOURCES = memocache.cpp -libmemocache.so: - ln -s .libs/libmemocache.so +libmemocache${libsuffix}: + ln -s .libs/libmemocache${libsuffix} memcache_test_SOURCES = memcache-test.cpp memcache_test_LDFLAGS = -lxml2 @@ -50,4 +50,5 @@ client_test_LDFLAGS = -lxml2 -lcurl -lmozjs dist_noinst_SCRIPTS = memcached-test memcached-ssl-test server-test noinst_PROGRAMS = memcache-test client-test -TESTS = memcached-test memcached-ssl-test server-test +#TESTS = memcached-test memcached-ssl-test server-test +TESTS = memcached-test server-test diff --git a/sca-cpp/trunk/components/cache/memcached-ssl-test b/sca-cpp/trunk/components/cache/memcached-ssl-test index 88143490f8..a99a5a9144 100755 --- a/sca-cpp/trunk/components/cache/memcached-ssl-test +++ b/sca-cpp/trunk/components/cache/memcached-ssl-test @@ -51,4 +51,4 @@ rc=$? ./memcached-stop 11411 ./memcached-stop 11412 ./memcached-stop 11413 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/cache/memcached-start b/sca-cpp/trunk/components/cache/memcached-start index 75524d0dec..0946da28f5 100755 --- a/sca-cpp/trunk/components/cache/memcached-start +++ b/sca-cpp/trunk/components/cache/memcached-start @@ -18,7 +18,7 @@ # under the License. # Start memcached -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` addr=$1 if [ "$addr" = "" ]; then diff --git a/sca-cpp/trunk/components/cache/memcached-stop b/sca-cpp/trunk/components/cache/memcached-stop index c414616752..b76fc28466 100755 --- a/sca-cpp/trunk/components/cache/memcached-stop +++ b/sca-cpp/trunk/components/cache/memcached-stop @@ -18,7 +18,7 @@ # under the License. # Stop memcached -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` addr=$1 if [ "$addr" = "" ]; then diff --git a/sca-cpp/trunk/components/cache/memcached-test b/sca-cpp/trunk/components/cache/memcached-test index 993d63ba1b..8e034bb936 100755 --- a/sca-cpp/trunk/components/cache/memcached-test +++ b/sca-cpp/trunk/components/cache/memcached-test @@ -31,4 +31,4 @@ rc=$? ./memcached-stop 11211 ./memcached-stop 11212 ./memcached-stop 11213 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/cache/server-test b/sca-cpp/trunk/components/cache/server-test index 6d14f789f5..1fea285100 100755 --- a/sca-cpp/trunk/components/cache/server-test +++ b/sca-cpp/trunk/components/cache/server-test @@ -48,4 +48,4 @@ rc=$? ./memcached-stop 11412 ./memcached-stop 11413 sleep 2 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/chat/Makefile.am b/sca-cpp/trunk/components/chat/Makefile.am index 8856e536fd..5c995ad452 100644 --- a/sca-cpp/trunk/components/chat/Makefile.am +++ b/sca-cpp/trunk/components/chat/Makefile.am @@ -34,22 +34,22 @@ vysper.prefix: $(top_builddir)/config.status EXTRA_DIST = chat.composite chat-sendreceiver.componentType chat-sender.componentType chat-sender2.componentType *.scm comp_LTLIBRARIES = libchat-sendreceiver.la libchat-sender.la libchat-sender2.la -noinst_DATA = libchat-sendreceiver.so libchat-sender.so libchat-sender2.so +noinst_DATA = libchat-sendreceiver${libsuffix} libchat-sender${libsuffix} libchat-sender2${libsuffix} libchat_sendreceiver_la_SOURCES = chat-sendreceiver.cpp libchat_sendreceiver_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv -libchat-sendreceiver.so: - ln -s .libs/libchat-sendreceiver.so +libchat-sendreceiver${libsuffix}: + ln -s .libs/libchat-sendreceiver${libsuffix} libchat_sender_la_SOURCES = chat-sender.cpp libchat_sender_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv -libchat-sender.so: - ln -s .libs/libchat-sender.so +libchat-sender${libsuffix}: + ln -s .libs/libchat-sender${libsuffix} libchat_sender2_la_SOURCES = chat-sender2.cpp libchat_sender2_la_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv -libchat-sender2.so: - ln -s .libs/libchat-sender2.so +libchat-sender2${libsuffix}: + ln -s .libs/libchat-sender2${libsuffix} chat_send_SOURCES = chat-send.cpp chat_send_LDFLAGS = -L${LIBSTROPHE_LIB} -R${LIBSTROPHE_LIB} -lstrophe -lssl -lresolv diff --git a/sca-cpp/trunk/components/chat/echo-test b/sca-cpp/trunk/components/chat/echo-test index 271d40d122..c155d4a9a8 100755 --- a/sca-cpp/trunk/components/chat/echo-test +++ b/sca-cpp/trunk/components/chat/echo-test @@ -28,4 +28,4 @@ rc=$? # Cleanup ./vysper-stop sleep 1 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/chat/server-test b/sca-cpp/trunk/components/chat/server-test index fcac90741c..cbece709f5 100755 --- a/sca-cpp/trunk/components/chat/server-test +++ b/sca-cpp/trunk/components/chat/server-test @@ -40,4 +40,4 @@ rc=$? sleep 1 ./vysper-stop sleep 1 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/chat/vysper-classpath b/sca-cpp/trunk/components/chat/vysper-classpath index 7cf16a5ae8..e164200ed2 100755 --- a/sca-cpp/trunk/components/chat/vysper-classpath +++ b/sca-cpp/trunk/components/chat/vysper-classpath @@ -18,7 +18,7 @@ # under the License. # Compute a classpath for running a Vysper server -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` if [ "$1" = "" ]; then vysper_prefix=`cat $here/vysper.prefix` diff --git a/sca-cpp/trunk/components/chat/vysper-start b/sca-cpp/trunk/components/chat/vysper-start index af95ecadf4..b7fcad5217 100755 --- a/sca-cpp/trunk/components/chat/vysper-start +++ b/sca-cpp/trunk/components/chat/vysper-start @@ -18,7 +18,7 @@ # under the License. # Start Vysper test XMPP server -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` java_prefix=`cat $here/../../modules/java/java.prefix` mkdir -p $here/tmp/logs diff --git a/sca-cpp/trunk/components/chat/vysper-stop b/sca-cpp/trunk/components/chat/vysper-stop index 3c4be4efa9..6ae9246134 100755 --- a/sca-cpp/trunk/components/chat/vysper-stop +++ b/sca-cpp/trunk/components/chat/vysper-stop @@ -18,7 +18,7 @@ # under the License. # Stop Vysper test XMPP server -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` java_prefix=`cat $here/../../modules/java/java.prefix` kill `ps -ef | grep -v grep | grep "${java_prefix}/jre/bin/java" | grep "vysper" | awk '{ print $2 }'` diff --git a/sca-cpp/trunk/components/filedb/Makefile.am b/sca-cpp/trunk/components/filedb/Makefile.am index 359ad68a2f..c6589a1b7b 100644 --- a/sca-cpp/trunk/components/filedb/Makefile.am +++ b/sca-cpp/trunk/components/filedb/Makefile.am @@ -23,12 +23,12 @@ compdir=$(prefix)/components/filedb EXTRA_DIST = filedb.composite filedb.componentType comp_LTLIBRARIES = libfiledb.la -noinst_DATA = libfiledb.so +noinst_DATA = libfiledb${libsuffix} libfiledb_la_SOURCES = filedb.cpp libfiledb_la_LDFLAGS = -lxml2 -lmozjs -libfiledb.so: - ln -s .libs/libfiledb.so +libfiledb${libsuffix}: + ln -s .libs/libfiledb${libsuffix} file_test_SOURCES = file-test.cpp file_test_LDFLAGS = -lxml2 -lmozjs diff --git a/sca-cpp/trunk/components/filedb/filedb-test b/sca-cpp/trunk/components/filedb/filedb-test index 083bd1b96c..6d82936f6d 100755 --- a/sca-cpp/trunk/components/filedb/filedb-test +++ b/sca-cpp/trunk/components/filedb/filedb-test @@ -28,4 +28,4 @@ mkdir -p tmp/jsondb rc=$? # Cleanup -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/filedb/server-test b/sca-cpp/trunk/components/filedb/server-test index ace8dd59e2..f49ba8e80a 100755 --- a/sca-cpp/trunk/components/filedb/server-test +++ b/sca-cpp/trunk/components/filedb/server-test @@ -37,4 +37,4 @@ rc=$? # Cleanup ../../modules/http/httpd-stop tmp sleep 2 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/http/Makefile.am b/sca-cpp/trunk/components/http/Makefile.am index 43e125682e..8b97f2e16d 100644 --- a/sca-cpp/trunk/components/http/Makefile.am +++ b/sca-cpp/trunk/components/http/Makefile.am @@ -20,32 +20,32 @@ compdir=$(prefix)/components/http EXTRA_DIST = http.composite httpget.componentType httpdelete.componentType *.scm comp_LTLIBRARIES = libhttpget.la libhttpdelete.la libhttppost.la libhttpput.la libhttppatch.la -noinst_DATA = libhttpget.so libhttpdelete.so libhttppost.so libhttpput.so libhttppatch.so +noinst_DATA = libhttpget${libsuffix} libhttpdelete${libsuffix} libhttppost${libsuffix} libhttpput${libsuffix} libhttppatch${libsuffix} libhttpget_la_SOURCES = httpget.cpp libhttpget_la_LDFLAGS = -lxml2 -lmozjs -curl -libhttpget.so: - ln -s .libs/libhttpget.so +libhttpget${libsuffix}: + ln -s .libs/libhttpget${libsuffix} libhttpdelete_la_SOURCES = httpdelete.cpp libhttpdelete_la_LDFLAGS = -lxml2 -lmozjs -curl -libhttpdelete.so: - ln -s .libs/libhttpdelete.so +libhttpdelete${libsuffix}: + ln -s .libs/libhttpdelete${libsuffix} libhttppost_la_SOURCES = httppost.cpp libhttppost_la_LDFLAGS = -lxml2 -lmozjs -curl -libhttppost.so: - ln -s .libs/libhttppost.so +libhttppost${libsuffix}: + ln -s .libs/libhttppost${libsuffix} libhttpput_la_SOURCES = httpput.cpp libhttpput_la_LDFLAGS = -lxml2 -lmozjs -curl -libhttpput.so: - ln -s .libs/libhttpput.so +libhttpput${libsuffix}: + ln -s .libs/libhttpput${libsuffix} libhttppatch_la_SOURCES = httppatch.cpp libhttppatch_la_LDFLAGS = -lxml2 -lmozjs -curl -libhttppatch.so: - ln -s .libs/libhttppatch.so +libhttppatch${libsuffix}: + ln -s .libs/libhttppatch${libsuffix} client_test_SOURCES = client-test.cpp client_test_LDFLAGS = -lxml2 -lcurl -lmozjs diff --git a/sca-cpp/trunk/components/http/server-test b/sca-cpp/trunk/components/http/server-test index edfeb5d189..1deb46aa26 100755 --- a/sca-cpp/trunk/components/http/server-test +++ b/sca-cpp/trunk/components/http/server-test @@ -36,4 +36,4 @@ rc=$? # Cleanup ../../modules/http/httpd-stop tmp sleep 2 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/log/Makefile.am b/sca-cpp/trunk/components/log/Makefile.am index 88ff7b3001..92be162101 100644 --- a/sca-cpp/trunk/components/log/Makefile.am +++ b/sca-cpp/trunk/components/log/Makefile.am @@ -36,31 +36,31 @@ EXTRA_DIST = log.composite log.componentType logger.componentType *.scm *.thrift BUILT_SOURCES=gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h: scribe.thrift - ${THRIFT_PREFIX}/bin/thrift -r --gen cpp scribe.thrift; sed -i -e '1i#pragma GCC diagnostic ignored "-Wconversion"\n#pragma GCC diagnostic ignored "-Wunused"\n' gen-cpp/*.cpp + ${THRIFT_PREFIX}/bin/thrift -r --gen cpp scribe.thrift; (ls gen-cpp/*.cpp gen-cpp/*.h | xargs -I {} -t ./thrift-pragmas {}) CLEANFILES = gen-cpp/* comp_LTLIBRARIES = liblog.la liblogger.la -noinst_DATA = liblog.so liblogger.so +noinst_DATA = liblog${libsuffix} liblogger${libsuffix} nodist_liblog_la_SOURCES = gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h -liblog_la_CXXFLAGS = -Wno-unused-parameter -Wno-conversion +liblog_la_CXXFLAGS = -Wno-unused-parameter -Wno-conversion -Wno-return-type liblog_la_SOURCES = log.cpp liblog_la_LDFLAGS = -L${THRIFT_LIB} -R${THRIFT_LIB} -lthrift -L${FB303_LIB} -R${FB303_LIB} -lfb303 -L${SCRIBE_LIB} -R${SCRIBE_LIB} -lscribe -liblog.so: - ln -s .libs/liblog.so +liblog${libsuffix}: + ln -s .libs/liblog${libsuffix} nodist_liblogger_la_SOURCES = gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h -liblogger_la_CXXFLAGS = -Wno-unused-parameter -Wno-conversion +liblogger_la_CXXFLAGS = -Wno-unused-parameter -Wno-conversion -Wno-return-type liblogger_la_SOURCES = logger.cpp liblogger_la_LDFLAGS = -L${THRIFT_LIB} -R${THRIFT_LIB} -lthrift -L${FB303_LIB} -R${FB303_LIB} -lfb303 -L${SCRIBE_LIB} -R${SCRIBE_LIB} -lscribe -liblogger.so: - ln -s .libs/liblogger.so +liblogger${libsuffix}: + ln -s .libs/liblogger${libsuffix} comp_PROGRAMS = scribe-cat nodist_scribe_cat_SOURCES = gen-cpp/fb303_constants.cpp gen-cpp/fb303_types.cpp gen-cpp/scribe_constants.cpp gen-cpp/scribe.cpp gen-cpp/scribe_types.cpp gen-cpp/FacebookService.cpp gen-cpp/scribe.h -scribe_cat_CXXFLAGS = -Wno-unused-parameter -Wno-conversion +scribe_cat_CXXFLAGS = -Wno-unused-parameter -Wno-conversion -Wno-return-type scribe_cat_SOURCES = scribe-cat.cpp scribe_cat_LDFLAGS = -L${THRIFT_LIB} -R${THRIFT_LIB} -lthrift -L${FB303_LIB} -R${FB303_LIB} -lfb303 -L${SCRIBE_LIB} -R${SCRIBE_LIB} -lscribe diff --git a/sca-cpp/trunk/components/log/scribe-cat.cpp b/sca-cpp/trunk/components/log/scribe-cat.cpp index f3c5e898cd..77011e8b12 100644 --- a/sca-cpp/trunk/components/log/scribe-cat.cpp +++ b/sca-cpp/trunk/components/log/scribe-cat.cpp @@ -46,7 +46,7 @@ int cat(const string& category, const string& type) { const char* s = fgets(buf, 8192, stdin); if (s == NULL) return 0; - const int l = strlen(s); + const size_t l = strlen(s); if (l < 2) return 0; buf[l - 1] = '\0'; diff --git a/sca-cpp/trunk/components/log/scribe-tail-start b/sca-cpp/trunk/components/log/scribe-tail-start index 0044f1620d..22f5101053 100755 --- a/sca-cpp/trunk/components/log/scribe-tail-start +++ b/sca-cpp/trunk/components/log/scribe-tail-start @@ -18,7 +18,7 @@ # under the License. # Tail a file and pipe into scribe-cat -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` category="" type="" @@ -38,7 +38,7 @@ fi mkdir -p `dirname $file` touch $file -file=`readlink -f $file` +file=`echo "import os; print os.path.realpath('$file')" | python` tail -f -n 0 $file | $here/scribe-cat $category $type & diff --git a/sca-cpp/trunk/components/log/scribe-tail-stop b/sca-cpp/trunk/components/log/scribe-tail-stop index e1b74fc0c6..b46c1ecca6 100755 --- a/sca-cpp/trunk/components/log/scribe-tail-stop +++ b/sca-cpp/trunk/components/log/scribe-tail-stop @@ -18,7 +18,7 @@ # under the License. # Stop tailing a file -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` category="" type="" @@ -35,7 +35,7 @@ else file=$1 fi fi -file=`readlink -f $file` +file=`echo "import os; print os.path.realpath('$file')" | python` cmd="tail -f -n 0 $file" kill `ps -ef | grep -v grep | grep "${cmd}" | awk '{ print $2 }'` diff --git a/sca-cpp/trunk/components/log/scribe-test b/sca-cpp/trunk/components/log/scribe-test index a355026dd0..bc34f6f650 100755 --- a/sca-cpp/trunk/components/log/scribe-test +++ b/sca-cpp/trunk/components/log/scribe-test @@ -40,4 +40,4 @@ sleep 1 if [ "$rc" = "0" ]; then echo "OK" fi -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/log/scribed-central-conf b/sca-cpp/trunk/components/log/scribed-central-conf index b23646c24f..d8d008623d 100755 --- a/sca-cpp/trunk/components/log/scribed-central-conf +++ b/sca-cpp/trunk/components/log/scribed-central-conf @@ -18,9 +18,9 @@ # under the License. # Generate a Scribe central conf -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` mkdir -p $1 -root=`readlink -f $1` +root=`echo "import os; print os.path.realpath('$1')" | python` port=$2 if [ "$port" = "" ]; then diff --git a/sca-cpp/trunk/components/log/scribed-central-start b/sca-cpp/trunk/components/log/scribed-central-start index c2035037de..9aff8a1466 100755 --- a/sca-cpp/trunk/components/log/scribed-central-start +++ b/sca-cpp/trunk/components/log/scribed-central-start @@ -18,8 +18,8 @@ # under the License. # Start central scribed -here=`readlink -f $0`; here=`dirname $here` -root=`readlink -f $1` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` +root=`echo "import os; print os.path.realpath('$1')" | python` scribe_prefix=`cat $here/scribe.prefix` thrift_prefix=`cat $here/thrift.prefix` diff --git a/sca-cpp/trunk/components/log/scribed-central-stop b/sca-cpp/trunk/components/log/scribed-central-stop index 95a976813f..acded2a482 100755 --- a/sca-cpp/trunk/components/log/scribed-central-stop +++ b/sca-cpp/trunk/components/log/scribed-central-stop @@ -18,8 +18,8 @@ # under the License. # Stop central scribed -here=`readlink -f $0`; here=`dirname $here` -root=`readlink -f $1` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` +root=`echo "import os; print os.path.realpath('$1')" | python` scribe_prefix=`cat $here/scribe.prefix` thrift_prefix=`cat $here/thrift.prefix` diff --git a/sca-cpp/trunk/components/log/scribed-client-conf b/sca-cpp/trunk/components/log/scribed-client-conf index 87c8749c2e..8395b3f96e 100755 --- a/sca-cpp/trunk/components/log/scribed-client-conf +++ b/sca-cpp/trunk/components/log/scribed-client-conf @@ -18,9 +18,9 @@ # under the License. # Generate a Scribe client conf -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` mkdir -p $1 -root=`readlink -f $1` +root=`echo "import os; print os.path.realpath('$1')" | python` central=$2 cport=$3 diff --git a/sca-cpp/trunk/components/log/scribed-client-start b/sca-cpp/trunk/components/log/scribed-client-start index ed8636d7f2..acf52c535f 100755 --- a/sca-cpp/trunk/components/log/scribed-client-start +++ b/sca-cpp/trunk/components/log/scribed-client-start @@ -18,8 +18,8 @@ # under the License. # Start client scribed -here=`readlink -f $0`; here=`dirname $here` -root=`readlink -f $1` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` +root=`echo "import os; print os.path.realpath('$1')" | python` scribe_prefix=`cat $here/scribe.prefix` thrift_prefix=`cat $here/thrift.prefix` diff --git a/sca-cpp/trunk/components/log/scribed-client-stop b/sca-cpp/trunk/components/log/scribed-client-stop index 2e8959fbfc..0f9c409183 100755 --- a/sca-cpp/trunk/components/log/scribed-client-stop +++ b/sca-cpp/trunk/components/log/scribed-client-stop @@ -18,8 +18,8 @@ # under the License. # Stop client scribed -here=`readlink -f $0`; here=`dirname $here` -root=`readlink -f $1` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` +root=`echo "import os; print os.path.realpath('$1')" | python` scribe_prefix=`cat $here/scribe.prefix` thrift_prefix=`cat $here/thrift.prefix` diff --git a/sca-cpp/trunk/components/log/server-test b/sca-cpp/trunk/components/log/server-test index 631487c77a..e8e13f9d31 100755 --- a/sca-cpp/trunk/components/log/server-test +++ b/sca-cpp/trunk/components/log/server-test @@ -62,4 +62,4 @@ sleep 1 if [ "$rc" = "0" ]; then echo "OK" fi -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/log/thrift-pragmas b/sca-cpp/trunk/components/log/thrift-pragmas new file mode 100755 index 0000000000..3950ce9984 --- /dev/null +++ b/sca-cpp/trunk/components/log/thrift-pragmas @@ -0,0 +1,32 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# Patch generated Thrift files, disable some compile warnings + +tmpfile=`mktemp -t thrift-pragmas.XXX` +cat >$tmpfile << EOF +#pragma GCC diagnostic ignored "-Wconversion" +#pragma GCC diagnostic ignored "-Wunused" +#pragma GCC diagnostic ignored "-Wreturn-type" +EOF + +cat $1 >>$tmpfile +cat $tmpfile >$1 + +rm $tmpfile diff --git a/sca-cpp/trunk/components/nosqldb/Makefile.am b/sca-cpp/trunk/components/nosqldb/Makefile.am index 6cf829fa7a..03357ccb32 100644 --- a/sca-cpp/trunk/components/nosqldb/Makefile.am +++ b/sca-cpp/trunk/components/nosqldb/Makefile.am @@ -30,12 +30,12 @@ tinycdb.prefix: $(top_builddir)/config.status EXTRA_DIST = nosqldb.composite nosqldb.componentType comp_LTLIBRARIES = libnosqldb.la -noinst_DATA = libnosqldb.so +noinst_DATA = libnosqldb${libsuffix} libnosqldb_la_SOURCES = nosqldb.cpp libnosqldb_la_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb -libnosqldb.so: - ln -s .libs/libnosqldb.so +libnosqldb${libsuffix}: + ln -s .libs/libnosqldb${libsuffix} tinycdb_test_SOURCES = tinycdb-test.cpp tinycdb_test_LDFLAGS = -L${TINYCDB_LIB} -R${TINYCDB_LIB} -lcdb diff --git a/sca-cpp/trunk/components/nosqldb/nosqldb-test b/sca-cpp/trunk/components/nosqldb/nosqldb-test index 30c9f89bc9..3730ed67a4 100755 --- a/sca-cpp/trunk/components/nosqldb/nosqldb-test +++ b/sca-cpp/trunk/components/nosqldb/nosqldb-test @@ -26,4 +26,4 @@ mkdir -p tmp rc=$? # Cleanup -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/nosqldb/server-test b/sca-cpp/trunk/components/nosqldb/server-test index 5a5d792a32..39b76b1fcd 100755 --- a/sca-cpp/trunk/components/nosqldb/server-test +++ b/sca-cpp/trunk/components/nosqldb/server-test @@ -31,10 +31,10 @@ EOF sleep 2 # Test -./client-test 2>/dev/null +./client-test #2>/dev/null rc=$? # Cleanup ../../modules/http/httpd-stop tmp sleep 2 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/nosqldb/tinycdb b/sca-cpp/trunk/components/nosqldb/tinycdb index 68459d7622..3e5c23957f 100755 --- a/sca-cpp/trunk/components/nosqldb/tinycdb +++ b/sca-cpp/trunk/components/nosqldb/tinycdb @@ -17,7 +17,7 @@ # specific language governing permissions and limitations # under the License. -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` tinycdb_prefix=`cat $here/tinycdb.prefix` $tinycdb_prefix/bin/cdb $* diff --git a/sca-cpp/trunk/components/queue/Makefile.am b/sca-cpp/trunk/components/queue/Makefile.am index f527488a3b..c44722a523 100644 --- a/sca-cpp/trunk/components/queue/Makefile.am +++ b/sca-cpp/trunk/components/queue/Makefile.am @@ -32,17 +32,17 @@ qpidc.prefix: $(top_builddir)/config.status EXTRA_DIST = queue.composite queue-sender.componentType queue-listener.componentType *.scm comp_LTLIBRARIES = libqueue-sender.la libqueue-listener.la -noinst_DATA = libqueue-sender.so libqueue-listener.so +noinst_DATA = libqueue-sender${libsuffix} libqueue-listener${libsuffix} libqueue_sender_la_SOURCES = queue-sender.cpp libqueue_sender_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon -libqueue-sender.so: - ln -s .libs/libqueue-sender.so +libqueue-sender${libsuffix}: + ln -s .libs/libqueue-sender${libsuffix} libqueue_listener_la_SOURCES = queue-listener.cpp libqueue_listener_la_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon -libqueue-listener.so: - ln -s .libs/libqueue-listener.so +libqueue-listener${libsuffix}: + ln -s .libs/libqueue-listener${libsuffix} qpid_test_SOURCES = qpid-test.cpp qpid_test_LDFLAGS = -L${QPIDC_LIB} -R${QPIDC_LIB} -lqpidclient -lqpidcommon diff --git a/sca-cpp/trunk/components/queue/qpidd-start b/sca-cpp/trunk/components/queue/qpidd-start index 02e048c41e..a65065182c 100755 --- a/sca-cpp/trunk/components/queue/qpidd-start +++ b/sca-cpp/trunk/components/queue/qpidd-start @@ -18,7 +18,7 @@ # under the License. # Start qpidd -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` qpid_prefix=`cat $here/qpidc.prefix` $qpid_prefix/sbin/qpidd & diff --git a/sca-cpp/trunk/components/queue/qpidd-stop b/sca-cpp/trunk/components/queue/qpidd-stop index 3baf2fee27..bb43d8aaba 100755 --- a/sca-cpp/trunk/components/queue/qpidd-stop +++ b/sca-cpp/trunk/components/queue/qpidd-stop @@ -18,7 +18,7 @@ # under the License. # Stop qpidd -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` qpid_prefix=`cat $here/qpidc.prefix` qpidd="$qpid_prefix/sbin/qpidd" diff --git a/sca-cpp/trunk/components/queue/send-test b/sca-cpp/trunk/components/queue/send-test index ec6d9d9083..f2cc53d851 100755 --- a/sca-cpp/trunk/components/queue/send-test +++ b/sca-cpp/trunk/components/queue/send-test @@ -28,4 +28,4 @@ rc=$? # Cleanup ./qpidd-stop sleep 1 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/queue/server-test b/sca-cpp/trunk/components/queue/server-test index 571b09082c..1e575c6193 100755 --- a/sca-cpp/trunk/components/queue/server-test +++ b/sca-cpp/trunk/components/queue/server-test @@ -40,4 +40,4 @@ rc=$? sleep 1 ./qpidd-stop sleep 1 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/sqldb/Makefile.am b/sca-cpp/trunk/components/sqldb/Makefile.am index 4cd27e967c..faa10ec00b 100644 --- a/sca-cpp/trunk/components/sqldb/Makefile.am +++ b/sca-cpp/trunk/components/sqldb/Makefile.am @@ -32,12 +32,12 @@ pgsql.prefix: $(top_builddir)/config.status EXTRA_DIST = sqldb.composite sqldb.componentType comp_LTLIBRARIES = libsqldb.la -noinst_DATA = libsqldb.so +noinst_DATA = libsqldb${libsuffix} libsqldb_la_SOURCES = sqldb.cpp libsqldb_la_LDFLAGS = -L${PGSQL_LIB} -R${PGSQL_LIB} -lpq -libsqldb.so: - ln -s .libs/libsqldb.so +libsqldb${libsuffix}: + ln -s .libs/libsqldb${libsuffix} pgsql_test_SOURCES = pgsql-test.cpp pgsql_test_LDFLAGS = -L${PGSQL_LIB} -R${PGSQL_LIB} -lpq diff --git a/sca-cpp/trunk/components/sqldb/pgsql b/sca-cpp/trunk/components/sqldb/pgsql index dab30e642b..23b78b90ec 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql +++ b/sca-cpp/trunk/components/sqldb/pgsql @@ -18,7 +18,7 @@ # under the License. # Run SQL command -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` pgsql_prefix=`cat $here/pgsql.prefix` if [ "$2" = "" ]; then diff --git a/sca-cpp/trunk/components/sqldb/pgsql-backup b/sca-cpp/trunk/components/sqldb/pgsql-backup index fad59236bf..0c2a1289a3 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-backup +++ b/sca-cpp/trunk/components/sqldb/pgsql-backup @@ -18,8 +18,8 @@ # under the License. # Backup postgresql data directory -here=`readlink -f $0`; here=`dirname $here` -root=`readlink -f $1` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` +root=`echo "import os; print os.path.realpath('$1')" | python` if [ "$2" = "" ]; then host="localhost" diff --git a/sca-cpp/trunk/components/sqldb/pgsql-conf b/sca-cpp/trunk/components/sqldb/pgsql-conf index f5cc2d23e3..f0ea218b25 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-conf @@ -18,9 +18,9 @@ # under the License. # Configure a postgresql master server -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` mkdir -p $1 -root=`readlink -f $1` +root=`echo "import os; print os.path.realpath('$1')" | python` addr=$2 if [ "$addr" = "" ]; then diff --git a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf index cbfd90b48c..5fcb7128f2 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-standby-conf +++ b/sca-cpp/trunk/components/sqldb/pgsql-standby-conf @@ -18,9 +18,9 @@ # under the License. # Configure a postgresql hot standby server -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` mkdir -p $1 -root=`readlink -f $1` +root=`echo "import os; print os.path.realpath('$1')" | python` # Server address addr=$2 diff --git a/sca-cpp/trunk/components/sqldb/pgsql-start b/sca-cpp/trunk/components/sqldb/pgsql-start index 3f03d0b4dc..ac35e80bf1 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-start +++ b/sca-cpp/trunk/components/sqldb/pgsql-start @@ -18,8 +18,8 @@ # under the License. # Start postgresql -here=`readlink -f $0`; here=`dirname $here` -root=`readlink -f $1` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` +root=`echo "import os; print os.path.realpath('$1')" | python` pgsql_prefix=`cat $here/pgsql.prefix` mkdir -p $root/sqldb diff --git a/sca-cpp/trunk/components/sqldb/pgsql-stop b/sca-cpp/trunk/components/sqldb/pgsql-stop index eefade47d2..e226b35d0d 100755 --- a/sca-cpp/trunk/components/sqldb/pgsql-stop +++ b/sca-cpp/trunk/components/sqldb/pgsql-stop @@ -18,8 +18,8 @@ # under the License. # Stop postgresql -here=`readlink -f $0`; here=`dirname $here` -root=`readlink -f $1` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` +root=`echo "import os; print os.path.realpath('$1')" | python` pgsql_prefix=`cat $here/pgsql.prefix` mkdir -p $root/logs diff --git a/sca-cpp/trunk/components/sqldb/server-test b/sca-cpp/trunk/components/sqldb/server-test index c07d3b0510..66f3eff0ed 100755 --- a/sca-cpp/trunk/components/sqldb/server-test +++ b/sca-cpp/trunk/components/sqldb/server-test @@ -41,4 +41,4 @@ rc=$? # Cleanup ../../modules/http/httpd-stop tmp ./pgsql-stop tmp -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/sqldb/sqldb-test b/sca-cpp/trunk/components/sqldb/sqldb-test index e910ae0059..bbbbd4d373 100755 --- a/sca-cpp/trunk/components/sqldb/sqldb-test +++ b/sca-cpp/trunk/components/sqldb/sqldb-test @@ -29,4 +29,4 @@ rc=$? # Cleanup ./pgsql-stop tmp -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/sqldb/standby-test b/sca-cpp/trunk/components/sqldb/standby-test index 9e56bfc039..89bf8242da 100755 --- a/sca-cpp/trunk/components/sqldb/standby-test +++ b/sca-cpp/trunk/components/sqldb/standby-test @@ -36,4 +36,4 @@ rc=$? ../../modules/http/httpd-stop tmp/master ./pgsql-stop tmp/standby ./pgsql-stop tmp/master -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/webservice/Makefile.am b/sca-cpp/trunk/components/webservice/Makefile.am index 19156e3fdd..242b97dce8 100644 --- a/sca-cpp/trunk/components/webservice/Makefile.am +++ b/sca-cpp/trunk/components/webservice/Makefile.am @@ -33,27 +33,27 @@ axis2c.prefix: $(top_builddir)/config.status echo ${AXIS2C_PREFIX} >axis2c.prefix comp_LTLIBRARIES = libwebservice-client.la libwebservice-listener.la libaxis2-dispatcher.la libaxis2-service.la -noinst_DATA = libwebservice-client.so libwebservice-listener.so libaxis2-dispatcher.so libaxis2-service.so +noinst_DATA = libwebservice-client${libsuffix} libwebservice-listener${libsuffix} libaxis2-dispatcher${libsuffix} libaxis2-service${libsuffix} libwebservice_client_la_SOURCES = webservice-client.cpp libwebservice_client_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil -libwebservice-client.so: - ln -s .libs/libwebservice-client.so +libwebservice-client${libsuffix}: + ln -s .libs/libwebservice-client${libsuffix} libwebservice_listener_la_SOURCES = webservice-listener.cpp libwebservice_listener_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil -libwebservice-listener.so: - ln -s .libs/libwebservice-listener.so +libwebservice-listener${libsuffix}: + ln -s .libs/libwebservice-listener${libsuffix} libaxis2_dispatcher_la_SOURCES = axis2-dispatcher.cpp libaxis2_dispatcher_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil -libaxis2-dispatcher.so: - ln -s .libs/libaxis2-dispatcher.so +libaxis2-dispatcher${libsuffix}: + ln -s .libs/libaxis2-dispatcher${libsuffix} libaxis2_service_la_SOURCES = axis2-service.cpp libaxis2_service_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil -libaxis2-service.so: - ln -s .libs/libaxis2-service.so +libaxis2-service${libsuffix}: + ln -s .libs/libaxis2-service${libsuffix} axiom_test_SOURCES = axiom-test.cpp axiom_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil diff --git a/sca-cpp/trunk/components/webservice/axis2-conf b/sca-cpp/trunk/components/webservice/axis2-conf index af5d189b24..c302737ae9 100755 --- a/sca-cpp/trunk/components/webservice/axis2-conf +++ b/sca-cpp/trunk/components/webservice/axis2-conf @@ -18,9 +18,9 @@ # under the License. # Generate an Axis2 server conf -here=`readlink -f $0`; here=`dirname $here` +here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here` mkdir -p $1 -root=`readlink -f $1` +root=`echo "import os; print os.path.realpath('$1')" | python` axis2_prefix=`cat axis2c.prefix` # Create an Axis2 home directory diff --git a/sca-cpp/trunk/components/webservice/echo-test b/sca-cpp/trunk/components/webservice/echo-test index e5cd1d9a9d..1056a6c668 100755 --- a/sca-cpp/trunk/components/webservice/echo-test +++ b/sca-cpp/trunk/components/webservice/echo-test @@ -34,4 +34,4 @@ rc=$? # Cleanup kill `ps -f | grep -v grep | grep "$axis2" | awk '{ print $2 }'` sleep 1 -return $rc +exit $rc diff --git a/sca-cpp/trunk/components/webservice/server-test b/sca-cpp/trunk/components/webservice/server-test index 34fdb7266a..6d3cd7f7fd 100755 --- a/sca-cpp/trunk/components/webservice/server-test +++ b/sca-cpp/trunk/components/webservice/server-test @@ -46,4 +46,4 @@ rc=$? kill `ps -f | grep -v grep | grep "${axis2}" | awk '{ print $2 }'` ../../modules/http/httpd-stop tmp sleep 2 -return $rc +exit $rc |