mirror of https://gitee.com/bigwinds/arangodb
exernal v8
This commit is contained in:
Frank Celler
parent
a525b11f72
commit
e1026f57eb
|
|
@ -28,7 +28,7 @@ install-data-local:
|
|||
################################################################################
|
||||
|
||||
include Makefile.files
|
||||
# include Makefile.generate
|
||||
include Makefile.generate
|
||||
include Makefile.all-in-one
|
||||
|
||||
################################################################################
|
||||
|
|
|
|||
91
Makefile.in
91
Makefile.in
|
|
@ -25,6 +25,11 @@
|
|||
################################################################################
|
||||
################################################################################
|
||||
|
||||
# -*- mode: Makefile; -*-
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
|
||||
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -50,7 +55,7 @@ target_triplet = @target@
|
|||
bin_PROGRAMS = avocado$(EXEEXT)
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.all-in-one \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.files \
|
||||
$(srcdir)/Makefile.in \
|
||||
$(srcdir)/Makefile.generate $(srcdir)/Makefile.in \
|
||||
$(top_srcdir)/BasicsC/local-configuration.h.in \
|
||||
$(top_srcdir)/Doxygen/avocado.doxy.in \
|
||||
$(top_srcdir)/config/config.h.in $(top_srcdir)/configure \
|
||||
|
|
@ -506,10 +511,7 @@ BUILT_SOURCES = js/bootstrap/js-modules.h js/bootstrap/js-print.h \
|
|||
js/server/js-aql.h js/server/js-json.h js/server/js-shell.h \
|
||||
JsonParser/json-parser.c QL/tokens.c V8/v8-json.cpp \
|
||||
JsonParserX/JsonScannerX.cpp QL/parser.c \
|
||||
JsonParserX/JsonParserX.cpp \
|
||||
@top_srcdir@/3rdParty/libev/.libs/libev.a \
|
||||
@top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/obj.target/tools/gyp/libv8_base.a \
|
||||
@top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/obj.target/tools/gyp/libv8_nosnapshot.a
|
||||
JsonParserX/JsonParserX.cpp @LIBEV_LIBS@ $(V8_LIBS)
|
||||
noinst_LIBRARIES = libavocadodb.a
|
||||
nobase_pkgdata_DATA = \
|
||||
$(shell find @srcdir@/js/system -name "*.js" -print) \
|
||||
|
|
@ -804,7 +806,7 @@ all: $(BUILT_SOURCES)
|
|||
.SUFFIXES: .c .cpp .o .obj
|
||||
am--refresh:
|
||||
@:
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.files $(srcdir)/Makefile.all-in-one $(am__configure_deps)
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/Makefile.files $(srcdir)/Makefile.generate $(srcdir)/Makefile.all-in-one $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
|
|
@ -5151,7 +5153,75 @@ Doxygen/xml/d3/d4b/JSModuleInternal.md: Doxygen/xml/d3/d4b/JSModuleInternal.xml
|
|||
Doxygen/xml/d2/d66/JSModuleFs.md: Doxygen/xml/d2/d66/JSModuleFs.xml
|
||||
python @top_srcdir@/Doxygen/Scripts/xml2md.py $< > $@
|
||||
|
||||
@top_srcdir@/3rdParty/libev/.libs/libev.a:
|
||||
.setup-directories:
|
||||
@test -d js || mkdir js
|
||||
@test -d js/bootstrap || mkdir js/bootstrap
|
||||
@test -d js/modules || mkdir js/modules
|
||||
@test -d js/server || mkdir js/server
|
||||
@test -d Doxygen/js || mkdir Doxygen/js
|
||||
@test -d Doxygen/js/bootstrap || mkdir Doxygen/js/bootstrap
|
||||
@test -d Doxygen/js/modules || mkdir Doxygen/js/modules
|
||||
@test -d Doxygen/js/server || mkdir Doxygen/js/server
|
||||
@test -d Doxygen/js/system || mkdir Doxygen/js/system
|
||||
@touch $@
|
||||
|
||||
js/js-%.h: @srcdir@/js/%.js .setup-directories
|
||||
@top_srcdir@/config/js2c.sh $< > $@
|
||||
|
||||
js/bootstrap/js-%.h: @srcdir@/js/bootstrap/%.js .setup-directories
|
||||
@top_srcdir@/config/js2c.sh $< > $@
|
||||
|
||||
js/server/js-%.h: @srcdir@/js/server/%.js .setup-directories
|
||||
@top_srcdir@/config/js2c.sh $< > $@
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
JsonParser/%.c: @srcdir@/JsonParser/%.l
|
||||
@top_srcdir@/config/flex-c.sh $(LEX) $@ $<
|
||||
|
||||
QL/%.c: @srcdir@/QL/%.l
|
||||
@top_srcdir@/config/flex-c.sh $(LEX) $@ $<
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
V8/%.cpp: @srcdir@/V8/%.ll
|
||||
@top_srcdir@/config/flex-c++.sh $(LEX) $@ $<
|
||||
|
||||
JsonParserX/%.cpp: @srcdir@/JsonParserX/%.ll
|
||||
@top_srcdir@/config/flex-c++.sh $(LEX) $@ $<
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
QL/%.c: @srcdir@/QL/%.y
|
||||
@top_srcdir@/config/bison-c.sh $(BISON) $@ $<
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
JsonParserX/%.cpp: @srcdir@/JsonParserX/%.yy
|
||||
@top_srcdir@/config/bison-c++.sh $(BISON) $@ $<
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
.PHONY: Doxygen/js Doxygen/js/system Doxygen/js/modules
|
||||
|
||||
Doxygen/js/%.c: @srcdir@/js/%.js .setup-directories
|
||||
python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@
|
||||
|
||||
Doxygen/js/system/%.c: @srcdir@/js/system/%.js .setup-directories
|
||||
python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@
|
||||
|
||||
Doxygen/js/modules/%.c: @srcdir@/js/system/%.js .setup-directories
|
||||
python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@
|
||||
|
||||
Doxygen/js/bootstrap/%.c: @srcdir@/js/bootstrap/%.js .setup-directories
|
||||
python @top_srcdir@/Doxygen/Scripts/js2doxy.py $< > $@
|
||||
|
||||
@LIBEV_LIBS@:
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING LIBEV"
|
||||
|
|
@ -5167,14 +5237,15 @@ Doxygen/xml/d2/d66/JSModuleFs.md: Doxygen/xml/d2/d66/JSModuleFs.xml
|
|||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
@top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/obj.target/tools/gyp/libv8_base.a @top_srcdir@/3rdParty/V8/out/$(V8_BUILD_VERSION)/obj.target/tools/gyp/libv8_nosnapshot.a:
|
||||
$(V8_LIBS):
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo "BUILDING V8"
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
@echo
|
||||
|
||||
cd @top_srcdir@/3rdParty/V8 && make library=static standalone=off $(V8_BUILD_VERSION)
|
||||
@ENABLE_DARWIN_TRUE@ cd @top_srcdir@/3rdParty/V8 && scons snapshot=off library=static mode=release arch=x64
|
||||
@ENABLE_DARWIN_FALSE@ cd @top_srcdir@/3rdParty/V8 && make library=static snapshot=off $(V8_BUILD_VERSION)
|
||||
|
||||
@echo
|
||||
@echo "--------------------------------------------------------------------------------"
|
||||
|
|
@ -5185,8 +5256,6 @@ Doxygen/xml/d2/d66/JSModuleFs.md: Doxygen/xml/d2/d66/JSModuleFs.xml
|
|||
################################################################################
|
||||
################################################################################
|
||||
|
||||
# include Makefile.generate
|
||||
|
||||
################################################################################
|
||||
################################################################################
|
||||
|
||||
|
|
|
|||
|
|
@ -707,6 +707,8 @@ am__isrc
|
|||
INSTALL_DATA
|
||||
INSTALL_SCRIPT
|
||||
INSTALL_PROGRAM
|
||||
ENABLE_DARWIN_FALSE
|
||||
ENABLE_DARWIN_TRUE
|
||||
target_os
|
||||
target_vendor
|
||||
target_cpu
|
||||
|
|
@ -2589,6 +2591,23 @@ test -n "$target_alias" &&
|
|||
NONENONEs,x,x, &&
|
||||
program_prefix=${target_alias}-
|
||||
|
||||
tr_DARWIN="no"
|
||||
|
||||
case $target in
|
||||
*-apple-darwin*)
|
||||
tr_DARWIN="yes"
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "x$tr_DARWIN" = xyes; then
|
||||
ENABLE_DARWIN_TRUE=
|
||||
ENABLE_DARWIN_FALSE='#'
|
||||
else
|
||||
ENABLE_DARWIN_TRUE='#'
|
||||
ENABLE_DARWIN_FALSE=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
am__api_version='1.11'
|
||||
|
||||
|
|
@ -5384,7 +5403,7 @@ case $target_cpu in
|
|||
;;
|
||||
esac
|
||||
|
||||
if text "x$tr_BITS" == "x64"; then
|
||||
if test "x$tr_BITS" == "x64"; then
|
||||
# Check whether --enable-32bit was given.
|
||||
if test "${enable_32bit+set}" = set; then :
|
||||
enableval=$enable_32bit; tr_32BIT="$enableval"
|
||||
|
|
@ -5419,7 +5438,7 @@ fi
|
|||
|
||||
|
||||
|
||||
if text "x$tr_BITS" == "x64"; then
|
||||
if test "x$tr_BITS" == "x64"; then
|
||||
if test "x$tr_32BIT" = xyes; then
|
||||
BASIC_INFO="$BASIC_INFO|32bit: enabled"
|
||||
else
|
||||
|
|
@ -5430,6 +5449,7 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-logger was given.
|
||||
if test "${enable_logger+set}" = set; then :
|
||||
enableval=$enable_logger; tr_LOGGER="$enableval"
|
||||
|
|
@ -6327,7 +6347,16 @@ FLAG_INFO="$FLAG_INFO|."
|
|||
|
||||
V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
|
||||
V8_LDFLAGS=""
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_nosnapshot.a"
|
||||
|
||||
if test "x$tr_DARWIN" == xyes; then
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/libv8.a"
|
||||
else
|
||||
if test "x$tr_BITS" == x64; then
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_nosnapshot.a"
|
||||
else
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_nosnapshot.a"
|
||||
fi
|
||||
fi
|
||||
|
||||
TRI_V8_VERSION="3.9.4.0"
|
||||
|
||||
|
|
@ -7924,6 +7953,10 @@ LIBOBJS=$ac_libobjs
|
|||
LTLIBOBJS=$ac_ltlibobjs
|
||||
|
||||
|
||||
if test -z "${ENABLE_DARWIN_TRUE}" && test -z "${ENABLE_DARWIN_FALSE}"; then
|
||||
as_fn_error $? "conditional \"ENABLE_DARWIN\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -n "$EXEEXT"; then
|
||||
am__EXEEXT_TRUE=
|
||||
am__EXEEXT_FALSE='#'
|
||||
|
|
|
|||
|
|
@ -11,9 +11,9 @@ if test "x$tr_DARWIN" == xyes; then
|
|||
V8_LIBS="${srcdir}/3rdParty/V8/libv8.a"
|
||||
else
|
||||
if test "x$tr_BITS" == x64; then
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/libv8_nosnapshot.a"
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/x64.release/obj.target/tools/gyp/libv8_nosnapshot.a"
|
||||
else
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/libv8_nosnapshot.a"
|
||||
V8_LIBS="${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/ia32.release/obj.target/tools/gyp/libv8_nosnapshot.a"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue