Officially introduce amalgamated builds (#4416)

Remove redundancy between all-in-one and all-in-one-source builds
by keeping only the second, and adopt the more established term
"amalgamated" build for it. This change includes the following:

- Replace `ENABLE_ALL_IN_ONE` and `ENABLE_ALL_IN_ONE_SOURCE` cmake
  options with `ENABLE_AMALGAM` top-level option.
- Replace `--all-in-one` option of `build.py` helper with
  `--amalgam`.
- Merge the `srcmerger.py` and `srcgenerator.py` tool scripts into
  `amalgam.py` (with improvements).
- Update documentation.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu

6 files changed, 3 insertions, 6 deletions

diff --git a/targets/esp8266/Makefile.esp8266 b/targets/esp8266/Makefile.esp8266
index ddc60c14..9c131a93 100644
--- a/targets/esp8266/Makefile.esp8266
+++ b/targets/esp8266/Makefile.esp8266
@@ -49,7 +49,7 @@ jerry:
 	 -DCMAKE_C_COMPILER=xtensa-lx106-elf-gcc \
 	 -DCMAKE_C_COMPILER_WORKS=TRUE \
 	 -DENABLE_LTO=OFF \
-	 -DENABLE_ALL_IN_ONE=ON \
+	 -DENABLE_AMALGAM=ON \
 	 -DJERRY_MATH=ON \
 	 -DJERRY_CMDLINE=OFF \
 	 -DJERRY_PROFILE="es5.1" \
diff --git a/targets/nuttx-stm32f4/Makefile.travis b/targets/nuttx-stm32f4/Makefile.travis
index 8da37f7e..50eadc14 100644
--- a/targets/nuttx-stm32f4/Makefile.travis
+++ b/targets/nuttx-stm32f4/Makefile.travis
@@ -51,7 +51,7 @@ install: install-apt-get-deps install-noapt
 
 # Build JerryScript.
 script-build-jerryscript:
-	tools/build.py --clean --toolchain cmake/toolchain_mcu_stm32f4.cmake --profile=es.next --jerry-cmdline OFF --lto OFF --jerry-math ON --all-in-one ON --jerry-port-default OFF --mem-heap 70 --compile-flag='--sysroot=../nuttx'
+	tools/build.py --clean --toolchain cmake/toolchain_mcu_stm32f4.cmake --profile=es.next --jerry-cmdline OFF --lto OFF --jerry-math ON --amalgam ON --jerry-port-default OFF --mem-heap 70 --compile-flag='--sysroot=../nuttx'
 
 # Link in the NuttX JerryScript target directory under the NuttX apps tree.
 script-add-jerryscript-app:
diff --git a/targets/nuttx-stm32f4/README.md b/targets/nuttx-stm32f4/README.md
index c1850c83..2eba1d76 100644
--- a/targets/nuttx-stm32f4/README.md
+++ b/targets/nuttx-stm32f4/README.md
@@ -42,7 +42,7 @@ jerryscript/tools/build.py \
     --lto=OFF \
     --jerry-cmdline=OFF \
     --jerry-math=ON \
-    --all-in-one=ON \
+    --amalgam=ON \
     --mem-heap=70 \
     --profile=es.next \
     --compile-flag="--sysroot=${PWD}/nuttx" \
diff --git a/targets/particle/Makefile.particle b/targets/particle/Makefile.particle
index b848315f..1eb87a31 100644
--- a/targets/particle/Makefile.particle
+++ b/targets/particle/Makefile.particle
@@ -44,7 +44,6 @@ jerrycore:
 	 -DCMAKE_C_COMPILER=arm-none-eabi-gcc \
 	 -DCMAKE_C_COMPILER_WORKS=TRUE \
 	 -DENABLE_LTO=ON \
-	 -DENABLE_ALL_IN_ONE=OFF \
 	 -DJERRY_CMDLINE=OFF \
 	 -DJERRY_PROFILE=minimal \
 	 -DENABLE_STRIP=OFF \
diff --git a/targets/riot-stm32f4/Makefile.riot b/targets/riot-stm32f4/Makefile.riot
index 2187c250..1600ba75 100644
--- a/targets/riot-stm32f4/Makefile.riot
+++ b/targets/riot-stm32f4/Makefile.riot
@@ -46,7 +46,6 @@ libjerry:
 	 -DCMAKE_C_COMPILER=$(CC) \
 	 -DCMAKE_C_COMPILER_WORKS=TRUE \
 	 -DENABLE_LTO=OFF \
-	 -DENABLE_ALL_IN_ONE=OFF \
 	 -DJERRY_CMDLINE=OFF \
 	 -DJERRY_PROFILE="es5.1" \
 	 -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
diff --git a/targets/zephyr/Makefile.zephyr b/targets/zephyr/Makefile.zephyr
index 583e37c0..d182df34 100644
--- a/targets/zephyr/Makefile.zephyr
+++ b/targets/zephyr/Makefile.zephyr
@@ -82,7 +82,6 @@ endif
 	 -DCMAKE_C_COMPILER="$(subst ccache ,,$(CC))" \
 	 -DCMAKE_C_COMPILER_WORKS=TRUE \
 	 -DENABLE_LTO=OFF \
-	 -DENABLE_ALL_IN_ONE=OFF \
 	 -DJERRY_CMDLINE=OFF \
 	 -DJERRY_PROFILE=$(JERRYPROFILE) \
 	 -DJERRY_ERROR_MESSAGES=ON \