Re-arrange the temporary MicroBlaze directory structure slightly.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1464 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
index b1a634498883402cb2e2eedab5eeb438edd60f49..31558f61d1ad55483d130c44c4f19e0dc301070f 100644 (file)
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/.cproject
@@ -40,7 +40,7 @@
                                                                </option>\r
                                                                <option id="xilinx.gnu.compiler.dircategory.includes.788537379" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/Common_Demo_Files/include}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/MicroBlaze}&quot;"/>\r
                                                                </option>\r
@@ -1010,7 +1010,7 @@
                                                                </option>\r
                                                                <option id="xilinx.gnu.compiler.dircategory.includes.1539819216" name="Include Paths" superClass="xilinx.gnu.compiler.dircategory.includes" valueType="includePath">\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>\r
-                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/Common_Demo_Files/include}&quot;"/>\r
+                                                                       <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Demo_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/include}&quot;"/>\r
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/FreeRTOS_Source/portable/GCC/MicroBlaze}&quot;"/>\r
                                                                </option>\r
@@ -1045,7 +1045,7 @@
                                                                </option>\r
                                                                <option id="xilinx.gnu.c.linker.option.lscript.1073578867" name="Linker Script" superClass="xilinx.gnu.c.linker.option.lscript" value="../src/lscript.ld" valueType="string"/>\r
                                                                <option id="xilinx.gnu.c.link.option.ldflags.471396681" name="Linker Flags" superClass="xilinx.gnu.c.link.option.ldflags" value="-Map=output.map" valueType="string"/>\r
-                                                               <option id="xilinx.gnu.c.link.option.other.791541632" name="Other options (-XLinker [option])" superClass="xilinx.gnu.c.link.option.other" valueType="stringList"/>\r
+                                                               <option id="xilinx.gnu.c.link.option.other.791541632" name="Other options (-XLinker [option])" superClass="xilinx.gnu.c.link.option.other"/>\r
                                                                <inputType id="xilinx.gnu.linker.input.1399699093" superClass="xilinx.gnu.linker.input">\r
                                                                        <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>\r
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>\r

diff --git a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
index 8d418c2f530d48bfa807f128c9df8fbb8462c383..f4399ac77a437cbea32963f3e6de438a5120b65b 100644 (file)
--- a/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
+++ b/Demo/MicroBlaze_Spartan-6_EthernetLite/SDKProjects/RTOSDemoSource/CreateProjectDirectoryStructure.bat
@@ -16,8 +16,8 @@ IF EXIST FreeRTOS_Source Goto END
        MD FreeRTOS_Source\portable\GCC\r
        MD FreeRTOS_Source\portable\GCC\MicroBlaze\r
        MD FreeRTOS_Source\portable\MemMang     \r
-       MD Demo_Source\Common_Demo_Files\r
-       MD Demo_Source\Common_Demo_Files\include\r
+       MD Demo_Source\r
+       MD Demo_Source\include\r
        \r
        REM Copy the core kernel files.\r
        copy ..\..\..\..\Source\tasks.c FreeRTOS_Source\r
@@ -36,30 +36,30 @@ IF EXIST FreeRTOS_Source Goto END
        copy ..\..\..\..\Source\portable\MemMang\heap_2.c FreeRTOS_Source\portable\MemMang\r
 \r
        REM Copy the files that define the common demo tasks.\r
-    copy ..\..\..\Common\minimal\dynamic.c      Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\BlockQ.c       Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\death.c        Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\blocktim.c     Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\semtest.c      Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\PollQ.c        Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\GenQTest.c     Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\QPeek.c        Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\recmutex.c     Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\sp_flop.c      Demo_Source\Common_Demo_Files\r
-    copy ..\..\..\Common\minimal\flash.c        Demo_Source\Common_Demo_Files\r
+    copy ..\..\..\Common\minimal\dynamic.c      Demo_Source\r
+    copy ..\..\..\Common\minimal\BlockQ.c       Demo_Source\r
+    copy ..\..\..\Common\minimal\death.c        Demo_Source\r
+    copy ..\..\..\Common\minimal\blocktim.c     Demo_Source\r
+    copy ..\..\..\Common\minimal\semtest.c      Demo_Source\r
+    copy ..\..\..\Common\minimal\PollQ.c        Demo_Source\r
+    copy ..\..\..\Common\minimal\GenQTest.c     Demo_Source\r
+    copy ..\..\..\Common\minimal\QPeek.c        Demo_Source\r
+    copy ..\..\..\Common\minimal\recmutex.c     Demo_Source\r
+    copy ..\..\..\Common\minimal\sp_flop.c      Demo_Source\r
+    copy ..\..\..\Common\minimal\flash.c        Demo_Source\r
        \r
        REM Copy the common demo file headers.\r
-    copy ..\..\..\Common\include\dynamic.h      Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\partest.h      Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\BlockQ.h       Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\death.h        Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\blocktim.h     Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\semtest.h      Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\PollQ.h        Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\GenQTest.h     Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\QPeek.h        Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\recmutex.h     Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\flop.h         Demo_Source\Common_Demo_Files\include\r
-    copy ..\..\..\Common\include\flash.h        Demo_Source\Common_Demo_Files\include\r
+    copy ..\..\..\Common\include\dynamic.h      Demo_Source\include\r
+    copy ..\..\..\Common\include\partest.h      Demo_Source\include\r
+    copy ..\..\..\Common\include\BlockQ.h       Demo_Source\include\r
+    copy ..\..\..\Common\include\death.h        Demo_Source\include\r
+    copy ..\..\..\Common\include\blocktim.h     Demo_Source\include\r
+    copy ..\..\..\Common\include\semtest.h      Demo_Source\include\r
+    copy ..\..\..\Common\include\PollQ.h        Demo_Source\include\r
+    copy ..\..\..\Common\include\GenQTest.h     Demo_Source\include\r
+    copy ..\..\..\Common\include\QPeek.h        Demo_Source\include\r
+    copy ..\..\..\Common\include\recmutex.h     Demo_Source\include\r
+    copy ..\..\..\Common\include\flop.h         Demo_Source\include\r
+    copy ..\..\..\Common\include\flash.h        Demo_Source\include\r
     \r
 : END\r