Rename some of the utility programs and add them to the install target.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1291135 13f79535-47bb-0310-9956-ffa450edef68

sca-cpp/trunk/.gitignore

@@ -108,8 +108,8 @@ parallel-test
 xml-test
 xsd-test
 atom-test
-eval-test
-eval-shell
+scheme-test
+scheme-shell
 json-test
 client-test
 memcache-test
@@ -133,7 +133,7 @@ curl-connect
 rss-test
 scribe-cat
 js-test
-js-eval
+js-shell
 file-test
 test-start*
 test-stop*
@@ -143,6 +143,8 @@ json-value
 value-json
 element-value
 value-element
+hosting/server/nuvem
+hosting/server/lib
 hosting/server/data/apps/*/nuvem
 hosting/server/data/apps/*/lib
 chat-send

sca-cpp/trunk/modules/java/Makefile.am

@@ -63,7 +63,8 @@ client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
 dist_noinst_SCRIPTS = server-test wiring-test
-noinst_PROGRAMS = jni-test java-test java-shell client-test
+noinst_PROGRAMS = jni-test java-test client-test
+mod_PROGRAMS = java-shell
 TESTS = jni-test java-test server-test
 
 endif

sca-cpp/trunk/modules/js/Makefile.am

@@ -37,9 +37,10 @@ EXTRA_DIST = htdocs/*.js htdocs/*.css htdocs/all.js
 js_test_SOURCES = js-test.cpp
 js_test_LDFLAGS = -lmozjs 
 
-js_eval_SOURCES = js-eval.cpp
-js_eval_LDFLAGS = -lmozjs 
+js_shell_SOURCES = js-shell.cpp
+js_shell_LDFLAGS = -lmozjs 
 
-noinst_PROGRAMS = js-test js-eval
+noinst_PROGRAMS = js-test
+mod_PROGRAMS = js-shell
 dist_noinst_SCRIPTS = util-test
 TESTS = js-test util-test

sca-cpp/trunk/modules/js/util-test

@@ -21,7 +21,7 @@
 here=`echo "import os; print os.path.realpath('$0')" | python`; here=`dirname $here`
 
 echo "Testing..."
-cat htdocs/util.js htdocs/elemutil.js htdocs/jsonutil.js json-test.js | ./js-eval 2>/dev/null 1>&2
+cat htdocs/util.js htdocs/elemutil.js htdocs/jsonutil.js json-test.js | ./js-shell 2>/dev/null 1>&2
 rc=$?
 if [ "$rc" = "0" ]; then
     echo "OK"

sca-cpp/trunk/modules/opencl/Makefile.am

@@ -51,7 +51,8 @@ client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
 dist_noinst_SCRIPTS = server-test
-noinst_PROGRAMS = opencl-test opencl-shell client-test
+noinst_PROGRAMS = opencl-test client-test
+mod_PROGRAMS = opencl-shell
 TESTS = opencl-test
 
 endif

sca-cpp/trunk/modules/python/Makefile.am

@@ -50,7 +50,8 @@ client_test_SOURCES = client-test.cpp
 client_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
 dist_noinst_SCRIPTS = server-test wiring-test
-noinst_PROGRAMS = python-test python-shell client-test
+noinst_PROGRAMS = python-test client-test
+mod_PROGRAMS = python-shell
 TESTS = python-test server-test
 
 endif

sca-cpp/trunk/modules/scheme/Makefile.am

@@ -18,9 +18,11 @@
 incl_HEADERS = *.hpp
 incldir = $(prefix)/include/modules/scheme
 
-eval_test_SOURCES = eval-test.cpp
+moddir = $(prefix)/modules/scheme
 
-eval_shell_SOURCES = eval-shell.cpp
+scheme_test_SOURCES = scheme-test.cpp
+
+scheme_shell_SOURCES = scheme-shell.cpp
 
 value_element_SOURCES = value-element.cpp
 value_element_LDFLAGS = 
@@ -40,5 +42,6 @@ json_value_LDFLAGS = -lmozjs
 value_json_SOURCES = value-json.cpp
 value_json_LDFLAGS = -lmozjs 
 
-noinst_PROGRAMS = eval-test eval-shell element-value value-element xml-value value-xml json-value value-json
-TESTS = eval-test
+noinst_PROGRAMS = scheme-test
+mod_PROGRAMS = scheme-shell element-value value-element xml-value value-xml json-value value-json
+TESTS = scheme-test