From 8c75baeefcb0c7ae392f502d96e1948180fcd410 Mon Sep 17 00:00:00 2001
From: kokkiemouse <kokkiemouse@gmail.com>
Date: Mon, 17 Aug 2020 11:31:03 +0900
Subject: [PATCH] added parser

---
 .gitignore |  3 ++-
 Makefile   | 22 ++++++++++++----------
 build.sh   | 11 +++++++++++
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index a53db939..089b3d51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ work/
 temp/
 .config.old
 system/cpp-src/mkalteriso/CMakeLists.txt.user
-menuconfig-script/kernel_choice_*
\ No newline at end of file
+menuconfig-script/kernel_choice_*
+system/arch-pkgbuild-parser
diff --git a/Makefile b/Makefile
index 7d7135af..b94d0ac3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,39 +7,39 @@ ARCH_x86_64  = -a x86_64
 ARCH_i686    = -a i686
 
 
-full:mkalteriso
+full:mkalteriso arch-pkgbuild-parser
 	@sudo ./fullbuild.sh
 	@make clean
 
-xfce-64:mkalteriso
+xfce-64:mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} xfce
 	@make clean
 
-plasma-64:mkalteriso
+plasma-64:mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} plasma
 	@make clean
 
-releng-64:mkalteriso
+releng-64:mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} releng
 	@make clean
 
-lxde-64:mkalteriso
+lxde-64:mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_x86_64} lxde
 	@make clean
 
-xfce-32:mkalteriso
+xfce-32:mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} xfce
 	@make clean
 
-plasma-32::mkalteriso
+plasma-32::mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} plasma
 	@make clean
 
-releng-32:mkalteriso
+releng-32:mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} releng
 	@make clean
 
-lxde-32:mkalteriso
+lxde-32:mkalteriso arch-pkgbuild-parser
 	@sudo ./${BUILD_SCRIPT} ${SHARE_OPTION} ${ARCH_i686} lxde
 	@make clean
 
@@ -59,6 +59,8 @@ mkalteriso:
 		mkdir system/cpp-src/mkalteriso/build ;\
 	fi
 	(cd system/cpp-src/mkalteriso/build ; cmake -GNinja .. ; ninja -j4 ; cp -f mkalteriso ../../../)
+arch-pkgbuild-parser:
+	(cd system/rust-src/arch-pkgbuild-parser/ ; cargo build ; cp -f target/debug/arch-pkgbuild-parser ../../)
 	
 menuconfig:menuconfig/build/mconf menuconfig-script/kernel_choice
 	menuconfig/build/mconf menuconfig-script/rootconf
@@ -74,7 +76,7 @@ build_option:
 	./menuconf-to-alterconf.sh ./.build_option
 clean:
 	@sudo ./${BUILD_SCRIPT} clean
-build:build_option mkalteriso
+build:build_option mkalteriso arch-pkgbuild-parser
 	$(eval BUILD_OPTION := $(shell cat ./.build_option))
 	sudo ./${BUILD_SCRIPT} ${BUILD_OPTION}
 keyring::
diff --git a/build.sh b/build.sh
index 290841b1..aba33214 100755
--- a/build.sh
+++ b/build.sh
@@ -669,6 +669,17 @@ prepare_build() {
     else
         mkalteriso="${script_path}/system/mkalteriso.sh"
     fi
+    # Build arch-pkgbuild-parser
+    cd "${script_path}"
+    _msg_info "Building arch-pkgbuild-parser..."
+    if [[ "${debug}" = true ]]; then
+        make arch-pkgbuild-parser
+        echo
+    else   
+        make arch-pkgbuild-parser > /dev/null 2>&1
+    fi
+    cd - > /dev/null 2>&1
+    
     # Load loop kernel module
     if [[ "${noloopmod}" = false ]]; then
         if [[ ! -d "/usr/lib/modules/$(uname -r)" ]]; then
-- 
2.11.0