-
Notifications
You must be signed in to change notification settings - Fork 835
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts: arangod/RestServer/ArangoServer.cpp arangosh/V8Client/arangosh.cpp
- Loading branch information
Showing
715 changed files
with
14,708 additions
and
20,942 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # no installation... | ||
|
|
||
| script: "make all test" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| # CMake build system for mruby | ||
| # License: released under the same license as mruby | ||
| # Author: jonforums@gmail.com | ||
| # Author: beoran@gmail.com | ||
| # | ||
| # Usage example: | ||
| # 1. Ensure CMake, Bison, and a build toolchain are on `PATH` | ||
| # 2. Change to a build directory outside source tree, eg - `build` subdir | ||
| # 3. Create build Makefiles or project files. | ||
| # `cmake ..` (UNIX-like system) | ||
| # `cmake -G "MSYS Makefiles" ..` | ||
| # `cmake -G "Visual Studio 10" ..` | ||
| # `cmake -G "NMake Makefiles" ..` | ||
| # ** to cross-compile: add -DCMAKE_TOOLCHAIN_FILE=/path/to/toolchain/file | ||
| # ** to set install dir: add -DCMAKE_INSTALL_PREFIX=/path/to/installdir | ||
| # 4a. Build: `make` (to make noisy, add `VERBOSE=1`) | ||
| # 4b. Build and test: `make all test` | ||
| # 4c. Build, test, and install: `make all test install` | ||
| # 4d. Build, test, and package: `make all test package` | ||
|
|
||
| cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) | ||
|
|
||
| # Default build mode is Release With Debug Info unless specified | ||
| if(NOT CMAKE_BUILD_TYPE) | ||
| set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING | ||
| "Choose build type: empty Debug Release RelWithDebInfo MinSizeRel" | ||
| FORCE) | ||
| message(STATUS "Build type not set, defaulting to 'RelWithDebInfo'") | ||
| endif() | ||
|
|
||
| project(mruby C) | ||
|
|
||
| # TODO stop polluting source tree with CMakeFiles/ and CMakeCache.txt | ||
| # on build location check failure | ||
| # Make sure we are not trying to generate in in-tree build unless building | ||
| # with an MSVC or Xcode IDE where it's OK. | ||
| if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT (MSVC_IDE OR XCODE)) | ||
| message(FATAL_ERROR | ||
| "\nIn-source builds are not allowed as CMake would overwrite the " | ||
| "Makefiles distributed with mruby. Delete any created 'CMakeFiles' " | ||
| "subdirectory and 'CMakeCache.txt' file from the current directory, " | ||
| "change to the 'build' subdirectory, and re-run CMake from there.") | ||
| endif() | ||
|
|
||
| if(COMMAND cmake_policy) | ||
| cmake_policy(SET CMP0003 NEW) # don't split absolute link paths | ||
| cmake_policy(SET CMP0012 NEW) # recognize number & boolean literals | ||
| cmake_policy(SET CMP0015 NEW) # convert relative link paths to absolute | ||
| endif(COMMAND cmake_policy) | ||
|
|
||
| # Match original Makefile's default in-tree install. | ||
| if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) | ||
| set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR} CACHE PATH | ||
| "Install path prefix prepended to install directories." | ||
| FORCE | ||
| ) | ||
| endif() | ||
|
|
||
| # TODO refactor to use an option when adding shared lib support | ||
| set(BUILD_SHARED_LIBS OFF) | ||
|
|
||
| # Version of mruby, useful for versoning .so and .dll files. | ||
| # TODO automate by parsing src/version.h -or- extract git info? | ||
| set(MRUBY_VERSION 1.0.0dev) | ||
| string(REGEX MATCH "^[0-9]+[.][0-9]+" MRUBY_SOVERSION ${MRUBY_VERSION}) | ||
| string(REPLACE "." "" MRUBY_DLL_SHORTVER ${MRUBY_SOVERSION}) | ||
|
|
||
| # Search in the `cmake` directory for custom CMake helper modules. | ||
| list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") | ||
| include(IntrospectSystem) | ||
|
|
||
| # Search for C header files in these directories. | ||
| include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") | ||
|
|
||
| # TODO re-enable (and implement) if needed | ||
| # On some 64-bit platforms, libraries should be installed into `lib64' | ||
| # instead of `lib'. Set this to 64 to do that. | ||
| #set(LIB_SUFFIX "" CACHE STRING "Suffix for 'lib' directories, e.g. '64'") | ||
|
|
||
| # build the components | ||
| add_subdirectory(src) | ||
| add_subdirectory(mrblib) | ||
| add_subdirectory(tools) | ||
| add_subdirectory(test) | ||
|
|
||
| # install the header files | ||
| install(FILES include/mruby.h DESTINATION include) | ||
| install(FILES include/mrbconf.h DESTINATION include) | ||
| install(DIRECTORY include/mruby DESTINATION include FILES_MATCHING PATTERN "*.h") | ||
|
|
||
| # TODO refactor once proper versioning scheme implemented | ||
| # archive packaging | ||
| set(CPACK_GENERATOR "TGZ;ZIP") | ||
| string(TOLOWER ${CMAKE_SYSTEM_NAME} MRUBY_HOST) | ||
| if(CMAKE_C_COMPILER_VERSION) | ||
| string(REPLACE "." "" MRUBY_GCC_VERSION ${CMAKE_C_COMPILER_VERSION}) | ||
| endif() | ||
|
|
||
| # TODO add build info suffix for non-Windows builds? | ||
| if(MINGW) | ||
| set(MRUBY_BUILD "-mingw${MRUBY_GCC_VERSION}") | ||
| elseif(MSVC) | ||
| set(MRUBY_BUILD "-msvc${MSVC_VERSION}") | ||
| endif() | ||
| set(CPACK_PACKAGE_FILE_NAME | ||
| "${CMAKE_PROJECT_NAME}-${MRUBY_VERSION}-${MRUBY_HOST}${MRUBY_BUILD}" | ||
| ) | ||
| include(CPack) | ||
|
|
||
| # vim: ts=2 sts=2 sw=2 et |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| # Sample toolchain file for building for Windows from an Arch Linux system. | ||
| # | ||
| # Typical usage: | ||
| # 1) install cross compiler: `sudo pacman -S mingw32-gcc` | ||
| # 2) cp cmake/Toolchain-Arch-mingw32.cmake.sample ~/Toolchain-Arch-mingw32.cmake | ||
| # 3) tweak toolchain values as needed | ||
| # 4) cd build | ||
| # 5) cmake -DCMAKE_TOOLCHAIN_FILE=~/Toolchain-Arch-mingw32.cmake .. | ||
|
|
||
| # name of the target OS on which the built artifacts will run | ||
| # and the toolchain prefix | ||
| set(CMAKE_SYSTEM_NAME Windows) | ||
| set(TOOLCHAIN_PREFIX i486-mingw32) | ||
|
|
||
| # cross compilers to use for C and C++ | ||
| set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) | ||
| set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) | ||
| set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) | ||
|
|
||
| # target environment on the build host system | ||
| # set 1st to dir with the cross compiler's C/C++ headers/libs | ||
| # set 2nd to dir containing personal cross development headers/libs | ||
| set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX} ~/crossdev/w32) | ||
|
|
||
| # modify default behavior of FIND_XXX() commands to | ||
| # search for headers/libs in the target environment and | ||
| # search for programs in the build host environment | ||
| set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) | ||
| set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) | ||
| set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| # Sample toolchain file for building for Windows from an OS X system. | ||
| # | ||
| # Typical usage: | ||
| # 1) install a mingw-w64 cross compiler | ||
| # a) darwin toolchain targeting win32: http://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win32/ | ||
| # b) extract toolchain into ~/mingw/w32 | ||
| # 2) cp cmake/Toolchain-OSX-mingw32.cmake.sample ~/Toolchain-OSX-mingw32.cmake | ||
| # 3) tweak toolchain values as needed | ||
| # 4) cd build | ||
| # 5) cmake -DCMAKE_TOOLCHAIN_FILE=~/Toolchain-OSX-mingw32.cmake .. | ||
|
|
||
| # name of the target OS on which the built artifacts will run | ||
| # and the toolchain prefix | ||
| set(CMAKE_SYSTEM_NAME Windows) | ||
| set(TOOLCHAIN_PREFIX i686-w64-mingw32) | ||
|
|
||
| # cross compilers to use for C and C++ | ||
| set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc) | ||
| set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++) | ||
| set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres) | ||
|
|
||
| # target environment(s) on the build host system | ||
| # set 1st to dir with the cross compiler's C/C++ headers/libs | ||
| # set 2nd to dir containing personal cross development headers/libs | ||
| set(CMAKE_FIND_ROOT_PATH ~/mingw/w32/${TOOLCHAIN_PREFIX} ~/crossdev/w32) | ||
|
|
||
| # modify default behavior of FIND_XXX() commands to | ||
| # search for headers/libs in the target environment and | ||
| # search for programs in the build host environment | ||
| set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) | ||
| set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) | ||
| set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |
Oops, something went wrong.