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

more places to remove mruby

This commit is contained in:
Willi Goesgens 2015-03-23 19:05:29 +01:00
parent c4ecaffbb4
commit 9fbfcf245e
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -145,16 +145,6 @@ endif ()
set(ARANGODB_VERSION "1.x.y-rc1" CACHE path "ArangoDB version") set(ARANGODB_VERSION "1.x.y-rc1" CACHE path "ArangoDB version")
################################################################################
### @brief MRUBY
################################################################################
option(USE_MRUBY "Do you want to use MRUBY" OFF)
if (USE_MRUBY)
add_definitions("-DTRI_ENABLE_MRUBY=1")
endif ()
################################################################################ ################################################################################
### @brief VISTA LOCKS ### @brief VISTA LOCKS
################################################################################ ################################################################################

15
GNUmakefile
View File

@ -111,7 +111,6 @@ pack-dmg-cmake:
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=${LIBEV_VERSION}" \ -D "LIBEV_VERSION=${LIBEV_VERSION}" \
-D "READLINE_VERSION=${READLINE_VERSION}" \ -D "READLINE_VERSION=${READLINE_VERSION}" \
-D "USE_MRUBY=ON" \
-D "V8_VERSION=${V8_VERSION}" \ -D "V8_VERSION=${V8_VERSION}" \
-D "ZLIB_VERSION=${ZLIB_VERSION}" \ -D "ZLIB_VERSION=${ZLIB_VERSION}" \
.. ..
@ -119,7 +118,6 @@ pack-dmg-cmake:
${MAKE} .libev-build-64 ${MAKE} .libev-build-64
${MAKE} .zlib-build-64 ${MAKE} .zlib-build-64
${MAKE} .v8-build-64 ${MAKE} .v8-build-64
${MAKE} .mruby-build-64
${MAKE} ${BUILT_SOURCES} ${MAKE} ${BUILT_SOURCES}
@ -144,8 +142,7 @@ pack-macosx:
rm -rf Build && mkdir Build rm -rf Build && mkdir Build
./configure \ ./configure \
--prefix=/opt/arangodb \ --prefix=/opt/arangodb
--enable-mruby
${MAKE} pack-macosx-cmake ${MAKE} pack-macosx-cmake
@ -159,7 +156,6 @@ pack-macosx-cmake:
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=${LIBEV_VERSION}" \ -D "LIBEV_VERSION=${LIBEV_VERSION}" \
-D "READLINE_VERSION=${READLINE_VERSION}" \ -D "READLINE_VERSION=${READLINE_VERSION}" \
-D "USE_MRUBY=ON" \
-D "V8_VERSION=${V8_VERSION}" \ -D "V8_VERSION=${V8_VERSION}" \
-D "ZLIB_VERSION=${ZLIB_VERSION}" \ -D "ZLIB_VERSION=${ZLIB_VERSION}" \
.. ..
@ -167,7 +163,6 @@ pack-macosx-cmake:
${MAKE} .libev-build-64 ${MAKE} .libev-build-64
${MAKE} .zlib-build-64 ${MAKE} .zlib-build-64
${MAKE} .v8-build-64 ${MAKE} .v8-build-64
${MAKE} .mruby-build-64
${MAKE} ${BUILT_SOURCES} ${MAKE} ${BUILT_SOURCES}
@ -189,8 +184,7 @@ pack-arm:
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var
--disable-mruby
touch .libev-build-32 touch .libev-build-32
touch .v8-build-32 touch .v8-build-32
@ -211,7 +205,6 @@ pack-arm-cmake:
-D "ETCDIR=${sysconfdir}" \ -D "ETCDIR=${sysconfdir}" \
-D "LIBEV_VERSION=${LIBEV_VERSION}" \ -D "LIBEV_VERSION=${LIBEV_VERSION}" \
-D "READLINE_VERSION=${READLINE_VERSION}" \ -D "READLINE_VERSION=${READLINE_VERSION}" \
-D "USE_MRUBY=OFF" \
-D "V8_VERSION=${V8_VERSION}" \ -D "V8_VERSION=${V8_VERSION}" \
-D "VARDIR=${localstatedir}" \ -D "VARDIR=${localstatedir}" \
-D "ZLIB_VERSION=${ZLIB_VERSION}" \ -D "ZLIB_VERSION=${ZLIB_VERSION}" \
@ -269,7 +262,6 @@ winXX-cmake: checkcmake
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=4.11" \ -D "LIBEV_VERSION=4.11" \
-D "USE_MRUBY=OFF" \
-D "V8_VERSION=3.31.74.1" \ -D "V8_VERSION=3.31.74.1" \
-D "ZLIB_VERSION=1.2.7" \ -D "ZLIB_VERSION=1.2.7" \
$(MOREOPTS) \ $(MOREOPTS) \
@ -300,8 +292,7 @@ pack-tar-config:
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var
--disable-mruby
pack-tar: pack-tar:
rm -rf /tmp/pack-arangodb rm -rf /tmp/pack-arangodb