chore: Update build_and_package.sh (#81)

Author: Eyizoha

build_and_package.sh

@@ -18,11 +18,13 @@ set -euo pipefail
 
 SOURCE_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 OUTPUT_DIR="$SOURCE_ROOT/output"
-BUILD_TYPE="release"
+BUILD_TYPE="Release"
+BUILD_DIR="$SOURCE_ROOT/build-release"
 BUILD_NAME="paimon-cpp"
 MAKE_CLEAN=false
 PACKAGE=false
-CMAKE_OPTIONS=""
+CMAKE_OPTIONS=()
+JOBS=""
 
 show_help() {
     cat << EOF
@@ -33,15 +35,16 @@ Options:
   -d, --debug       Build debug version
   -c, --clean       Clean build directory before building
   -p, --package     Package creation
+  -j, --jobs <num>  Number of parallel jobs for building (default: auto-detect)
   -h, --help        Show this help message
 
 CMake Options:
   Any unrecognized options will be passed directly to CMake.
   You can specify multiple CMake options.
 
 Examples:
-  $0 -r -p -DPAIMON_BUILD_SHARED=ON -DPAIMON_BUILD_STATIC=OFF
-  $0 --debug --clean --package
+  $0 -r -p -j 8 -DPAIMON_BUILD_SHARED=ON -DPAIMON_BUILD_STATIC=OFF
+  $0 --debug --clean --package --jobs 4
 
 EOF
 }
@@ -50,11 +53,14 @@ while [[ $# -gt 0 ]]; do
     case "$1" in
         -r|--release)
             BUILD_TYPE="Release"
+            BUILD_DIR="$SOURCE_ROOT/build-release"
+            BUILD_NAME="paimon-cpp"
             shift
             ;;
         -d|--debug)
             BUILD_TYPE="Debug"
-            BUILD_NAME=$BUILD_NAME"-debug"
+            BUILD_DIR="$SOURCE_ROOT/build-debug"
+            BUILD_NAME="paimon-cpp-debug"
             shift
             ;;
         -c|--clean)
@@ -65,27 +71,40 @@ while [[ $# -gt 0 ]]; do
             PACKAGE=true
             shift
             ;;
+        -j|--jobs)
+            shift
+            if [[ $# -gt 0 && $1 =~ ^[0-9]+$ ]]; then
+                JOBS="$1"
+                shift
+            else
+                echo "Error: -j/--jobs requires a numeric argument" >&2
+                exit 1
+            fi
+            ;;
         -h|--help)
             show_help
             exit 0
             ;;
         *)
             # All remaining parameters are CMake options
-            CMAKE_OPTIONS="$CMAKE_OPTIONS $1"
+            CMAKE_OPTIONS+=("$1")
             shift
             ;;
     esac
 done
 
-CMAKE_OPTIONS=$(echo "$CMAKE_OPTIONS" | xargs)
-
 echo "========== Build Configuration =========="
 echo "Build Type: $BUILD_TYPE"
 echo "Package Name: $BUILD_NAME"
 echo "Clean Build: $MAKE_CLEAN"
 echo "Package: $PACKAGE"
-if [ -n "$CMAKE_OPTIONS" ]; then
-    echo "CMake Options: $CMAKE_OPTIONS"
+if [ -n "$JOBS" ]; then
+    echo "Parallel Jobs: $JOBS"
+else
+    echo "Parallel Jobs: auto-detect"
+fi
+if [ ${#CMAKE_OPTIONS[@]} -gt 0 ]; then
+    echo "CMake Options: ${CMAKE_OPTIONS[*]}"
 else
     echo "CMake Options: None"
 fi
@@ -95,33 +114,39 @@ echo "Step 1: Downloading dependencies..."
 "$SOURCE_ROOT"/third_party/download_dependencies.sh
 
 echo "Step 2: Building Paimon..."
-BUILD_DIR="$SOURCE_ROOT/build-$BUILD_TYPE"
 PACKAGE_DIR="$OUTPUT_DIR/$BUILD_NAME"
 
 if [ "$MAKE_CLEAN" = true ]; then
+    echo "Cleaning build directory: $BUILD_DIR"
     rm -rf "$BUILD_DIR"
 fi
 mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
+
 CMAKE_ARGS=(
+    -G "Ninja"
     -DCMAKE_BUILD_TYPE="$BUILD_TYPE"
     -DCMAKE_INSTALL_PREFIX="$PACKAGE_DIR"
 )
 
-if [ -n "$CMAKE_OPTIONS" ]; then
-    CMAKE_ARGS+=("$CMAKE_OPTIONS")
+if [ ${#CMAKE_OPTIONS[@]} -gt 0 ]; then
+    CMAKE_ARGS+=("${CMAKE_OPTIONS[@]}")
 fi
 
 cmake "${CMAKE_ARGS[@]}" ..
 
-JOBS=$(nproc 2>/dev/null || echo 4)
-make -j"$JOBS"
+# Set default JOBS if not specified
+if [ -z "$JOBS" ]; then
+    JOBS=$(nproc 2>/dev/null || echo 4)
+fi
+
+ninja -j"$JOBS"
 
 if [ "$PACKAGE" = true ]; then
     echo "Step 3: Packaging..."
     mkdir -p "$OUTPUT_DIR"
     cd "$BUILD_DIR"
-    make install
+    ninja install
     tar -czvf "$OUTPUT_DIR/$BUILD_NAME.tar.gz" -C "$OUTPUT_DIR" "$BUILD_NAME"
     echo "Package created: $OUTPUT_DIR/$BUILD_NAME.tar.gz"
 else