Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-05-28 16:21:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/; revision=57243
This commit is contained in:
Dmitry Gorbachev 2012-09-05 21:40:14 +00:00
parent 2dfa217c3c
commit e9301d98b4
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/configure.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/sh
if [ "x$ROS_ARCH" == "x" ]
then if [ "x$ROS_ARCH" = "x" ]; then
echo Could not detect RosBE. echo Could not detect RosBE.
exit 1 exit 1
fi fi
@ -10,34 +10,25 @@ ARCH=$ROS_ARCH
REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd) REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
if [ "$REACTOS_SOURCE_DIR" == "$PWD" ] if [ "$REACTOS_SOURCE_DIR" = "$PWD" ]; then
then
echo Creating directories in $REACTOS_OUTPUT_PATH echo Creating directories in $REACTOS_OUTPUT_PATH
mkdir -p $REACTOS_OUTPUT_PATH mkdir -p "$REACTOS_OUTPUT_PATH"
cd "$REACTOS_OUTPUT_PATH" cd "$REACTOS_OUTPUT_PATH"
fi fi
mkdir -p host-tools mkdir -p host-tools reactos
mkdir -p reactos
echo Preparing host tools... echo Preparing host tools...
cd host-tools cd host-tools
if [ -f CMakeCache.txt ] rm -f CMakeCache.txt
then
rm -f CMakeCache.txt
fi
REACTOS_BUILD_TOOLS_DIR="$PWD" REACTOS_BUILD_TOOLS_DIR="$PWD"
cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR" cmake -G "Unix Makefiles" -DARCH=$ARCH "$REACTOS_SOURCE_DIR"
echo Preparing reactos... echo Preparing reactos...
cd ../reactos cd ../reactos
if [ -f CMakeCache.txt ] rm -f CMakeCache.txt
then
rm -f CMakeCache.txt
fi
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 "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...\). echo Configure script complete! Enter directories and execute appropriate build commands\(ex: make, makex, etc...\).