Merge pull request #32 from pythonlover02/next

Update the build scripts and add make-release.sh

Author: pythonlover02

.gitignore

@@ -10,7 +10,8 @@ __pycache__/
 .Python
 build/
 py_env/
-release/
+bin/
+releases/
 develop-eggs/
 dist/
 downloads/

README.md

@@ -136,12 +136,12 @@ If this software is not provided, its options will be locked.
 
    Using Pyinstaller:
    ```bash
-   ./build-pyinstaller.sh
+   ./make-pyinstaller.sh
    ```
 
    Using Nuitka:
    ```bash
-   ./build-nuitka.sh
+   ./make-nuitka.sh
    ```
 
    *Note: Both use a Python virtual environment to avoid system wide package installation using pip*
@@ -220,8 +220,8 @@ volt flatpak run net.pcsx2.PCSX2
 
 ## Render Selector explained:
 
-- `Select OpenGL Renderer (Mesa)` Selects the GPU/Renderer that will be used to render OpenGL programs. Those GPUs are obtained trough `glxinfo`.
-- `Select Vulkan Renderer` Selects the GPU/Renderer that will be used to render Vulkan programs. Those GPUs are obtained trough `vulkaninfo`, also for this to work on some distros you might need to install some additional dependencies like `vulkan-mesa-layers` on Arch Linux.
+- `Select OpenGL Renderer` Selects the GPU/Renderer that will be used to render OpenGL programs. Those GPUs are obtained trough `glxinfo`.
+- `Select Vulkan Renderer` Selects the GPU/Renderer that will be used to render Vulkan programs. Those GPUs are obtained trough `vulkaninfo`, also for this to work on some distros you might need to install some additional dependencies like `vulkan-mesa-layers` on Arch Linux. More info its provided on the Welcome Window that opens once you open volt-gui.
 
 ## Technical References:
 

install.sh

@@ -11,20 +11,20 @@ fi
 
 # Configuration
 INSTALL_DIR="/usr/local/bin"
-RELEASE_DIR="release"
-EXECUTABLE="$RELEASE_DIR/volt-gui"
+BIN_DIR="bin"
+EXECUTABLE="$BIN_DIR/volt-gui"
 HELPER_SCRIPT="scripts/volt-helper"
 DESKTOP_FILE="/usr/share/applications/volt-gui.desktop"
 
-# Check release directory
-if [[ ! -d "$RELEASE_DIR" ]]; then
-  echo -e "\033[31mError: Release directory not found. Run build.sh first.\033[0m" >&2
+# Check bin directory
+if [[ ! -d "$BIN_DIR" ]]; then
+  echo -e "\033[31mError: bin directory not found. Run make-pyinstaller.sh or make-nuitka.sh first.\033[0m" >&2
   exit 1
 fi
 
 # Check main executable
 if [[ ! -f "$EXECUTABLE" ]]; then
-  echo -e "\033[31mError: Executable 'volt-gui' not found in release directory. Run build.sh first.\033[0m" >&2
+  echo -e "\033[31mError: Executable 'volt-gui' not found in bin directory. Run make-pyinstaller.sh or make-nuitka.sh first.\033[0m" >&2
   exit 1
 fi
 

build-nuitka.sh renamed to make-nuitka.sh

@@ -15,7 +15,7 @@ VENV_DIR="py_env"
 REQ_FILE="requirements.txt"
 REQ_HASH_FILE="$VENV_DIR/requirements.sha256"
 SRC_FILE="src/volt-gui.py"
-RELEASE_DIR="release"
+BIN_DIR="bin"
 BASE_FILENAME=$(basename "$SRC_FILE" .py)
 
 # Nuitka options for the application
@@ -83,10 +83,10 @@ build_executable() {
     fi
 }
 
-# Move to release directory
-move_to_release() {
-    mkdir -p "$RELEASE_DIR"
-    mv "$BASE_FILENAME" "$RELEASE_DIR/" 2>/dev/null || true
+# Move to bin directory
+move_to_bin() {
+    mkdir -p "$BIN_DIR"
+    mv "$BASE_FILENAME" "$BIN_DIR/" 2>/dev/null || true
 }
 
 # Main execution
@@ -102,14 +102,14 @@ main() {
 
     update_dependencies
     build_executable
-    move_to_release
+    move_to_bin
 
     echo -e "\n${GREEN}Build successful!${NC}"
-    echo -e "Executable: ${YELLOW}$RELEASE_DIR/$(basename "$BASE_FILENAME")${NC}"
+    echo -e "Executable: ${YELLOW}$BIN_DIR/$(basename "$BASE_FILENAME")${NC}"
 
     # Show file size
     if command -v du &> /dev/null; then
-        local size=$(du -h "$RELEASE_DIR"/* 2>/dev/null | cut -f1 || echo "Unknown")
+        local size=$(du -h "$BIN_DIR"/* 2>/dev/null | cut -f1 || echo "Unknown")
         echo -e "File size: ${YELLOW}$size${NC}"
     fi
 }

build-pyinstaller.sh renamed to make-pyinstaller.sh

@@ -15,7 +15,7 @@ VENV_DIR="py_env"
 REQ_FILE="requirements.txt"
 REQ_HASH_FILE="$VENV_DIR/requirements.sha256"
 SRC_FILE="src/volt-gui.py"
-RELEASE_DIR="release"
+BIN_DIR="bin"
 BASE_FILENAME=$(basename "$SRC_FILE" .py)
 SPEC_FILE="$BASE_FILENAME.spec"
 
@@ -82,10 +82,10 @@ build_executable() {
     fi
 }
 
-# Move to release directory
-move_to_release() {
-    mkdir -p "$RELEASE_DIR"
-    mv "dist/$BASE_FILENAME" "$RELEASE_DIR/" 2>/dev/null || true
+# Move to bin directory
+move_to_bin() {
+    mkdir -p "$BIN_DIR"
+    mv "dist/$BASE_FILENAME" "$BIN_DIR/" 2>/dev/null || true
 }
 
 # Main execution
@@ -101,14 +101,14 @@ main() {
 
     update_dependencies
     build_executable
-    move_to_release
+    move_to_bin
 
     echo -e "\n${GREEN}Build successful!${NC}"
-    echo -e "Executable: ${YELLOW}$RELEASE_DIR/$BASE_FILENAME${NC}"
+    echo -e "Executable: ${YELLOW}$BIN_DIR/$BASE_FILENAME${NC}"
 
     # Show file size
     if command -v du &> /dev/null; then
-        local size=$(du -h "$RELEASE_DIR"/* 2>/dev/null | cut -f1 || echo "Unknown")
+        local size=$(du -h "$BIN_DIR"/* 2>/dev/null | cut -f1 || echo "Unknown")
         echo -e "File size: ${YELLOW}$size${NC}"
     fi
 }

make-release.sh

@@ -0,0 +1,107 @@
+#!/bin/bash
+# Exit immediately on errors, unset variables, and pipe failures
+set -euo pipefail
+
+# Color definitions
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+CYAN='\033[0;36m'
+NC='\033[0m' # No Color
+
+# Configuration
+RELEASE_DIR="releases"
+PYINSTALLER_BUILD="volt-gui-pyinstaller"
+NUITKA_BUILD="volt-gui-nuitka"
+BUILD_SCRIPTS=("make-pyinstaller.sh" "make-nuitka.sh")
+
+# Cleanup function
+cleanup() {
+    # Remove any temporary files if needed
+    true
+}
+
+# Check for required commands
+check_commands() {
+    local commands=("tar" "cp" "mkdir")
+    for cmd in "${commands[@]}"; do
+        if ! command -v "$cmd" &> /dev/null; then
+            echo -e "${RED}Error: Required command '$cmd' not found${NC}" >&2
+            exit 1
+        fi
+    done
+}
+
+# Execute build script and copy artifacts
+build_and_copy() {
+    local build_script=$1
+    local target_dir=$2
+    
+    echo -e "${CYAN}Executing build script: $build_script${NC}"
+    # Run build script from the project root directory
+    if ! (cd .. && ./"$build_script"); then
+        echo -e "${RED}Error: Build script $build_script failed${NC}" >&2
+        exit 1
+    fi
+    
+    echo -e "${CYAN}Copying artifacts to $target_dir${NC}"
+    mkdir -p "$target_dir"
+    
+    # Copy required files and directories from project root
+    for item in bin install.sh remove.sh scripts; do
+        if [[ -e "../$item" ]]; then
+            cp -r "../$item" "$target_dir/"
+        else
+            echo -e "${YELLOW}Warning: $item not found, skipping${NC}"
+        fi
+    done
+}
+
+# Compress directory
+compress_release() {
+    local dir_name=$1
+    echo -e "${CYAN}Compressing $dir_name to ${dir_name}.tar.gz${NC}"
+    tar -czf "${dir_name}.tar.gz" "$dir_name"
+}
+
+# Main execution
+main() {
+    trap cleanup EXIT
+    check_commands
+    
+    # Store the original directory
+    ORIGINAL_DIR=$(pwd)
+    
+    # Remove and recreate release directory
+    echo -e "${CYAN}Preparing release directory...${NC}"
+    rm -rf "$RELEASE_DIR"
+    mkdir -p "$RELEASE_DIR"
+    cd "$RELEASE_DIR"
+    
+    # Process PyInstaller build
+    echo -e "\n${YELLOW}=== Processing PyInstaller Build ===${NC}"
+    build_and_copy "${BUILD_SCRIPTS[0]}" "$PYINSTALLER_BUILD"
+    compress_release "$PYINSTALLER_BUILD"
+    
+    # Process Nuitka build
+    echo -e "\n${YELLOW}=== Processing Nuitka Build ===${NC}"
+    build_and_copy "${BUILD_SCRIPTS[1]}" "$NUITKA_BUILD"
+    compress_release "$NUITKA_BUILD"
+    
+    # Return to original directory
+    cd "$ORIGINAL_DIR"
+    
+    echo -e "\n${GREEN}Release build completed successfully!${NC}"
+    echo -e "Created archives in ${YELLOW}$RELEASE_DIR${NC}:"
+    echo -e "  ${YELLOW}${PYINSTALLER_BUILD}.tar.gz${NC}"
+    echo -e "  ${YELLOW}${NUITKA_BUILD}.tar.gz${NC}"
+    
+    # Show archive sizes
+    if command -v du &> /dev/null; then
+        echo -e "\nArchive sizes:"
+        du -h "$RELEASE_DIR"/*.tar.gz | sed 's/^/  /'
+    fi
+}
+
+# Run main function
+main