zig

commit 3a137c6ff0f3f0fe02db9d0fa152a1894e9db493 (tree)
parent e3c524c1d482a845bb2d6555bda386739c862226
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Fri, 21 Apr 2017 11:06:15 -0400

add Travis CI integration

Diffstat:
A
.travis.yml
 | 
23
+++++++++++++++++++++++
M
CMakeLists.txt
 | 
2
+-
M
README.md
 | 
2
++
M
cmake/Findllvm.cmake
 | 
10
++++------

4 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,23 @@
+dist: trusty
+sudo: required
+language: cpp
+before_install:
+  - sudo sh -c 'echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-4.0 main" >> /etc/apt/sources.list'
+  - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+  - sudo apt-get update -q
+install:
+  - sudo apt-get remove -y llvm-*
+  - sudo rm -rf /usr/local/*
+  - 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
+script:
+  - export CC=clang-4.0
+  - export CXX=clang++-4.0
+  - which $CC
+  - which $CXX
+  - echo $PATH
+  - mkdir build
+  - cd build
+  - 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))
+  - make VERBOSE=1
+  - make install
+  - ./zig build --build-file ../build.zig test
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ if(NOT CMAKE_BUILD_TYPE)
         "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
 endif()
 
-project(zig CXX)
+project(zig C CXX)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
 set(ZIG_VERSION_MAJOR 0)
diff --git a/README.md b/README.md
@@ -72,6 +72,8 @@ compromises backward compatibility.
 
 ## Building
 
+[![Build Status](https://travis-ci.org/andrewrk/zig.svg?branch=master)](https://travis-ci.org/andrewrk/zig)
+
 ### Dependencies
 
 #### Build Dependencies
diff --git a/cmake/Findllvm.cmake b/cmake/Findllvm.cmake
@@ -7,7 +7,10 @@
 # LLVM_LIBRARIES
 # LLVM_LIBDIRS
 
-find_program(LLVM_CONFIG_EXE NAMES llvm-config llvm-config-4.0)
+find_program(LLVM_CONFIG_EXE
+    NAMES llvm-config llvm-config-4.0
+    PATHS
+        "C:/Libraries/llvm-4.0.0/bin")
 
 execute_process(
     COMMAND ${LLVM_CONFIG_EXE} --libs
@@ -15,11 +18,6 @@ execute_process(
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 execute_process(
-    COMMAND ${LLVM_CONFIG_EXE} --system-libs
-    OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
     COMMAND ${LLVM_CONFIG_EXE} --libdir
     OUTPUT_VARIABLE LLVM_LIBDIRS
     OUTPUT_STRIP_TRAILING_WHITESPACE)