Skip to content

Re-thinking the build system to bring it more into line with the conv… #1192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2016
Merged

Re-thinking the build system to bring it more into line with the conv… #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Produced files

build/bin
build/obj*
build/prerequisites
build/tests
build/*

# IDE related files
nbproject
Expand All @@ -22,19 +19,13 @@ vgcore.*
**.patch
.tags*
cscope.*
__pycache__
*.pyc

# ctags and ID database
tags
ID

# Prerequisites
.prerequisites
third-party/STM32F3-Discovery_FW_V1.1.0
third-party/STM32F4-Discovery_FW_V1.1.0
third-party/nuttx
third-party/vera++
third-party/cppcheck

# targets
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

target/* isn't enough here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bad. It isn't.

jerry_targetjs.h
targets/mbedk64f/libjerry
Expand Down
16 changes: 8 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ before_install:

install:

script: "make -j VERBOSE=1 NINJA=1 $TARGET"
script: "python tools/run-tests.py $OPTS"

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure whether it makes much of a difference given our small project size but it would be great if Travis CI could still use Ninja for the build :)

env:
- TARGET="check-signed-off check-vera check-cppcheck"
- TARGET="build.linux test-js"
- TARGET="build.linux test-js" TOOLCHAIN=build/configs/toolchain_linux_armv7l-hf.cmake TIMEOUT=300
- TARGET=test-buildoptions
- TARGET=test-unit
- OPTS="--check-signed-off --check-cppcheck --check-vera"
- OPTS="--jerry-tests --jerry-test-suite"
- OPTS="--jerry-tests --jerry-test-suite --toolchain=cmake/toolchain_linux_armv7l-hf.cmake" TIMEOUT=300
- OPTS=--buildoption-test
- OPTS=--unittests

matrix:
include:
- os: osx
env: TARGET="build.darwin test-js"
env: OPTS="--jerry-tests --jerry-test-suite"
- os: osx
env: TARGET=test-unit
env: OPTS=--unittests
allow_failures:
- os: osx
Loading