Remove "bashisms" from configure.sh script, simplify it a bit.

svn path=/trunk/; revision=57243
This commit is contained in:
Dmitry Gorbachev 2012-09-05 21:40:14 +00:00
parent 2dfa217c3c
commit e9301d98b4

View file

@ -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
@ -10,34 +10,25 @@ ARCH=$ROS_ARCH
REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
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"
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"
echo Configure script complete! Enter directories and execute appropriate build commands\(ex: make, makex, etc...\).