Merge branch 'dev' into dev-stable

Author: Hayao0819

Makefile

@@ -2,26 +2,43 @@
 ARGS         :=
 BUILD_SCRIPT := build.sh
 KERNEL       := zen
-SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm
+SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --noconfirm
 ARCH_x86_64  := --arch x86_64
 ARCH_i686    := --arch i686
 FULLBUILD    := -d -g -e --noconfirm
+DEBUG_OPTION := --debug --log
+DEBUG        := false
 FULL_x86_64  := xfce cinnamon i3 plasma gnome
 FULL_i686    := xfce lxde
 CURRENT_DIR  := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
 
+ifeq (${DEBUG},true)
+	ARGS += ${ARGS} ${DEBUG_OPTION}
+endif
+
 full:
 	sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m x86_64 ${FULL_x86_64}
 	sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686   ${FULL_i686}
 	@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:
+basic-ja-64    basic-en-64    basic-ja-32     basic-en-32    \
+cinnamon-ja-64 cinnamon-en-64 cinnamon-ja-32  cinnamon-en-32 \
+gnome-ja-64    gnome-en-64    gnome-ja-32     gnome-en-32    \
+i3-ja-64       i3-en-64       i3-ja-32        i3-en-32       \
+lxde-ja-64     lxde-en-64     lxde-ja-32      lxde-en-32     \
+plasma-ja-64   plasma-en-64                                  \
+releng-ja-64   releng-en-64   releng-ja-32    releng-en-32   \
+serene-ja-64   serene-en-64   serene-ja-32    serene-en-32   \
+xfce-ja-64     xfce-en-64     xfce-ja-32      xfce-en-32     \
+xfce-pro-ja-64 xfce-pro-en-64                                \
+:
 	@$(eval ARCHITECTURE=${shell echo ${@} | rev | cut -d '-' -f 1 | rev })
-	@$(eval CHANNEL=${shell echo ${@} | sed "s/-${ARCHITECTURE}//g"})
+	@$(eval LOCALE=${shell echo ${@} | rev | cut -d '-' -f 2 | rev })
+	@$(eval CHANNEL=${shell echo ${@} | sed "s/-${LOCALE}-${ARCHITECTURE}//g"})
 	@[[ -z "${CHANNEL}" ]] && echo "Empty Channel" && exit 1 || :
 	@case ${ARCHITECTURE} in\
-		"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
-		"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
+		"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} -l ${LOCALE} ${CHANNEL} ;;\
+		"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} -l ${LOCALE} ${CHANNEL};;\
 		*   ) echo "Unknown Architecture"; exit 1  ;; \
 	esac
 	@make clean
@@ -43,7 +60,7 @@ build_option:
 	${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
 
 clean:
-	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} --noconfirm clean
+	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} --noconfirm --debug clean
 
 build:build_option
 	$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))