Merge branch 'dev' into dev-stable

Author: Hayao0819

.travis.yml

@@ -10,12 +10,6 @@ addons:
 script:
   - bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
   - bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'
-  - cd system/cpp-src/mkalteriso
-  - mkdir -p build
-  - cd build
-  - cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
-  - make
-  
 git:
   submodules: false
   language: bash

Makefile

@@ -6,11 +6,11 @@ ARCH_x86_64  := --arch x86_64
 ARCH_i686    := --arch i686
 CURRENT_DIR  := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
 
-full:mkalteriso
+full:
 	@sudo ${CURRENT_DIR}/tools/fullbuild.sh -d
 	@make clean
 
-basic-64 basic-32  cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64:mkalteriso
+basic-64 basic-32  cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64:
 	$(eval CHANNEL=${shell echo ${@} | cut -d '-' -f 1})
 	$(eval ARCHITECTURE=${shell echo ${@} | cut -d '-' -f 2})
 	@case ${ARCHITECTURE} in\
@@ -23,10 +23,6 @@ menuconfig/build/mconf::
 	@mkdir -p menuconfig/build
 	(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
 
-mkalteriso:
-	@mkdir -p system/cpp-src/mkalteriso/build
-	@(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
-
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
 	@menuconfig/build/mconf menuconfig-script/rootconf
 
@@ -40,7 +36,7 @@ build_option:
 clean:
 	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
 
-build:build_option mkalteriso
+build:build_option
 	$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
 	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}