jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Detect node-gyp at configure time and show version in javascript_version target

Browse source
This commit is contained in:
William S Fulton 2014-04-19 16:44:21 +01:00
commit efc5af04e0
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Examples/Makefile.in
View file

@ -604,6 +604,8 @@ JSDYNAMICLINKING = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
JSSO =@JSSO@
JSLDSHARED = @JSLDSHARED@
JSCXXSHARED = @JSCXXSHARED@
NODEJS = @NODEJS@
NODEGYP = @NODEGYP@
# ----------------------------------------------------------------
# Creating and building Javascript wrappers
@ -623,9 +625,8 @@ javascript_build_cpp:: $(SRCS)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) $(JSINCLUDES)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(JSDYNAMICLINKING) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
# TODO: make node-gyp configurable and detected via ./configure
javascript_build_node: $(SRCS)
node-gyp --loglevel=silent configure build 1>>/dev/null
$(NODEGYP) --loglevel=silent configure build 1>>/dev/null
# These targets are used by the test-suite:
@ -649,42 +650,35 @@ javascript_custom_interpreter:
javascript_run: javascript_custom_interpreter
$(ROOT_DIR)/Tools/javascript/javascript -$(JSENGINE) -L $(TARGET) runme.js
# TODO: make node configurable and detected via ./configure
javascript_run_node:
@NODEJS@ runme.js
$(NODEJS) runme.js
# -----------------------------------------------------------------
# Version display
# -----------------------------------------------------------------
ifeq (, $(ENGINE))
javascript_version:
@ if [ "@NODEJS@" != "" ]; then \
echo "Node.js: `(@NODEJS@ --version)`"; \
ifeq (, $(ENGINE))
@ if [ "$(NODEJS)" != "" ]; then \
echo "Node.js: `($(NODEJS) --version)`"; \
else \
echo "Version depends on the interpreter"; \
fi
endif
ifeq (node, $(ENGINE))
javascript_version:
@NODEJS@ --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
echo "node-gyp: `($(NODEGYP) --version)`"
# -----------------------------------------------------------------
# Cleaning the javascript examples

3
Examples/test-suite/javascript/Makefile.in
View file

@ -3,6 +3,7 @@
#######################################################################
LANGUAGE = javascript
NODEGYP = @NODEGYP@
SCRIPTSUFFIX = _runme.js
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@ -104,7 +105,7 @@ ifeq (node,$(JSENGINE))
$(SWIG) -c++ -javascript $(SWIGOPT) ../$*.i;
nodejs_swig_and_compile = \
node-gyp --loglevel=silent --directory $* configure build 1>>/dev/null
$(NODEGYP) --loglevel=silent --directory $* configure build 1>>/dev/null
run_testcase = \
if [ -f $(srcdir)/$*$(SCRIPTSUFFIX) ]; then \