Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit

Permalink
- removed RVDS targets and settings as MDK and RVDS now share the sam…
Browse files Browse the repository at this point in the history 
…e compiler

removed unsupported setenv_xxx scripts
- removed unsupported targets from setenv_base
- updated setenv_base so that setenv_mdk will work with default install location of current MDK tools (e.g. MDK_v5 or MDK) non-standard installations still require the path as a paramter to the setenv_mdk script.
  • Loading branch information
@smaillet-ms
smaillet-ms committed May 21, 2015
1 parent 0cbba11 commit c7d1200
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 757 deletions.
3 changes: 0 additions & 3 deletions setenv.cmd
View file

This file was deleted.

200 changes: 8 additions & 192 deletions setenv_base.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pushd %SPOCLIENT%\..
SET SPOROOT=%CD%
popd

@REM - Load the user aliases if alias.txt exists
if EXIST alias.txt DOSKEY /macrofile=alias.txt

set NetMfTargetsBaseDir=%SPOCLIENT%\Framework\IDE\Targets\
Expand All @@ -63,26 +64,22 @@ goto :restore_path_from_old
set DOTNETMF_OLD_PATH=%PATH%
goto :after_path_saved_or_restored


:restore_path_from_old
set PATH=%DOTNETMF_OLD_PATH%

:after_path_saved_or_restored

set PATH=%SPOROOT%\tools\NUnit;%SPOROOT%\tools\SDPack;%SPOROOT%\bin;%PATH%
set PATH=%SPOROOT%\bin;%PATH%
set PATH=%SPOROOT%\tools\x86\perl\bin;%SPOROOT%\tools\x86\bin;%CLRROOT%\tools\bin;%PATH%;%CLRROOT%\tools\scripts
set PATH=%CLRROOT%\BuildOutput\Public\%FLAVOR_WIN%\Test\Server\dll;%PATH%

cd %CURRENTCD%

set CURRENTCD=

rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
rem set tool-chains variables

IF /I NOT "%COMPILER_TOOL%" == "VS" (
IF NOT "%VS140COMNTOOS%" == "" (
CALL "%VS140COMNTOOS%"vsvars32.bat
IF NOT "%VS140COMNTOOLS%" == "" (
CALL "%VS140COMNTOOLS%"vsvars32.bat
) ELSE (
@ECHO WARNING: Could not find vsvars32.bat.
@ECHO WARNING: VISUAL STUDIO 2015 DOES NOT APPEAR TO BE INSTALLED ON THIS MACHINE
Expand All @@ -93,142 +90,17 @@ IF /I NOT "%COMPILER_TOOL%" == "VS" (
set TINYCLR_USE_MSBUILD=1

Title MF %FLAVOR_WIN% (%COMPILER_TOOL% %COMPILER_TOOL_VERSION_NUM%)
rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
rem set tool-chain specific environment variables

IF /I "%COMPILER_TOOL%"=="VS" GOTO :SET_VS_VARS

IF /I "%COMPILER_TOOL%"=="ADI" GOTO :SET_BLACKFIN_VARS
IF /I "%COMPILER_TOOL%"=="GCC" GOTO :SET_GCC_VARS
IF /I "%COMPILER_TOOL%"=="GCCOP" GOTO :SET_GCC_VARS
IF /I "%COMPILER_TOOL%"=="MDK" GOTO :SET_MDK_VARS

IF /I "%COMPILER_TOOL%"=="SHC" GOTO :SET_SHC_VARS

IF /I "%COMPILER_TOOL%"=="ADS" GOTO :SET_RVDS_VARS
IF /I "%COMPILER_TOOL%"=="RVDS" GOTO :SET_RVDS_VARS


IF "%COMPILER_TOOL%"=="" GOTO :ERROR

GOTO :EOF

rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
:SET_RVDS_VARS
REM dotnetmf team internal setting
set DOTNETMF_COMPILER=%COMPILER_TOOL_VERSION%
SET RVDS_EXT=_v%COMPILER_TOOL_VERSION_NUM:.=_%
SET RVCT_EXT=%COMPILER_TOOL_VERSION_NUM:.=%

IF /I "%COMPILER_TOOL_VERSION_NUM%"=="1.2" (
SET RVDS_EXT=
SET DOTNETMF_COMPILER=ADS1.2

IF NOT "%ARMROOT%" == "%SPOCLIENT%\tools\ads" (
IF NOT "" == "%ARMHOME%" GOTO :SET_RVDS_V12_VARS
)
)

setlocal EnableDelayedExpansion
IF /I NOT "%COMPILER_TOOL_VERSION_NUM%"=="4.1" (
SET TMPBIN=!RVCT%RVCT_EXT%BIN!
SET TMPINC=!RVCT%RVCT_EXT%INC!
SET TMPLIB=!RVCT%RVCT_EXT%LIB!
) ELSE (
SET TMPBIN=%ARMCC41BIN%
SET TMPINC=%ARMCC41INC%
SET TMPLIB=%ARMCC41LIB%
)
endlocal && SET TMPBIN=%TMPBIN%&& SET TMPINC=%TMPINC%&& SET TMPLIB=%TMPLIB%

IF NOT EXIST "%SPOCLIENT%\tools\ads%RVDS_EXT%\BIN\ARMAR.exe" (
IF /I NOT "%ARMROOT%" == "%SPOCLIENT%\tools\ads%RVDS_EXT%" (
IF NOT "" == "%TMPBIN%" (
IF EXIST "%TMPBIN%\armar.exe" (

@echo Using Installed RVDS vars

SET NO_ADS_WRAPPER=1
SET ARMHOME=%ARMROOT%
SET ARMBIN=%TMPBIN%
SET ARMLIB=%TMPLIB%
SET ARMINC=%TMPINC%
SET ADS_TOOLS=%ARMROOT%
SET ADS_TOOLS_BIN=%TMPBIN%
SET RVDS_INSTALLED=TRUE

SET TMPBIN=
SET TMPINC=
SET TMPLIB=
GOTO :EOF
))))

@echo setting source depot RVDS vars

SET TMPBIN=
SET TMPINC=
SET TMPLIB=

set PATH=%CLRROOT%\tools\ads%RVDS_EXT%\bin;%PATH%
set ARMROOT=%SPOCLIENT%\tools\ads%RVDS_EXT%
set ARMHOME=%ARMROOT%
set ARMLMD_LICENSE_FILE=%ARMROOT%\licenses\license.dat
set ADS_TOOLS=%ARMROOT%
set ARMCONF=%ARMROOT%\BIN
set ARMINC=%ARMROOT%\INCLUDE
set ARMDLL=%ARMROOT%\BIN
set ARMLIB=%ARMROOT%\LIB
set ARMBIN=%ARMROOT%\BIN
set ADS_TOOLS_BIN=%ADS_TOOLS%\BIN

IF NOT "%RVCT_EXT%"=="" (
set RVCT%RVCT_EXT%BIN=%ARMBIN%
set RVCT%RVCT_EXT%INC=%ARMINC%
set RVCT%RVCT_EXT%LIB=%ARMLIB%
)

GOTO :EOF


rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
:SET_RVDS_V12_VARS
@echo setting vars for RVDS 1.2 compiler
SET COMPILER_TOOL=RVDS
set DOTNETMF_COMPILER=ADS%COMPILER_TOOL_VERSION_NUM%

set ARMROOT=%ARMHOME%
set ADS_TOOLS_BIN=%ARMDLL%
GOTO :EOF


rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
:SET_BLACKFIN_VARS
@ECHO Setting ADI env var and path

set NO_ADS_WRAPPER=1
set DOTNETMF_COMPILER=ADI%COMPILER_TOOL_VERSION_NUM%


IF NOT "%ARG%" == "" GOTO :DSP_INSTALLED
IF NOT "%ADI_DSP%" == "" GOTO :DSP_INSTALLED

set ADI_DSP=%CLRROOT%\tools\adi\
set ANALOGD_LECENSE_FILE=%ADI_DSP%\license.dat

echo adding HKLM\Software\Analog Devices\VisualDSP++ %COMPILER_TOOL_VERSION_NUM%\Install Path=%ADI_DSP%
call reg add "HKLM\Software\Analog Devices" /f
call reg add "HKLM\Software\Analog Devices\VisualDSP++ %COMPILER_TOOL_VERSION_NUM%" /f
call reg add "HKLM\Software\Analog Devices\VisualDSP++ %COMPILER_TOOL_VERSION_NUM%" /f /v "Install Path" /t REG_SZ /d %ADI_DSP%
echo adding HKLM\Software\Analog Devices\VisualDSP++ %COMPILER_TOOL_VERSION_NUM%\License Path=%ADI_DSP%
call reg add "HKLM\Software\Analog Devices\VisualDSP++ %COMPILER_TOOL_VERSION_NUM%" /f /v "License Path" /t REG_SZ /d %ADI_DSP%

:DSP_INSTALLED

IF "%ADI_DSP%"=="" set ADI_DSP=%ARG3%

set PATH=%ADI_DSP%;%PATH%

GOTO :EOF


rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
:SET_GCC_VARS
@echo setting vars for GCC compiler %COMPILER_TOOL_VERSION%
Expand Down Expand Up @@ -257,22 +129,6 @@ set GNU_TARGET=arm-none-eabi
GOTO :BAD_GCC_ARG
))


IF /I "%COMPILER_TOOL%"=="GCCOP" (
IF EXIST "%ARG3%\include\elips_bs" (

set ARMINC=%ARG3%\include\elips_bs
set ARMLIB=%ARG3%\lib
set GNU_TOOLS=%ARG3%
set GNU_TOOLS_BIN=%ARG3%\bin
set GNU_TARGET=arm-elf
set COMPILER_PATH=%ARG3%

) ELSE (
@ECHO Could not find %ARG3%\include\elips_bs
GOTO :BAD_GCC_ARG
))

GOTO :EOF

:BAD_GCC_ARG
Expand All @@ -291,7 +147,8 @@ rem use a default for MDK
set NO_ADS_WRAPPER=1
set DOTNETMF_COMPILER=%COMPILER_TOOL_VERSION%

IF "%ARG3%"=="" set ARG3=%SystemDrive%\Keil\ARM
IF "%ARG3%"=="" set ARG3=%SystemDrive%\Keil_v5\ARM
IF NOT EXIST "%ARG3%" set ARG3=%SystemDrive%\Keil\ARM
IF NOT EXIST "%ARG3%" GOTO :BAD_MDK_ARG

SET MDK_TOOL_PATH=%ARG3%
Expand Down Expand Up @@ -329,9 +186,6 @@ GOTO :EOF

rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
:SET_VS_VARS
set VSSDK12INSTALLDIR=%SPOROOT%\tools\x86\MicrosoftSDKs\VSSDK\vs12\
if NOT EXIST "%VSSDK12INSTALLDIR%" set VSSDK12INSTALLDIR=%VSSDK120Install%

set VSSDK14INSTALLDIR=%SPOROOT%\tools\x86\MicrosoftSDKs\VSSDK\vs14\
if NOT EXIST "%VSSDK14INSTALLDIR%" set VSSDK14INSTALLDIR=%VSSDK140Install%

Expand All @@ -351,41 +205,3 @@ IF "%COMPILER_TOOL_VERSION_NUM%"=="14" (
@ECHO.

GOTO :EOF

rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
:SET_SHC_VARS

SET COMPILER_TOOL=SHC
set NO_ADS_WRAPPER=1
set DOTNETMF_COMPILER=%COMPILER_TOOL_VERSION%
SET SHC_VER_PATH=%COMPILER_TOOL_VERSION_NUM:.=_%

IF "%ARG3%"=="" (
SET SHC_TOOL_PATH=%SPOCLIENT%\tools\SH\%SHC_VER_PATH%
) ELSE (
SET SHC_TOOL_PATH=%ARG3:"=%
)

IF NOT EXIST "%SHC_TOOL_PATH%\BIN\SHCPP.exe" SET SHC_TOOL_PATH=%SHC_TOOL_ROOT%%SHC_VER_PATH%

IF NOT EXIST "%SHC_TOOL_PATH%\BIN\SHCPP.exe" GOTO :BAD_SHC_ARG

set PATH=%SHC_TOOL_PATH%\bin;%PATH%
set SHC_LIB=%SHC_TOOL_PATH%\bin
set SHC_INC=%SHC_TOOL_PATH%\include
set SHC_TMP=%SHC_TOOL_PATH%\CTemp
set SHC_TOOLS_BIN=%SHC_TOOL_PATH%\bin

GOTO :EOF

:BAD_SHC_ARG
SET SHC_TOOL_PATH=

@ECHO.
@ECHO Error - Invalid argument. Usage: setenv.cmd SHC_TOOL_PATH
@ECHO Example: setenv.cmd c:\sh\9_2_0
@ECHO.

GOTO :EOF

rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
6 changes: 0 additions & 6 deletions setenv_dbg.cmd
View file

This file was deleted.

22 changes: 0 additions & 22 deletions setenv_gcc_op.cmd
View file

This file was deleted.

4 changes: 2 additions & 2 deletions setenv_mdk.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ GOTO :EOF
@echo.
@echo ERROR: Invalid version argument.
@echo USAGE: setenv_mdk.cmd MDK_VERSION [MDK_TOOL_PATH]
@echo where MDK_VERSION is (3.80a, 4.12, 4.13, ...)
@echo where MDK_TOOL_PATH is the path to the ARM directory of the MDK install (c:\Keil\Arm)
@echo where MDK_VERSION is the version of the compiler contained in the MDK/RVDS (e.g for MDK 5.14 ARMCC is 5.05)
@echo where MDK_TOOL_PATH is the path to the ARM directory of the MDK install (i.e. c:\Keil_v5\Arm)
@echo.
16 changes: 0 additions & 16 deletions setenv_rvds.cmd
View file

This file was deleted.

Loading

2 comments on commit c7d1200

@cw2
Copy link
Contributor

@cw2 cw2 commented on c7d1200 May 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: While Keil MDK and ARM RVDS share the same compiler (*), there are a few differences in supported command line options and each toolchain comes with different libraries (IIRC, RVDS does not have MicroLib).

(*) It is basically the two .exe-s merged together and doing if(ExistsKeilLicense()) compileMdk(); else compileRvds();

@smaillet-ms
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, either way MDK tools are the only ones we'll be testing against so we've removed the old RVDS as it isn't likely to work as-is.

Please # to comment.