summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/js
diff options
context:
space:
mode:
authorjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-02-20 07:20:27 +0000
committerjsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>2012-02-20 07:20:27 +0000
commit3479cfa1585b752df58873b941b5bfd06a879b04 (patch)
tree9a15741102f845b97d9028e5505d0841fb90dd15 /sca-cpp/trunk/modules/js
parent4f245967cb241021844b678e75ff48c6783113d3 (diff)
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
Diffstat (limited to 'sca-cpp/trunk/modules/js')
-rw-r--r--sca-cpp/trunk/modules/js/Makefile.am7
-rw-r--r--sca-cpp/trunk/modules/js/js-shell.cpp (renamed from sca-cpp/trunk/modules/js/js-eval.cpp)0
-rwxr-xr-xsca-cpp/trunk/modules/js/util-test2
3 files changed, 5 insertions, 4 deletions
diff --git a/sca-cpp/trunk/modules/js/Makefile.am b/sca-cpp/trunk/modules/js/Makefile.am
index 5b8e36a5cf..833a764230 100644
--- a/sca-cpp/trunk/modules/js/Makefile.am
+++ b/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
diff --git a/sca-cpp/trunk/modules/js/js-eval.cpp b/sca-cpp/trunk/modules/js/js-shell.cpp
index ee0fa89b31..ee0fa89b31 100644
--- a/sca-cpp/trunk/modules/js/js-eval.cpp
+++ b/sca-cpp/trunk/modules/js/js-shell.cpp
diff --git a/sca-cpp/trunk/modules/js/util-test b/sca-cpp/trunk/modules/js/util-test
index 08407ea2d1..c69f46c67c 100755
--- a/sca-cpp/trunk/modules/js/util-test
+++ b/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"