Add 'version' target for javascript.

This commit is contained in:
Oliver Buchtala 2014-03-06 06:29:00 +01:00
commit 57491eaa81
2 changed files with 40 additions and 13 deletions

View file

@ -656,7 +656,40 @@ javascript_run: javascript_custom_interpreter
# TODO: make node configurable and detected via ./configure
javascript_run_node:
node runme.js
@NODEJS@ runme.js
# -----------------------------------------------------------------
# Version display
# -----------------------------------------------------------------
ifeq (, $(ENGINE))
javascript_version:
@ if [ "@NODEJS@" != "" ]; then \
echo "Node.js: `(@NODEJS@ --version)`"; \
else \
echo "Version depends on the interpreter"; \
fi
endif
ifeq (node, $(ENGINE))
javascript_version:
@NODEJS@ --version
endif
ifeq (jsc, $(ENGINE))
javascript_version:
@ if [ "@JSCOREVERSION@" != "" ]; then \
echo "@JSCOREVERSION@"; \
else \
echo "Unknown JavascriptCore version."; \
fi
endif
ifeq (v8, $(ENGINE))
javascript_version:
echo "Unknown v8 version."
endif
# -----------------------------------------------------------------
# Cleaning the javascript examples

View file

@ -1145,6 +1145,8 @@ else
AC_MSG_CHECKING(for include file JavaScriptCore/JavaScript.h)
AC_ARG_WITH(jscoreinc, [ --with-jscinc=path Set location of Javascript include directory], [JSCOREINCDIR="$withval"], [JSCOREINCDIR=])
JSCOREVERSION=
if test -z "$JSCOREINCDIR"; then
JSCOREINCDIR="/usr/include/ /usr/local/include/"
@ -1187,18 +1189,7 @@ else
if test -r $i/libjavascriptcoregtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -ljavascriptcoregtk-1.0"
break
fi
if test -r $i/libwebkitgtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkitgtk-1.0"
break
fi
if test -r $i/libwebkit-1.0.la; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkit-1.0"
JSCOREVERSION=`pkg-config --modversion javascriptcoregtk-1.0`
break
fi
done
@ -1306,12 +1297,15 @@ AC_SUBST(JSINTERPRETERLINKFLAGS)
AC_SUBST(JSCOREINC)
AC_SUBST(JSCOREDYNAMICLINKING)
AC_SUBST(JSCOREVERSION)
AC_SUBST(JSV8INC)
AC_SUBST(JSV8DYNAMICLINKING)
AC_SUBST(JSCENABLED)
AC_SUBST(JSV8ENABLED)
AC_SUBST(NODEJS)
#----------------------------------------------------------------
# Look for gcj
#----------------------------------------------------------------