Browse Source

travis update

master
Yuki Izumi 4 years ago
parent
commit
bce9c3e6e9
No known key found for this signature in database GPG Key ID: 44A3D2C95E26BB14
3 changed files with 8 additions and 39 deletions
  1. +2
    -2
      .travis.yml
  2. +0
    -17
      CMakeLists.txt
  3. +6
    -20
      Makefile

+ 2
- 2
.travis.yml View File

@@ -1,5 +1,5 @@
language: rust
rust:
- nightly
before_install:
- cd lc
script:
- make

+ 0
- 17
CMakeLists.txt View File

@@ -1,17 +0,0 @@
cmake_minimum_required(VERSION 2.8)

project(lilac)

set(PROJECT_NAME "lilac")

set(PROJECT_VERSION_MAJOR 0)
set(PROJECT_VERSION_MINOR 1)
set(PROJECT_VERSION_PATCH 0)
set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} )

add_subdirectory(vm)

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" CACHE STRING
"Choose the type of build, options are: Debug Release." FORCE)
endif(NOT CMAKE_BUILD_TYPE)

+ 6
- 20
Makefile View File

@@ -1,25 +1,11 @@
BUILDDIR?=build

.PHONY: all vm_build clean
.PHONY: all vm lc

all: vm_build
all: vm lc

vm_build: $(BUILDDIR)
(cd lc && cargo build) && make -C $(BUILDDIR)
vm:
cd vm && cargo build

$(BUILDDIR):
mkdir -p $(BUILDDIR); \
cd $(BUILDDIR); \
cmake .. -G "Unix Makefiles"

debug:
mkdir -p $(BUILDDIR); \
cd $(BUILDDIR); \
cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug; \
(cd ../lc && cargo build) && $(MAKE)

leakcheck: vm_build
valgrind --leak-check=full build/vm

clean:
rm -rf $(BUILDDIR)
lc:
cd lc && cargo build

Loading…
Cancel
Save