Configuration is now easier for building and running examples and tes…

…ts using v8.
swig · Aug 31, 2013 · bad6492 · bad6492
1 parent caa6827
commit bad6492
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 27 deletions.
diff --git a/Examples/Makefile.in b/Examples/Makefile.in
@@ -520,19 +520,8 @@ java_clean:
 # You need to set this variable to the jscore[or other javascript engine] directories containing the
 # files "JavaScript.h" and others
 
-ifeq (,$(V8))
-  JS_INCLUDE = @JSCOREINC@
-  JS_DLNK    = @JSCOREDYNAMICLINKING@
-else
-  JS_INCLUDE = @JSV8INC@
-  JS_DLNK    = @JSV8DYNAMICLINKING@
-endif
-
-ifeq (,$(V8))
-  SWIGJS     = $(SWIG) -javascript -jsc
-else
-  SWIGJS     = $(SWIG) -javascript -v8
-endif
+JS_INCLUDE = @JSCOREINC@ @JSV8INC@
+JS_DLNK    = @JSCOREDYNAMICLINKING@ @JSV8DYNAMICLINKING@
 
 # Extra JAVASCRIPT specific dynamic linking options
 JS_LIBPREFIX = @JSCORELIBRARYPREFIX@
@@ -541,17 +530,40 @@ JSLDSHARED = @JSCORELDSHARED@
 JSCXXSHARED = @JSCORECXXSHARED@
 JSCFLAGS = @JSCORECFLAGS@
 JSCXXFLAGS = @JSCXXFLAGS@
+ROOT_DIR = @ROOT_DIR@
+JSCORE = @JSCORE@
+JSV8 = @JSV8@
+JSDEFAULT = @JSDEFAULT@
 
-JSEXE_SRC_DIR = $(TOP)/../Tools/javascript
+JSEXE_SRC_DIR = $(ROOT_DIR)/Tools/javascript
 JSEXE         = $(JSEXE_SRC_DIR)/javascript
-ifeq (,$(V8))
-  JSEXE_SRC     = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx $(JSEXE_SRC_DIR)/jsc_shell.cxx
+
+ifneq (,$(JSCORE))
+  JSEXE_SRC_JSC = $(JSEXE_SRC_DIR)/jsc_shell.cxx
+  JSEXE_FLAGS_JSC   = -DENABLE_JSC
+endif
+
+ifneq (,$(JSV8))
+  JSEXE_SRC_V8     = $(JSEXE_SRC_DIR)/v8_shell.cxx
+  JSEXE_FLAGS_V8   = -DENABLE_V8
+endif
+
+JSEXE_SRC   = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx $(JSEXE_SRC_JSC) $(JSEXE_SRC_V8)
+JSEXE_FLAGS   = $(JSEXE_FLAGS_JSC) $(JSEXE_FLAGS_V8)
+
+# this controls which engine the code will be generated for
+# and correspondingly the argument for the js interpreter
+ifneq (,$(JSC))
+  SWIGJS     = $(SWIG) -javascript -jsc
   JSEXE_OPTS    = -jsc
-  JSEXE_FLAGS   = -DUSE_JSC
 else
-  JSEXE_SRC     = $(JSEXE_SRC_DIR)/javascript.cxx $(JSEXE_SRC_DIR)/js_shell.cxx $(JSEXE_SRC_DIR)/v8_shell.cxx
+ifneq (,$(V8))
+  SWIGJS     = $(SWIG) -javascript -v8
   JSEXE_OPTS    = -v8
-  JSEXE_FLAGS    = -DUSE_V8
+else
+  SWIGJS     = $(SWIG) -javascript -$(JSDEFAULT)
+  JSEXE_OPTS    = -$(JSDEFAULT)
+endif
 endif
 
 # ----------------------------------------------------------------

diff --git a/configure.in b/configure.in
@@ -1081,12 +1081,13 @@ AC_SUBST(JAVACFLAGS)
 # Look for JAVASCRIPT [JavaScriptCore Headers and Library]
 #----------------------------------------------------------------
 AC_ARG_WITH(javascript, AS_HELP_STRING([--without-javascript], [Disable JAVASCRIPT]), [with_javascript="$withval"], [with_javascript=yes])
+AC_ARG_VAR(JSDEFAULT, "The default engine to use ( v8 | jsc ).")
 
 # First, check for "--without-javascript" or "--with-javascript=no".
 if test x"${with_javascript}" = xno -o x"${with_alllang}" = xno ; then 
-AC_MSG_NOTICE([Disabling Javascript])
-JAVASCRIPT=
-else
+  AC_MSG_NOTICE([Disabling Javascript])
+  JAVASCRIPT=
+fi
 
 ###     JavascriptCore     ###
 
@@ -1120,8 +1121,8 @@ fi
 
 
 # check for JavaScriptCore, Webkit libraries
-AC_ARG_WITH(jscorelib,[  --with-jscorelib =path      Set location of JavaScriptCore (Webkit) library directory],[
-	JSCORELIB="-L$withval"], [JSCORELIB=])
+AC_ARG_WITH(jscorelib,[  --with-jscorelib =path      Set location of JavaScriptCore (Webkit) library directory],
+  [JSCORELIB="-L$withval"], [JSCORELIB=])
 AC_MSG_CHECKING(for JavaScriptCore(Webkit) library)
 
 if test -z "$JSCORELIB"; then
@@ -1149,10 +1150,10 @@ done
 
 if test -z "$JSCORELIB"; then
 	AC_MSG_RESULT(not found)
-fi
-
+	JSCORE=
 else
-AC_MSG_RESULT($JSCORELIB)
+	AC_MSG_RESULT($JSCORELIB)
+	JSCORE=1
 fi
 
 # linking options
@@ -1202,6 +1203,7 @@ case $host in
 esac
 fi
 
+AC_SUBST(JSCORE)
 AC_SUBST(JSCOREINC)
 AC_SUBST(JSCOREDYNAMICLINKING)
 AC_SUBST(JSCORELIBRARYPREFIX)
@@ -1237,6 +1239,9 @@ done
 
 if test "$JSV8INC" = "" ; then
   AC_MSG_RESULT(not found)
+  JSV8=
+else
+  JSV8=1
 fi
 
 
@@ -1274,6 +1279,7 @@ esac
 
 AC_SUBST(JSV8INC)
 AC_SUBST(JSV8DYNAMICLINKING)
+AC_SUBST(JSDEFAULT)
 
 #----------------------------------------------------------------
 # Look for gcj