Index: Setup/bake.bat ================================================================== --- Setup/bake.bat +++ Setup/bake.bat @@ -37,17 +37,24 @@ ) ) %_VECHO% Framework = '%FRAMEWORK%' -IF "%PROCESSOR_ARCHITECTURE%"=="x86" GOTO set_path_32 -SET PATH=%ProgramFiles(x86)%\Inno Setup 5;%PATH% +IF "%PROCESSOR_ARCHITECTURE%" == "x86" GOTO set_path_x86 + +SET INNOSETUPPATH=%ProgramFiles(x86)%\Inno Setup 5 GOTO set_path_done -:set_path_32 -SET PATH=%ProgramFiles%\Inno Setup 5;%PATH% + +:set_path_x86 + +SET INNOSETUPPATH=%ProgramFiles%\Inno Setup 5 + :set_path_done +CALL :fn_PrependToPath INNOSETUPPATH + +%_VECHO% InnoSetupPath = '%INNOSETUPPATH%' %_VECHO% Path = '%PATH%' %__ECHO% ISCC.exe "%TOOLS%\data\SQLite.iss" "/dAppId=%APPID%" "/dAppPublicKey=%PUBLICKEY%" "/dAppURL=%URL%" "/dIsNetFx2=%ISNETFX2%" "/dVcRuntime=%VCRUNTIME%" "/dAppConfiguration=%CONFIGURATION%" "/dAppPlatform=%PLATFORM%" "/dAppProcessor=%PROCESSOR%" "/dFramework=%FRAMEWORK%" "/dYear=%YEAR%" IF %ERRORLEVEL% NEQ 0 ( @@ -65,10 +72,22 @@ ) ENDLOCAL && ( SET %1=%VALUE% ) GOTO :EOF + +:fn_PrependToPath + IF NOT DEFINED %1 GOTO :EOF + SETLOCAL + SET __ECHO_CMD=ECHO %%%1%% + FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( + SET VALUE=%%V + ) + SET VALUE=%VALUE:"=% + REM " + ENDLOCAL && SET PATH=%VALUE%;%PATH% + GOTO :EOF :fn_ResetErrorLevel VERIFY > NUL GOTO :EOF Index: Setup/build.bat ================================================================== --- Setup/build.bat +++ Setup/build.bat @@ -283,11 +283,11 @@ IF ERRORLEVEL 1 ( ECHO Could not change directory to "%ROOT%". GOTO errors ) -SET PATH=%BUILDTOOLDIR%;%PATH% +CALL :fn_PrependToPath BUILDTOOLDIR %_VECHO% Path = '%PATH%' IF NOT DEFINED SOLUTION ( IF DEFINED COREONLY ( @@ -603,10 +603,22 @@ ) SET VALUE=%VALUE:"=% REM " ENDLOCAL && SET %1=%VALUE% GOTO :EOF + +:fn_PrependToPath + IF NOT DEFINED %1 GOTO :EOF + SETLOCAL + SET __ECHO_CMD=ECHO %%%1%% + FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( + SET VALUE=%%V + ) + SET VALUE=%VALUE:"=% + REM " + ENDLOCAL && SET PATH=%VALUE%;%PATH% + GOTO :EOF :fn_CopyVariable IF NOT DEFINED %1 GOTO :EOF IF "%2" == "" GOTO :EOF SETLOCAL Index: Setup/test_ce_200x.bat ================================================================== --- Setup/test_ce_200x.bat +++ Setup/test_ce_200x.bat @@ -33,12 +33,15 @@ SET TOOLS=%~dp0 SET TOOLS=%TOOLS:~0,-1% %_VECHO% Tools = '%TOOLS%' -SET PATH=%ROOT%\Externals\Eagle\bin;%PATH% +SET EAGLEBINDIR=%ROOT%\Externals\Eagle\bin + +CALL :fn_PrependToPath EAGLEBINDIR +%_VECHO% EagleBinDir = '%EAGLEBINDIR%' %_VECHO% Path = '%PATH%' %__ECHO3% CALL "%TOOLS%\vsSp.bat" IF ERRORLEVEL 1 ( @@ -135,10 +138,22 @@ ) ELSE ( ENDLOCAL ) CALL :fn_ResetErrorLevel GOTO :EOF + +:fn_PrependToPath + IF NOT DEFINED %1 GOTO :EOF + SETLOCAL + SET __ECHO_CMD=ECHO %%%1%% + FOR /F "delims=" %%V IN ('%__ECHO_CMD%') DO ( + SET VALUE=%%V + ) + SET VALUE=%VALUE:"=% + REM " + ENDLOCAL && SET PATH=%VALUE%;%PATH% + GOTO :EOF :fn_ResetErrorLevel VERIFY > NUL GOTO :EOF