| author |  Andrew Kelley <andrew@ziglang.org> 2017-04-21 11:06:15-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2017-04-21 13:27:11-04:00 |
| log | 3a137c6ff0f3f0fe02db9d0fa152a1894e9db493 |
| tree | 5d74ea105ec7aeb9694729ff29bf5459e03c1d85 |
| parent | e3c524c1d482a845bb2d6555bda386739c862226 |
add Travis CI integration
4 files changed, 30 insertions(+), 7 deletions(-)
.travis.yml created+23
| ... | @@ -0,0 +1,23 @@ | ||
| 1 | dist: trusty | ||
| 2 | sudo: required | ||
| 3 | language: cpp | ||
| 4 | before_install: | ||
| 5 | - sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main" >> /etc/apt/sources.list' | ||
| 6 | - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - | ||
| 7 | - sudo apt-get update -q | ||
| 8 | install: | ||
| 9 | - sudo apt-get remove -y llvm-* | ||
| 10 | - sudo rm -rf /usr/local/* | ||
| 11 | - sudo apt-get install -y clang-4.0 libclang-4.0 libclang-4.0-dev llvm-4.0 llvm-4.0-dev liblld-4.0 liblld-4.0-dev cmake | ||
| 12 | script: | ||
| 13 | - export CC=clang-4.0 | ||
| 14 | - export CXX=clang++-4.0 | ||
| 15 | - which $CC | ||
| 16 | - which $CXX | ||
| 17 | - echo $PATH | ||
| 18 | - mkdir build | ||
| 19 | - cd build | ||
| 20 | - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $($CC -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=$(echo -n | $CC -E -x c - -v 2>&1 | grep -B1 "End of search list." | head -n1 | cut -c 2- | sed "s/ .*//") -DZIG_LIBC_STATIC_LIB_DIR=$(dirname $($CC -print-file-name=crtbegin.o)) | ||
| 21 | - make VERBOSE=1 | ||
| 22 | - make install | ||
| 23 | - ./zig build --build-file ../build.zig test | ||
CMakeLists.txt+1-1
| ... | @@ -5,7 +5,7 @@ if(NOT CMAKE_BUILD_TYPE) | ... | @@ -5,7 +5,7 @@ if(NOT CMAKE_BUILD_TYPE) |
| 5 | "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) | 5 | "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) |
| 6 | endif() | 6 | endif() |
| 7 | 7 | ||
| 8 | project(zig CXX) | 8 | project(zig C CXX) |
| 9 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) | 9 | set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) |
| 10 | 10 | ||
| 11 | set(ZIG_VERSION_MAJOR 0) | 11 | set(ZIG_VERSION_MAJOR 0) |
README.md+2
| ... | @@ -72,6 +72,8 @@ compromises backward compatibility. | ... | @@ -72,6 +72,8 @@ compromises backward compatibility. |
| 72 | 72 | ||
| 73 | ## Building | 73 | ## Building |
| 74 | 74 | ||
| 75 | [](https://travis-ci.org/andrewrk/zig) | ||
| 76 | |||
| 75 | ### Dependencies | 77 | ### Dependencies |
| 76 | 78 | ||
| 77 | #### Build Dependencies | 79 | #### Build Dependencies |
cmake/Findllvm.cmake+4-6
| ... | @@ -7,18 +7,16 @@ | ... | @@ -7,18 +7,16 @@ |
| 7 | # LLVM_LIBRARIES | 7 | # LLVM_LIBRARIES |
| 8 | # LLVM_LIBDIRS | 8 | # LLVM_LIBDIRS |
| 9 | 9 | ||
| 10 | find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-4.0) | 10 | find_program(LLVM_CONFIG_EXE |
| 11 | NAMES llvm-config llvm-config-4.0 | ||
| 12 | PATHS | ||
| 13 | "C:/Libraries/llvm-4.0.0/bin") | ||
| 11 | 14 | ||
| 12 | execute_process( | 15 | execute_process( |
| 13 | COMMAND ${LLVM_CONFIG_EXE} --libs | 16 | COMMAND ${LLVM_CONFIG_EXE} --libs |
| 14 | OUTPUT_VARIABLE LLVM_LIBRARIES | 17 | OUTPUT_VARIABLE LLVM_LIBRARIES |
| 15 | OUTPUT_STRIP_TRAILING_WHITESPACE) | 18 | OUTPUT_STRIP_TRAILING_WHITESPACE) |
| 16 | 19 | ||
| 17 | execute_process( | ||
| 18 | COMMAND ${LLVM_CONFIG_EXE} --system-libs | ||
| 19 | OUTPUT_VARIABLE LLVM_SYSTEM_LIBS | ||
| 20 | OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
| 21 | |||
| 22 | execute_process( | 20 | execute_process( |
| 23 | COMMAND ${LLVM_CONFIG_EXE} --libdir | 21 | COMMAND ${LLVM_CONFIG_EXE} --libdir |
| 24 | OUTPUT_VARIABLE LLVM_LIBDIRS | 22 | OUTPUT_VARIABLE LLVM_LIBDIRS |