Skip to content

Commit 6ecca08

Browse files
committed
[update] : Rewrote the run of build.sh
1 parent 66c0c0b commit 6ecca08

1 file changed

Lines changed: 22 additions & 45 deletions

File tree

Makefile

Lines changed: 22 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,22 @@
11

2-
BUILD_SCRIPT = build.sh
3-
KERNEL = zen
4-
SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter" -k "${KERNEL}"
5-
DEBUG_OPTION = -t '-Xcompression-level 1' -x -d
6-
ARCH_x86_64 = -a x86_64
7-
ARCH_i686 = -a i686
8-
9-
2+
BUILD_SCRIPT := build.sh
3+
KERNEL := zen
4+
SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug
5+
ARCH_x86_64 := --arch x86_64
6+
ARCH_i686 := --arch i686
7+
CURRENT_DIR := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
108

119
full:mkalteriso
12-
@sudo ./tools/fullbuild.sh
13-
@make clean
14-
15-
xfce-64:mkalteriso
16-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} xfce
17-
@make clean
18-
19-
plasma-64:mkalteriso
20-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} plasma
21-
@make clean
22-
23-
releng-64:mkalteriso
24-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} releng
25-
@make clean
26-
27-
lxde-64:mkalteriso
28-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} lxde
29-
@make clean
30-
31-
xfce-32:mkalteriso
32-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} xfce
33-
@make clean
34-
35-
plasma-32::mkalteriso
36-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} plasma
37-
@make clean
38-
39-
releng-32:mkalteriso
40-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} releng
10+
@sudo ${CURRENT_DIR}/tools/fullbuild.sh
4111
@make clean
4212

43-
lxde-32:mkalteriso
44-
@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} lxde
13+
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
14+
$(eval CHANNEL=${shell echo ${@} | cut -d '-' -f 1})
15+
$(eval ARCHITECTURE=${shell echo ${@} | cut -d '-' -f 2})
16+
@case ${ARCHITECTURE} in\
17+
"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
18+
"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
19+
esac
4520
@make clean
4621

4722
menuconfig/build/mconf::
@@ -64,19 +39,21 @@ mkalteriso:
6439
menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
6540
menuconfig/build/mconf menuconfig-script/rootconf
6641
menuconfig-script/kernel_choice:system/kernel-x86_64 system/kernel-i686
67-
./tools/kernel-choice-conf-gen.sh
42+
${CURRENT_DIR}/tools/kernel-choice-conf-gen.sh
6843
build_option:
6944
if [ -f .config ];\
7045
then \
7146
:;\
7247
else \
7348
make menuconfig ;\
7449
fi
75-
./tools/menuconf-to-alterconf.sh ./.build_option
50+
${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
7651
clean:
77-
@sudo ./${BUILD_SCRIPT} clean
52+
@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
7853
build:build_option mkalteriso
79-
$(eval BUILD_OPTION := $(shell cat ./.build_option))
80-
sudo ./${BUILD_SCRIPT} ${BUILD_OPTION}
54+
$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
55+
sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${BUILD_OPTION}
8156
keyring::
82-
sudo ./tools/keyring.sh --alter-add --arch-add
57+
sudo ${CURRENT_DIR}/tools/keyring.sh --alter-add --arch-add
58+
wizard:
59+

0 commit comments

Comments
 (0)