Skip to content

Commit

Permalink
Remove duplicated profile-check from build.py (jerryscript-project#1718)
Browse files Browse the repository at this point in the history
This check is performed in cmake-side too.
The README.md about the profiles is also updated.

JerryScript-DCO-1.0-Signed-off-by: Zsolt Borbély [email protected]
  • Loading branch information
Zsolt Borbély authored and akosthekiss committed Apr 7, 2017
1 parent 69f0347 commit 574dff5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
4 changes: 2 additions & 2 deletions jerry-core/profiles/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Specify compile definitions in profile files to use when compiling the `jerry-core` target.

The default profile is ``es5.1`` which disables the ArrayBuffer built-in.
The default profile is ``es5.1`` which disables the ES2015 features.

### Using profiles with the build system

Expand All @@ -30,7 +30,7 @@ or
./tools/build.py --profile=minimal
```

This command selects the profile/minimal.profile file.
This command selects the profiles/minimal.profile file.

#### 2. Using only CMake build system

Expand Down
9 changes: 1 addition & 8 deletions tools/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
BUILD_DIR = os.path.join(settings.PROJECT_DIR, 'build')
DEFAULT_PORT_DIR = os.path.join(settings.PROJECT_DIR, 'targets/default')

PROFILE_DIR = os.path.join(settings.PROJECT_DIR, 'jerry-core/profiles')
DEFAULT_PROFILE = 'es5.1'

def default_toolchain():
Expand Down Expand Up @@ -155,13 +154,7 @@ def generate_build_options(arguments):
build_options.append('-DMEM_HEAP_SIZE_KB=%d' % arguments.mem_heap)
build_options.append('-DPORT_DIR=%s' % arguments.port_dir)

if os.path.isabs(arguments.profile):
profile = arguments.profile
else:
profile = os.path.join(PROFILE_DIR, arguments.profile + '.profile')

build_options.append('-DFEATURE_PROFILE=%s' % profile)

build_options.append('-DFEATURE_PROFILE=%s' % arguments.profile)
build_options.append('-DFEATURE_DEBUGGER=%s' % arguments.jerry_debugger)
build_options.append('-DFEATURE_DEBUGGER_PORT=%d' % arguments.jerry_debugger_port)
build_options.append('-DFEATURE_SNAPSHOT_EXEC=%s' % arguments.snapshot_exec)
Expand Down

0 comments on commit 574dff5

Please sign in to comment.