[update] : Rewrote the run of build.sh

diff --git a/Makefile b/Makefile
index a2ecb4a..ee53b25 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,47 +1,22 @@
 
-BUILD_SCRIPT = build.sh
-KERNEL       = zen
-SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter" -k "${KERNEL}"
-DEBUG_OPTION = -t '-Xcompression-level 1' -x -d
-ARCH_x86_64  = -a x86_64
-ARCH_i686    = -a i686
-
-
+BUILD_SCRIPT := build.sh
+KERNEL       := zen
+SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug
+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
-       @sudo ./tools/fullbuild.sh
-       @make clean
-
-xfce-64:mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} xfce
-       @make clean
-
-plasma-64:mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} plasma
-       @make clean
-
-releng-64:mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} releng
-       @make clean
-
-lxde-64:mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} lxde
-       @make clean
-
-xfce-32:mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} xfce
-       @make clean
-
-plasma-32::mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} plasma
-       @make clean
-
-releng-32:mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} releng
+       @sudo ${CURRENT_DIR}/tools/fullbuild.sh
        @make clean
 
-lxde-32:mkalteriso
-       @sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} lxde
+xfce-64 xfce-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 cinnamon-64 cinnamon-32 deepin-64 gnome-64 gnomemac-64 i3-64 i3-32:mkalteriso
+       $(eval CHANNEL=${shell echo ${@} | cut -d '-' -f 1})
+       $(eval ARCHITECTURE=${shell echo ${@} | cut -d '-' -f 2})
+       @case ${ARCHITECTURE} in\
+               "32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
+               "64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
+       esac
        @make clean
 
 menuconfig/build/mconf::
@@ -64,7 +39,7 @@ mkalteriso:
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
        menuconfig/build/mconf menuconfig-script/rootconf
 menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
-       ./tools/kernel-choice-conf-gen.sh
+       ${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
 build_option:
        if [ -f .config ];\
        then \
@@ -72,11 +47,13 @@ build_option:
        else \
                make menuconfig ;\
        fi
-       ./tools/menuconf-to-alterconf.sh ./.build_option
+       ${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
 clean:
-       @sudo ./${BUILD_SCRIPT} clean
+       @sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
 build:build_option mkalteriso
-       $(eval BUILD_OPTION := $(shell cat ./.build_option))
-       sudo ./${BUILD_SCRIPT} ${BUILD_OPTION}
+       $(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
+       sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
 keyring::
-       sudo ./tools/keyring.sh --alter-add --arch-add
+       sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
+wizard:
+