Merge branch 'stable'

Author: Hayao0819

.gitignore

@@ -8,11 +8,14 @@
 *.log
 *.log.*
 *.sig
-
+.build_option
+system/mkalteriso
+system/cpp-src/mkalteriso/build/
 pkg/
 src/
 out/
 work/
 *.ignore*
 *.ig*
-*.add*
+*.add*
+temp/

.gitmodules

@@ -0,0 +1,5 @@
+language: shell
+script:
+  - bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
+git:
+  submodules: false

.travis.yml

@@ -1,9 +1,11 @@
 FROM archlinux:latest
-RUN echo 'Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
+RUN echo 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist \
+&& echo 'nameserver 1.1.1.1' > /etc/resolv.conf
 RUN pacman -Syyu --noconfirm
-RUN pacman -S git archiso arch-install-scripts sudo --noconfirm
-RUN git clone https://github.com/SereneTeam/alterlinux.git alterlinux/
+RUN pacman -S archiso git arch-install-scripts sudo qt5-base cmake ninja base-devel --noconfirm
+RUN pacman-key --init
+COPY . /alterlinux
 WORKDIR /alterlinux
 RUN git checkout dev
-RUN ./keyring.sh -ca
+RUN ./keyring.sh -a
 CMD ["./build.sh", "-b"]

Dockerfile

@@ -1,3 +1,4 @@
+
 BUILD_SCRIPT = build.sh
 KERNEL       = zen
 SHARE_OPTION = -b -c "zstd" -u "alter" -p "alter" -k "${KERNEL}"
@@ -6,41 +7,75 @@ ARCH_x86_64  = -a x86_64
 ARCH_i686    = -a i686
 
 
-full:
+full:mkalteriso
 	@sudo ./fullbuild.sh
 	@make clean
 
-xfce-64:
+xfce-64:mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} xfce
 	@make clean
 
-plasma-64:
+plasma-64:mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} plasma
 	@make clean
 
-releng-64:
+releng-64:mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} releng
 	@make clean
 
-lxde-64:
+lxde-64:mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} lxde
 	@make clean
 
-xfce-32:
+xfce-32:mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} xfce
 	@make clean
 
-plasma-32:
+plasma-32::mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} plasma
 	@make clean
 
-releng-32:
+releng-32:mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} releng
 	@make clean
 
-lxde-32:
+lxde-32:mkalteriso
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} lxde
 	@make clean
 
+menuconfig/build/mconf::
+	@if [ -d menuconfig/build ];\
+	then \
+		:;\
+	else \
+		mkdir menuconfig/build ;\
+	fi
+	(cd menuconfig/build ; cmake -GNinja .. ; ninja -j4 )
+mkalteriso:
+	@if [ -d system/cpp-src/mkalteriso/build ];\
+	then \
+		:;\
+	else \
+		mkdir system/cpp-src/mkalteriso/build ;\
+	fi
+	(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
+menuconfig-script/kernel_choice:system/kernel_list-x86_64 system/kernel_list-i686
+	./kernel-choice-conf-gen.sh 
+build_option:
+	if [ -f .config ];\
+	then \
+		:;\
+	else \
+		make menuconfig ;\
+	fi
+	./menuconf-to-alterconf.sh ./.build_option
 clean:
 	@sudo ./${BUILD_SCRIPT} clean
+build:build_option mkalteriso
+	$(eval BUILD_OPTION := $(shell cat ./.build_option))
+	sudo ./${BUILD_SCRIPT} ${BUILD_OPTION}
+keyring::
+	sudo ./keyring.sh --alter-add --arch-add 

Makefile

@@ -0,0 +1,208 @@
+#!/usr/bin/env python3
+#== Copyright ==#
+# (C) 2019-2020 Fascode Network
+
+#== Import ==#
+import gi, subprocess, sys, threading
+gi.require_version("Gtk", "3.0")
+from gi.repository import GLib, Gtk, GObject
+
+#== Main Window ==#
+class MainWindow(Gtk.Window):
+    #= Fuction =#
+    def __init__(self):
+        def yn(name):
+            y = Gtk.RadioButton.new_with_label_from_widget(None, "Yes")
+            y.connect("toggled", self.on_button_toggled, name, True)
+            n = Gtk.RadioButton.new_with_mnemonic_from_widget(y, "No")
+            n.connect("toggled", self.on_button_toggled, name, False)
+            return y, n
+
+        def combobox(name, list):
+            list_store = Gtk.ListStore(int, str)
+            for num in range(len(list)):
+                list_store.append([num, list[num]])
+
+            combo = Gtk.ComboBox.new_with_model_and_entry(list_store)
+            combo.connect("changed", self.on_combo_changed, name)
+            combo.set_entry_text_column(1)
+            combo.set_active(0)
+            return combo
+
+        #-- Create Window --#
+        Gtk.Window.__init__(self, title="build wizard")
+
+        #-- Define --#
+        self.bool = {"plymouth": True, "japanese": True}
+        self.selected = {"build": "native"}
+
+        #-- Sub Layout 1 --#
+        #- Create -#
+        sub_layout1 = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+
+        #- Labels -#
+        label1 = Gtk.Label("select desktop environment")
+        label2 = Gtk.Label("select kernel")
+
+        #- Comboboxes -#
+        de = combobox("de", ["xfce", "plasma", "lxde"])
+        kernel= combobox("kernel", ["zen", "linux", "lts", "lqx", "ck", "rt", "rt-lts", "xanmod-lts"])
+
+        #- Buttons & Add -#
+        for name in "plymouth", "japanese":
+            y, n = yn(name)
+            subs_layout = Gtk.Box(spacing=5)
+            subs_layout.pack_start(y, True, True, 30)
+            subs_layout.pack_start(n, True, True, 30)
+            label = Gtk.Label("Enable" + " " + name + "?")
+            sub_layout1.pack_start(label,       True, True, 5)
+            sub_layout1.pack_start(subs_layout, True, True, 5)
+
+        #- Add -#
+        for name in label1, de, label2, kernel:
+            sub_layout1.pack_start(name, True, True, 5)
+
+        #-- Sub Layout 2 --#
+        #- Create -#
+        sub_layout2 = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+
+        #- Labels -#
+        label1 = Gtk.Label("select compression")
+        label2 = Gtk.Label("user name")
+        label3 = Gtk.Label("password")
+
+        #- Combobox -#
+        comp = combobox("comp", ["zstd", "lzma", "lzo", "lz4", "xz", "gzip"])
+
+        #- Entrys -#
+        self.usr = Gtk.Entry()
+        self.usr.set_text("alter")
+        self.passwd = Gtk.Entry()
+        self.passwd.set_visibility(False)
+        self.passwd.set_text("alter")
+
+        #- Button -#
+        showpasswd = Gtk.ToggleButton("Show password")
+        showpasswd.connect("toggled", self.on_button_toggled, "1")
+
+        #- Add -#
+        for name in label1, comp, label2, self.usr, label3, self.passwd, showpasswd:
+            sub_layout2.pack_start(name, True, True, 5)
+
+        #-- Sub Layout 3 --#
+        #- Create -#
+        sub_layout3 = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+
+        #- Label -#
+        label = Gtk.Label("select build type")
+
+        #- Button -#
+        button1 = Gtk.RadioButton.new_with_label_from_widget(None, "native")
+        button1.connect("toggled", self.select_build, "native")
+
+        #- Add -#
+        sub_layout3.pack_start(label, True, True, 5)
+        sub_layout3.pack_start(button1, True, True, 5)
+
+        #- Buttons & Add -#
+        for name in "docker", "ssh":
+            button = Gtk.RadioButton.new_with_mnemonic_from_widget(button1, name)
+            button.connect("toggled", self.select_build, name)
+            sub_layout3.pack_start(button, True, True, 5)
+
+        #-- Grid --#
+        #- Create -#
+        grid = Gtk.Grid(column_spacing=10, row_spacing=10)
+
+        #- Progressbar -#
+        self.progressbar = Gtk.ProgressBar()
+
+        #- Button -#
+        build = Gtk.Button("build")
+        build.connect("clicked", self.on_click_build)
+
+        #- Add -#
+        grid.attach(sub_layout1,      0, 0, 1, 1)
+        grid.attach(sub_layout2,      1, 0, 1, 1)
+        grid.attach(sub_layout3,      2, 0, 1, 1)
+        grid.attach(self.progressbar, 0, 1, 2, 1)
+        grid.attach(build,            2, 1, 1, 1)
+
+        #-- Layout --#
+        #- Create -#
+        layout = Gtk.Box(spacing=10)
+
+        #- Add -#
+        layout.pack_start(grid, True, True, 10)
+
+        #-- Main Layout --#
+        #- Create -#
+        main_layout = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=10)
+
+        #- Add -#
+        main_layout.pack_start(layout, True, True, 10)
+
+        #-- Add Main Window --#
+        self.add(main_layout)
+
+    def on_button_toggled(self, button, name):
+        if button.get_active():
+            self.passwd.set_visibility(True)
+        else:
+            self.passwd.set_visibility(False)
+
+    def on_combo_changed(self, combo, name):
+        self.selected[name] = combo.get_model()[combo.get_active_iter()][1]
+
+    def select_build(self, button, name):
+        self.selected["build"] = name
+
+    def on_click_build(self, button):
+        cmd = ["sudo", "./build.sh"]
+
+        if self.selected["build"] == "native":
+            if self.bool["plymouth"]:
+                cmd.append("-b")
+
+            if self.bool["japanese"]:
+                cmd.append("-j")
+
+            for name in "-k", self.selected["kernel"], "-c", self.selected["comp"], "-u", self.usr.get_text(), "-p", self.passwd.get_text():
+                cmd.append(name)
+
+            self.run_cmd(cmd)
+        else:
+            self.progressbar.set_show_text(1)
+            self.progressbar.set_text("not supported!")
+            print("not supported!")
+
+    def run_cmd(self, cmd):
+        def update(line):
+            self.progressbar.pulse()
+            self.progressbar.set_show_text(1)
+            self.progressbar.set_ellipsize(True)
+            self.progressbar.set_text(line)
+            return False
+
+        def run():
+            run = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr = subprocess.STDOUT)
+            while run.poll() is None:
+                line = run.stdout.readline().decode('utf-8')
+                if line:
+                    yield line
+
+        def echo():
+            for line in run():
+                GLib.idle_add(update, line)
+                sys.stdout.write(line)
+
+        thread = threading.Thread(target=echo)
+        thread.daemon = True
+        thread.start()
+
+#== Run ==#
+if __name__ == "__main__":
+    win = MainWindow()
+    win.show_all()
+    win.connect("destroy", Gtk.main_quit)
+    Gtk.main()