Tidying

source/build.sh

@@ -1,86 +1,45 @@
 #!/bin/bash
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+OUTPUT_DIR=${SCRIPT_DIR}/output
+INSTALL_DIR=${HOME}/.local/bin
+mkdir -p ${OUTPUT_DIR}
 
 # Exit on error
 set -e
 
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-JOBS=4
-# Determine number of CPU cores for parallel build
-if command -v nproc >/dev/null 2>&1; then
-    JOBS=$(nproc)
-fi
-
-# Function to print status messages
-print_status() {
-    echo -e "${GREEN}[*] $1${NC}"
-}
-
-print_error() {
-    echo -e "${RED}[!] $1${NC}"
-}
-
-print_warning() {
-    echo -e "${YELLOW}[!] $1${NC}"
-}
-
 # ensure we have latest dehydrate.
 dehydrate -u
 
-# Check if build directory exists, if not create it
-if [ ! -d "build" ]; then
-    print_status "Creating build directory..."
-    mkdir build
-fi
 
-# Enter build directory
-cd build
+function build_native() {
+    local BUILDDIR=${SCRIPT_DIR}/build/native
+    local PREVDIR=$PWD
+    local JOBS=$(nproc) # Set JOBS to the number of available CPU cores
+    mkdir -p ${BUILDDIR}
+    cd ${SCRIPT_DIR}
 
-# Check if CMake is installed
-if ! command -v cmake &> /dev/null; then
-    print_error "CMake is not installed. Please install CMake first."
-    exit 1
-fi
+    cmake -B ${BUILDDIR} -G Ninja \
+        -DCMAKE_BUILD_TYPE=Debug \
+        -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
+        -DCMAKE_LINKER=mold \
+        -DCMAKE_C_COMPILER=clang \
+        -DCMAKE_CXX_COMPILER=clang++
 
-# Check if Ninja is installed
-if ! command -v ninja &> /dev/null; then
-    print_error "Ninja is not installed. Please install Ninja first."
-    exit 1
-fi
-
-# Check if ccache is installed
-if ! command -v ccache &> /dev/null; then
-    print_warning "ccache is not installed. Builds will be slower without it."
-    print_warning "Consider installing ccache for faster builds."
-fi
-
-# Configure with CMake
-print_status "Configuring with CMake..."
-cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-
-# Build the project
-print_status "Building project..."
+    cd ${BUILDDIR}
     ninja -j"$JOBS"
 
-# Check if build was successful
-if [ $? -eq 0 ]; then
-    print_status "Build successful!"
-else
-    print_error "Build failed!"
-    exit 1
-fi
+    upx ${BUILDDIR}/dropshell
+    cp ${BUILDDIR}/dropshell ${OUTPUT_DIR}/dropshell
 
-print_status "Auto-installing dropshell locally..."
-mkdir -p "${HOME}/.local/bin"
-cp "$SCRIPT_DIR/build/dropshell" "${HOME}/.local/bin/dropshell"
+    cd ${PREVDIR}
+}
 
-# Return to original directory
-cd ..
+build_native
 
-print_status "Build process completed!" 
+echo "Auto-installing dropshell locally..."
+mkdir -p "${INSTALL_DIR}"
+cp "${OUTPUT_DIR}/dropshell" "${INSTALL_DIR}/dropshell"
+ds version
+echo "Build process completed!" 

source/multibuild.sh

@@ -1,11 +1,15 @@
 #!/bin/bash
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
 # Create output directory
-mkdir -p output
+mkdir -p ${SCRIPT_DIR}/output
 
 
 function build_arch() {
     local arch=$1
+    local PREVDIR=$PWD
+    cd ${SCRIPT_DIR}
 
     if [ ! -f "${HOME}/.musl-cross/${arch}-linux-musl-cross/bin/${arch}-linux-musl-c++" ]; then
         echo "Musl cross compiler for ${arch} not found. Please run install_build_prerequisites.sh first."
@@ -16,14 +20,16 @@ function build_arch() {
     CC="${HOME}/.musl-cross/${arch}-linux-musl-cross/bin/${arch}-linux-musl-gcc"
     CXX="${HOME}/.musl-cross/${arch}-linux-musl-cross/bin/${arch}-linux-musl-g++"
 
-    BUILDDIR=build/${arch}
+    BUILDDIR=${SCRIPT_DIR}/build/${arch}
     mkdir -p ${BUILDDIR}
 
     cmake -B ${BUILDDIR} -G Ninja -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX}
     cmake --build ${BUILDDIR}
 
     upx ${BUILDDIR}/dropshell
-    cp ${BUILDDIR}/dropshell output/dropshell.${arch}
+    cp ${BUILDDIR}/dropshell ${SCRIPT_DIR}/output/dropshell.${arch}
+    
+    cd ${PREVDIR}
 }
 
 build_arch x86_64