fix(ui/Makefile): add ui dirs; change Makefile

Author: Ethereal-O

.gitignore

@@ -1,7 +1,6 @@
 target/
 **.db
 logs/
-ui
 node_modules
 upload-files/
 demo*

vermeer/.gitignore

@@ -90,7 +90,7 @@ test/case/
 
 # Downloaded binaries (should be downloaded via scripts/download_binaries.sh) #
 ######################
-tools/supervisord/*/supervisord
+tools/supervisord/*/supervisord*
 tools/protoc/*/protoc
 tools/protoc/*/bin/
 tools/protoc/*/include/

vermeer/Makefile

@@ -29,12 +29,12 @@ init: download-binaries
 # Download binary dependencies (supervisord, protoc)
 download-binaries:
 	@echo "Downloading binary dependencies..."
-	@./scripts/download_binaries.sh
+	@./scripts/download_binaries.sh || (echo "Failed to download binaries" && exit 1)
 
 # Generate assets (vfsdata.go for web UI)
 generate-assets:
 	@echo "Generating assets..."
-	@cd asset && go generate
+	@cd asset && go generate || (echo "Failed to generate assets" && exit 1)
 	@echo "Assets generated successfully!"
 
 # Build vermeer binary
@@ -74,12 +74,12 @@ help:
 	@echo ""
 	@echo "Usage:"
 	@echo "  make init              - First time setup (download binaries + go mod download)"
-	@echo "  make download-binaries - Download supervisord and protoc binaries"
-	@echo "  make generate-assets   - Generate assets_vfsdata.go from web UI"
-	@echo "  make build             - Build vermeer for current platform"
-	@echo "  make build-linux-amd64 - Build for Linux AMD64"
-	@echo "  make build-linux-arm64 - Build for Linux ARM64"
-	@echo "  make clean             - Remove generated files and binaries"
+	@echo "  make download-binaries - Download supervisord and protoc binaries for your platform"
+	@echo "  make generate-assets   - Generate assets_vfsdata.go from web UI (required before build)"
+	@echo "  make build             - Build vermeer for current platform (default: local architecture)"
+	@echo "  make build-linux-amd64 - Build for Linux AMD64 (for deployment)"
+	@echo "  make build-linux-arm64 - Build for Linux ARM64 (for ARM servers)"
+	@echo "  make clean             - Remove generated files and binaries (keep downloaded tools)"
 	@echo "  make clean-all         - Remove everything including downloaded tools"
-	@echo "  make all               - Generate assets and build (default)"
+	@echo "  make all               - Generate assets and build (default target)"
 	@echo "  make help              - Show this help message"

vermeer/README.md

@@ -77,10 +77,11 @@ make
 ./build.sh arm64
 ```
 
-The build process will automatically:
-1. Download required binary tools (supervisord, protoc)
-2. Generate web UI assets
-3. Build the vermeer binary
+# The script will:
+# - Auto-detect your OS and architecture if no parameter is provided
+# - Download required tools if not present
+# - Generate assets and build the binary
+# - Exit with error message if any step fails
 
 ### Build Targets
 

vermeer/README.zh-CN.md

@@ -78,9 +78,10 @@ make
 ```
 
 构建过程会自动:
-1. 下载所需的二进制工具(supervisord, protoc)
-2. 生成 Web UI 资源文件
-3. 构建 vermeer 二进制文件
+1. 自动检测操作系统和架构（如果未提供参数）
+2. 下载所需的二进制工具(supervisord, protoc)
+3. 生成 Web UI 资源文件
+4. 构建 vermeer 二进制文件
 
 ### 构建目标
 

vermeer/scripts/download_binaries.sh

@@ -23,7 +23,7 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 TOOLS_DIR="$PROJECT_ROOT/tools"
 
 # Versions
-SUPERVISORD_VERSION="4.2.5"
+SUPERVISORD_VERSION="0.6.9"
 PROTOC_VERSION="21.12"
 
 # Colors for output
@@ -167,14 +167,13 @@ main() {
 
     # Download supervisord for different platforms
     # MD5 checksums for supervisord v4.2.5
-    download_supervisord "linux_amd64" "x86_64" "" # Add MD5 if available
-    download_supervisord "linux_arm64" "aarch64" "" # Add MD5 if available
+    download_supervisord "linux_amd64" "64-bit" "" # Add MD5 if available
+    download_supervisord "linux_arm64" "ARM64" "" # Add MD5 if available
 
     # Download protoc for different platforms
     # MD5 checksums for protoc v21.12
     download_protoc "linux64" "linux-x86_64" "" # Add MD5 if available
     download_protoc "osxm1" "osx-aarch_64" "" # Add MD5 if available
-    download_protoc "win64" "win64" "" # Add MD5 if available
 
     log_info "All binary dependencies downloaded successfully!"
     log_info ""

vermeer/ui/ui/lib/bootstrap-4.3.1-dist/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2011-2019 Twitter, Inc.
+Copyright (c) 2011-2019 The Bootstrap Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.