- Update build scripts to support standard distribution from Launchpa…

…d (ARM maintained)

- Fixed GCC targets and setenv_* to handle () in paths when tools are installed to default "Program FIles(x86)"

setenv_base.cmd

@@ -25,7 +25,7 @@ GOTO :EOF
 SET COMPILER_TOOL=%1
 SET COMPILER_TOOL_VERSION_NUM=%2
 SET COMPILER_TOOL_VERSION=%1%2
-SET ARG3=%~3
+SET "ARG3=%~3"
 
 SET TFSCONFIG=MFConfig.xml
 
@@ -106,7 +106,10 @@ rem @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
 @echo setting vars for GCC compiler %COMPILER_TOOL_VERSION%
 
 rem use a default for GCC
-IF "%ARG3%"=="" SET ARG3=%SystemDrive%\gnu\gcc
+IF "%ARG3%"=="" (
+    SET "ARG3=%SystemDrive%\gnu\gcc"
+    IF NOT EXIST "%ARG3%" set "ARG3=%ProgramFiles(x86)%\GNU Tools ARM Embedded\4.9 2015q1"
+)
 IF NOT EXIST "%ARG3%" GOTO :BAD_GCC_ARG
 
 set ARMROOT=
@@ -119,13 +122,13 @@ set DOTNETMF_COMPILER=%COMPILER_TOOL_VERSION%
 
 IF /I "%COMPILER_TOOL%"=="GCC" (
 IF EXIST "%ARG3%\lib\gcc\arm-none-eabi\%GNU_VERSION%" (
-set ARMINC=%ARG3%\lib\gcc\arm-none-eabi\%GNU_VERSION%\include
-set ARMLIB=%ARG3%\lib\gcc\arm-none-eabi\%GNU_VERSION%
-set GNU_TOOLS=%ARG3%
-set GNU_TOOLS_BIN=%ARG3%\bin
+set "ARMINC=%ARG3%\lib\gcc\arm-none-eabi\%GNU_VERSION%\include"
+set "ARMLIB=%ARG3%\lib\gcc\arm-none-eabi\%GNU_VERSION%"
+set "GNU_TOOLS=%ARG3%"
+set "GNU_TOOLS_BIN=%ARG3%\bin"
 set GNU_TARGET=arm-none-eabi
 ) ELSE (
-@ECHO Could not find %ARG3%\lib\gcc\arm-none-eabi\%GNU_VERSION%
+@ECHO Could not find "%ARG3%\lib\gcc\arm-none-eabi\%GNU_VERSION%"
 GOTO :BAD_GCC_ARG
 ))
 

setenv_gcc.cmd

@@ -1,8 +1,9 @@
 @echo off
 
+set "ARG2=%~2"
 IF NOT "" == "%1" SET GCC_VER=%1
 IF "" == "%GCC_VER%" GOTO :ARG_ERROR
-IF NOT "" == "%2" SET GCC_TOOL_PATH=%2
+IF NOT "" == "%ARG2%" SET "GCC_TOOL_PATH=%2"
 
 %~dp0\setenv_base.cmd GCC %GCC_VER% %GCC_TOOL_PATH% %3 %4 %5
 

tools/Targets/Microsoft.Spot.system.gcc.targets

@@ -172,7 +172,6 @@
     <CC_CPP_COMMON_FLAGS Condition="'$(OS_PLATFORM)'=='true'">$(CC_CPP_COMMON_FLAGS) -DPLATFORM_ARM_OS_PORT</CC_CPP_COMMON_FLAGS>
 
     <CC_CPP_COMMON_FLAGS Condition="'$(COMPILER_TOOL)'=='GCC'"   >$(CC_CPP_COMMON_FLAGS) -DGCC </CC_CPP_COMMON_FLAGS>
-    <CC_CPP_COMMON_FLAGS Condition="'$(COMPILER_TOOL)'=='GCCOP'" >$(CC_CPP_COMMON_FLAGS) -DGCCOP -D__ELIPS_COMPONENT_GENERATE_=true </CC_CPP_COMMON_FLAGS>
     <CC_CPP_COMMON_FLAGS Condition="'$(COMPILER_TOOL_VERSION_NUM)'&lt;'4.4'"   >$(CC_CPP_COMMON_FLAGS) -DGCC_OLD_ARG_LIST </CC_CPP_COMMON_FLAGS>
 
     <CC_CPP_COMMON_FLAGS>$(CC_CPP_COMMON_FLAGS) @(TinyCLR_Defines->'-D%(filename)',' ')</CC_CPP_COMMON_FLAGS>
@@ -190,7 +189,7 @@
     <CC_CPP_INCS>$(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT_Hardware</CC_CPP_INCS>
     <CC_CPP_INCS>$(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT_Graphics</CC_CPP_INCS>
     <CC_CPP_INCS>$(CC_CPP_INCS) -I$(SPO_SDK)\CLR\Libraries\SPOT_Net</CC_CPP_INCS>
-    <CC_CPP_INCS>$(CC_CPP_INCS) -I$(ARMINC)</CC_CPP_INCS>
+    <CC_CPP_INCS>$(CC_CPP_INCS) -I"$(ARMINC)"</CC_CPP_INCS>
     <CC_CPP_INCS>$(CC_CPP_INCS) @(IncludePaths->'-I$(CLRROOT)\%(relativedir)%(filename)',' ')</CC_CPP_INCS>
     <CC_CPP_INCS>$(CC_CPP_INCS) @(DirectIncludePaths->'-I%(FullPath)',' ')</CC_CPP_INCS>