Synchronize up to trunk's revision r57784.

[reactos.git] / configure.sh

diff --git a/configure.sh b/configure.sh
index 8aea7b9..f5d289c 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -1,6 +1,6 @@
-#!/bin/bash
-if [ "x$ROS_ARCH" == "x" ]
-then
+#!/bin/sh
+
+if [ "x$ROS_ARCH" = "x" ]; then
   echo Could not detect RosBE.
   exit 1
 fi
@@ -9,35 +9,31 @@ BUILD_ENVIRONMENT=MinGW
 ARCH=$ROS_ARCH
 REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
 REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
+if [ "$1" = "ninja" ]; then
+CMAKE_GENERATOR="Ninja"
+else
+CMAKE_GENERATOR="Unix Makefiles"
+fi
 
-if [ "$REACTOS_SOURCE_DIR" == "$PWD" ]
-then
+if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
   echo Creating directories in $REACTOS_OUTPUT_PATH
-  mkdir -p $REACTOS_OUTPUT_PATH
+  mkdir -p "$REACTOS_OUTPUT_PATH"
   cd "$REACTOS_OUTPUT_PATH"
 fi
 
-mkdir -p host-tools
-mkdir -p reactos
+mkdir -p host-tools reactos
 
 echo Preparing host tools...
 cd host-tools
-if [ -f CMakeCache.txt ]
-then
-  rm -f CMakeCache.txt
-fi
+rm -f CMakeCache.txt
 
 REACTOS_BUILD_TOOLS_DIR="$PWD"
-cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
 
 echo Preparing reactos...
 cd ../reactos
-if [ -f CMakeCache.txt ]
-then
-  rm -f CMakeCache.txt
-fi
+rm -f CMakeCache.txt
 
-cmake -G "Unix Makefiles" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR"
 
 echo Configure script complete! Enter directories and execute appropriate build commands\(ex: make, makex, etc...\).
-