Skip to content

Commit ddab1d8

Browse files
committed
Re-thinking the build system to bring it more into line with the conventions.
We removed that implementation where the build directory isn't set up to build with exactly one configuration of the project but potentially several variants: the same build directory can/must be used for debug and release builds, for full or compact profile versions, etc. So we reworked the CMakeLists, and now one build dir deal with exactly one configuration of the project's libraries and tools. JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély [email protected] JerryScript-DCO-1.0-Signed-off-by: Robert Sipka [email protected]
1 parent 778f3c0 commit ddab1d8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1106
-1926
lines changed

.gitignore

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# Produced files
22

3-
build/bin
4-
build/obj*
5-
build/prerequisites
6-
build/tests
3+
build/*
74

85
# IDE related files
96
nbproject
@@ -22,19 +19,13 @@ vgcore.*
2219
**.patch
2320
.tags*
2421
cscope.*
22+
__pycache__
23+
*.pyc
2524

2625
# ctags and ID database
2726
tags
2827
ID
2928

30-
# Prerequisites
31-
.prerequisites
32-
third-party/STM32F3-Discovery_FW_V1.1.0
33-
third-party/STM32F4-Discovery_FW_V1.1.0
34-
third-party/nuttx
35-
third-party/vera++
36-
third-party/cppcheck
37-
3829
# targets
3930
jerry_targetjs.h
4031
targets/mbedk64f/libjerry

.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ before_install:
1111

1212
install:
1313

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

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

2323
matrix:
2424
include:
2525
- os: osx
26-
env: TARGET="build.darwin test-js"
26+
env: OPTS="--jerry-tests --jerry-test-suite"
2727
- os: osx
28-
env: TARGET=test-unit
28+
env: OPTS=--unittests
2929
allow_failures:
3030
- os: osx

0 commit comments

Comments
 (0)