Author: cfinck Date: Tue Jan 26 23:27:04 2010 New Revision: 45277
URL: http://svn.reactos.org/svn/reactos?rev=45277&view=rev Log: - Remove --disable-werror where unsupported - Fix the Bash fallback value variable expansion
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/Ro... ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/RosBE-Builder.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -270,7 +270,7 @@ if rs_prepare_module "mpfr"; then export CFLAGS="$rs_host_cflags"
- rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --with-gmp="$rs_supportprefixdir" --disable-shared --disable-werror + rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --with-gmp="$rs_supportprefixdir" --disable-shared rs_do_command $rs_makecmd -j $rs_cpucount rs_do_command $rs_makecmd check rs_do_command $rs_makecmd install @@ -321,7 +321,7 @@ export CFLAGS="$rs_host_cflags"
cd "nasm" - rs_do_command ./configure --prefix="$rs_prefixdir" --disable-werror + rs_do_command ./configure --prefix="$rs_prefixdir" rs_do_command $rs_makecmd -j $rs_cpucount rs_do_command $rs_makecmd install rs_clean_module "nasm"
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/sc... ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/RosBE.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -7,13 +7,7 @@ # Released under GNU GPL v2 or any later version.
# Save the ReactOS source directory -if [ "$1" = "" ]; then - _ROSBE_ROSSOURCEDIR="$PWD" -else - _ROSBE_ROSSOURCEDIR="$1" -fi - -export _ROSBE_ROSSOURCEDIR +export _ROSBE_ROSSOURCEDIR="${1:-$PWD}"
# Get the absolute path to the script directory cd `dirname $0` @@ -45,7 +39,7 @@ source "$_ROSBE_ROSSCRIPTDIR/rosbelibrary.sh"
# Try to set the architecture to the one specified or fallback to "i386" -change_architecture "$3:-i386" +change_architecture "${3:-i386}"
# Display banner echo "*******************************************************************************"
Modified: trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/Base-i386/sc... ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Unix/Base-i386/scripts/clean.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -7,10 +7,10 @@ # Released under GNU GPL v2 or any later version.
# Check if the user set any custom filenames or pathes, otherwise locally set the appropriate variables. -ROS_AUTOMAKE="$ROS_AUTOMAKE:-makefile-$ROS_ARCH.auto" -ROS_INTERMEDIATE="$ROS_INTERMEDIATE:-obj-$ROS_ARCH" -ROS_OUTPUT="$ROS_OUTPUT:-output-$ROS_ARCH" -ROS_CDOUTPUT="$ROS_CDOUTPUT:-reactos." +ROS_AUTOMAKE="${ROS_AUTOMAKE:-makefile-$ROS_ARCH.auto}" +ROS_INTERMEDIATE="${ROS_INTERMEDIATE:-obj-$ROS_ARCH}" +ROS_OUTPUT="${ROS_OUTPUT:-output-$ROS_ARCH}" +ROS_CDOUTPUT="${ROS_CDOUTPUT:-reactos.}"
# Do some basic sanity checks to verify that we are working in a ReactOS source tree. # Consider that we also want to clean half-complete builds, so don't depend on too many existing files.
Modified: trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Buildtool... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Buildtoolchain/rosbe_1.5/buildtoolchain.sh [iso-8859-1] Tue Jan 26 23:27:04 2010 @@ -193,7 +193,7 @@ if rs_prepare_module "mpfr"; then export CFLAGS="$rs_host_cflags" - rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --host="$rs_target" --build="$rs_target" --with-gmp="$rs_supportprefixdir" --disable-shared --disable-werror + rs_do_command ../mpfr/configure --prefix="$rs_supportprefixdir" --host="$rs_target" --build="$rs_target" --with-gmp="$rs_supportprefixdir" --disable-shared rs_do_command $rs_makecmd -j $rs_cpucount rs_do_command $rs_makecmd check rs_do_command $rs_makecmd install