Update KL25Z uVision project template. Use an RTOS project as exporter test case.

Author: emilmont

workspace_tools/export/uvision4_kl25z.uvproj.tmpl

@@ -347,7 +347,7 @@
             <uSurpInc>0</uSurpInc>
             <VariousControls>
               <MiscControls>--gnu</MiscControls>
-              <Define>TARGET_KL25Z</Define>
+              <Define>TARGET_KL25Z, NDEBUG, TOOLCHAIN_ARM, __CMSIS_RTOS, __CORTEX_M0PLUS</Define>
               <Undefine></Undefine>
               <IncludePath> {% for path in include_paths %} {{path}}; {% endfor %} </IncludePath>
             </VariousControls>
@@ -362,7 +362,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <VariousControls>
-              <MiscControls>--gnu</MiscControls>
+              <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
               <IncludePath></IncludePath>
@@ -377,7 +377,7 @@
             <useFile>0</useFile>
             <TextAddressRange>0x00000000</TextAddressRange>
             <DataAddressRange>0x10000000</DataAddressRange>
-            <ScatterFile>.\mbed\KL25Z\ARM\MKL25Z4.sct</ScatterFile>
+            <ScatterFile>{{scatter_file}}</ScatterFile>
             <IncludeLibs></IncludeLibs>
             <IncludeLibsPath></IncludeLibsPath>
             <Misc>
@@ -399,6 +399,17 @@
                         <FileName>{{file.name}}</FileName>
                         <FileType>{{file.type}}</FileType>
                         <FilePath>{{file.path}}</FilePath>
+                        {%if file.type == "1" %}
+                        <FileOption>
+                            <FileArmAds>
+                              <Cads>
+                                <VariousControls>
+                                  <MiscControls>--c99</MiscControls>
+                                </VariousControls>
+                              </Cads>
+                            </FileArmAds>
+                        </FileOption>
+                        {% endif %}
                 </File>
                {% endfor %}
 
@@ -409,5 +420,3 @@
   </Targets>
 
 </Project>
-          
-

workspace_tools/export_test.py

@@ -7,6 +7,8 @@
 from workspace_tools.utils import mkdir, cmd, copy_file
 from workspace_tools.export import export
 
+from shutil import copytree
+
 
 USR_PRJ_NAME = "export_test"
 USER_PRJ = join(BUILD_DIR, USR_PRJ_NAME)
@@ -25,7 +27,8 @@ def setup_test_user_prj():
 
     # Sources
     print 'Coping sources...'
-    copy_file(join(TEST_DIR, "mbed", "hello", "main.cpp"), join(USER_SRC, "main.cpp"))
+    copy_file(join(TEST_DIR, "rtos", "mbed", "basic", "main.cpp"), join(USER_SRC, "main.cpp"))
+    copytree(join(LIB_DIR, "rtos"), join(USER_LIB, "rtos"))
 
     # FAKE BUILD URL
     open(join(USER_SRC, "mbed.bld"), 'w').write("http://mbed.org/users/mbed_official/code/mbed/builds/976df7c37ad5\n")