[ros-diffs] [spetreolle] 52192: [CMAKE] configure : Remove reactos cache. Fix echo syntax.

spetreolle at svn.reactos.org spetreolle at svn.reactos.org
Sat Jun 11 17:03:03 UTC 2011


Author: spetreolle
Date: Sat Jun 11 17:03:03 2011
New Revision: 52192

URL: http://svn.reactos.org/svn/reactos?rev=52192&view=rev
Log:
[CMAKE]
configure :
Remove reactos cache.
Fix echo syntax.


Modified:
    trunk/reactos/configure.sh

Modified: trunk/reactos/configure.sh
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=52192&r1=52191&r2=52192&view=diff
==============================================================================
--- trunk/reactos/configure.sh [iso-8859-1] (original)
+++ trunk/reactos/configure.sh [iso-8859-1] Sat Jun 11 17:03:03 2011
@@ -10,7 +10,6 @@
 REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
 REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
 
-echo ARCH $ARCH ROS $ROS_ARCH
 if [ "$REACTOS_SOURCE_DIR" == "$PWD" ]
 then
   echo Creating directories in $REACTOS_OUTPUT_PATH
@@ -31,8 +30,14 @@
 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
+
 cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.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...\).
 




More information about the Ros-diffs mailing list