Author: dreimer Date: Tue Apr 21 03:30:47 2009 New Revision: 40619
URL: http://svn.reactos.org/svn/reactos?rev=40619&view=rev Log: Hopefully a REAL FIX for our new setlocal eats up vars problem
Added: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rosb... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 @@ -33,51 +33,12 @@ goto :main )
-setlocal enabledelayedexpansion - set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% - -if not "!_ROSBE_ARCH!" == "" ( - set ROS_ARCH=!_ROSBE_ARCH! - set ROS_PREFIX=!_ROSBE_ARCH!-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!!_ROSBE_ARCH! - - REM HAXX - - if "!_ROSBE_ARCH!" == "arm" ( - set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH! - ) - if "!_ROSBE_ARCH!" == "ppc" ( - set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH! - ) - if "!_ROSBE_ARCH!" == "amd64" ( - set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH! - set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64 - ) - - REM Check if existant arch - - if not exist "!_ROSBE_TARGET_MINGWPATH!." ( - echo Unsupported arch specified. Fallback to Default. - pause - set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! - set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! - set ROS_ARCH= - set ROS_PREFIX= - set _ROSBE_TARGET_MINGWPATH= - ) -) - +"%_ROSBE_BASEDIR%\setlocal.cmd" :: :: Set up the GCC 4.x.x build environment. :: - -endlocal
:main
Added: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/setl... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (added) +++ trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd [iso-8859-1] Tue Apr 21 03:30:47 2009 @@ -1,0 +1,49 @@ +:: +:: PROJECT: RosBE - ReactOS Build Environment for Windows +:: LICENSE: GNU General Public License v2. (see LICENSE.txt) +:: FILE: Root/setlocal.cmd +:: PURPOSE: Bypass for the stupid setlocal in CMD Batch +:: COPYRIGHT: Copyright 2009 Daniel Reimer reimer.daniel@freenet.de +:: +:: +@echo off +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 1 ( + @echo on +) + + +if not "%_ROSBE_ARCH%" == "" ( + set ROS_ARCH=%_ROSBE_ARCH% + set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%%_ROSBE_ARCH% + + REM HAXX + + if "%_ROSBE_ARCH%" == "arm" ( + set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH% + ) + if "%_ROSBE_ARCH%" == "ppc" ( + set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH% + ) + if "%_ROSBE_ARCH%" == "amd64" ( + set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH% + set ROS_PREFIX=x86_64-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 + ) + + REM Check if existant arch + + if not exist "%_ROSBE_TARGET_MINGWPATH%." ( + echo Unsupported arch specified. Fallback to Default. + pause + set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% + set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% + set ROS_ARCH= + set ROS_PREFIX= + set _ROSBE_TARGET_MINGWPATH= + ) +)
Propchange: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd ------------------------------------------------------------------------------ svn:eol-style = native
-
dreimer＠svn.reactos.org