Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-12-16 17:30:56 +01:00
parent 50e08ab099 e24ad86ba0
commit b84d513b6b
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/apps/system/aardvark/frontend/js/views/applicationsView.js
View File

@ -12,6 +12,7 @@
return s.charAt(0).toUpperCase() + s.slice(1).toLowerCase();
}).join(" ");
};
var errors = require("internal").errors;
window.ApplicationsView = Backbone.View.extend({
el: '#content',
@ -444,8 +445,8 @@
this.showConfigureDialog(result.configuration, result.name, result.version);
} else {
switch(result.errorNum) {
case 1752:
alert("Unable to download application from the given repository");
case errors.ERROR_APPLICATION_DOWNLOAD_FAILED.code:
alert("Unable to download application from the given repository.");
break;
default:
alert("Error: " + result.errorNum + ". " + result.errorMessage);

8
m4/all-in-one.icu
View File

@ -4,15 +4,15 @@ dnl ----------------------------------------------------------------------------
dnl --SECTION-- V8
dnl ----------------------------------------------------------------------------
icu_build_dir="${srcdir}/3rdParty/V8/third_party/icu/"
icu_build_dir="${V8_DIR}/third_party/icu"
if test "x$tr_DARWIN" = xyes; then
icu_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET/"
icu_lib_dir="${V8_DIR}/out/$V8_TARGET"
else
icu_lib_dir="${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/third_party/icu/"
icu_lib_dir="${V8_DIR}/out/$V8_TARGET/obj.target/third_party/icu"
fi
ICU_CPPFLAGS="-D_REENTRANT -I${srcdir}/3rdParty/V8/third_party/icu/source/common -I${srcdir}/3rdParty/V8/third_party/icu/source/i18n/ -I${srcdir}/3rdParty/V8/third_party/icu/source/io/"
ICU_CPPFLAGS="-D_REENTRANT -I${V8_DIR}/third_party/icu/source/common -I${V8_DIR}/third_party/icu/source/i18n/ -I${V8_DIR}/third_party/icu/source/io/"
ICU_LDFLAGS=""
ICU_LIBS=" -ldl -lm ${icu_lib_dir}/libicui18n.a \
${icu_lib_dir}/libicuuc.a \

27
m4/all-in-one.v8
View File

@ -7,11 +7,22 @@ dnl ----------------------------------------------------------------------------
V8_CPPFLAGS="-I${srcdir}/3rdParty/V8/include"
V8_LDFLAGS=""
V8_TARGET="native"
local_v8=1
V8_DIR="${srcdir}/3rdParty/V8"
AC_ARG_WITH(v8,
AS_HELP_STRING([--with-v8=DIR], [where the v8 library and includes are located]),
[
V8_DIR="$withval"
local_v8=0
]
)
V8_OUTPUT=""
if test x$tr_ARM == xyes; then
V8_TARGET="arm.release"
V8_OUTPUT=${V8_DIR}/out/$V8_TARGET/obj.target/tools/gyp
V8_LIBS="${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_libbase.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_libplatform.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_nosnapshot.a"
elif test x$tr_DARWIN == xyes; then
if test "x$tr_BITS" == x64; then
V8_TARGET="x64.release"
@ -19,7 +30,8 @@ elif test x$tr_DARWIN == xyes; then
V8_TARGET="ia32.release"
fi
V8_LIBS="${srcdir}/3rdParty/V8/out/$V8_TARGET/libv8_base.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/libv8_libbase.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/libv8_libplatform.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/libv8_nosnapshot.a"
V8_OUTPUT=${V8_DIR}/out/$V8_TARGET
else
if test "x$tr_BITS" == x64; then
V8_TARGET="x64.release"
@ -27,15 +39,23 @@ else
V8_TARGET="ia32.release"
fi
V8_LIBS="${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_base.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_libbase.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_libplatform.a ${srcdir}/3rdParty/V8/out/$V8_TARGET/obj.target/tools/gyp/libv8_nosnapshot.a"
V8_OUTPUT=${V8_DIR}/out/$V8_TARGET/obj.target/tools/gyp
fi
V8_LIBS="${V8_OUTPUT}/libv8_base.a ${V8_OUTPUT}/libv8_libbase.a ${V8_OUTPUT}/libv8_libplatform.a ${V8_OUTPUT}/libv8_nosnapshot.a"
TRI_V8_VERSION="3.29.59"
if test "x$tr_FREEBSD" == xyes; then
V8_LIBS="$V8_LIBS -lexecinfo"
fi
if test $local_v8 -eq "0"; then
touch ${srcdir}/.v8-build-${TRI_BITS}
fi
dnl ----------------------------------------------------------------------------
dnl add substitutions
dnl ----------------------------------------------------------------------------
@ -44,6 +64,7 @@ AC_SUBST(V8_CPPFLAGS)
AC_SUBST(V8_LDFLAGS)
AC_SUBST(V8_LIBS)
AC_SUBST(V8_TARGET)
AC_SUBST(V8_DIR)
V8_CPPFLAGS="${V8_CPPFLAGS} -DTRI_V8_VERSION='\"${TRI_V8_VERSION}\"'"

2
m4/external.v8
View File

@ -13,6 +13,8 @@ AC_ARG_WITH(v8,
[V8_CPPFLAGS="-I$withval/include"
V8_LDFLAGS="-L$withval/lib"
V8_LIB_PATH="$withval/lib"
V8_DIR="$withval"
local_v8=0
V8="$withval"]
)