Add warning line into the CCS4/MSP430X project to prompt the use of the CreateProject...

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

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild b/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild
index 7b70eb3019ef2603fc70c11fa1c943256e5ded73..1bc70d4014d575930c1aa8a475a476ad4c168284 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild
+++ b/Demo/MSP430X_MSP430F5438_CCS4/.cdtbuild
@@ -93,9 +93,6 @@
 <resourceConfiguration exclude="false" id="com.ti.ccstudio.buildDefinitions.MSP430.Debug.1203657382./RTOSDemo/source/RegTest.s43" name="RegTest.s43" rcbsApplicability="disable" resourcePath="/RTOSDemo/Demo_Source/RegTest.asm" toolsToInvoke="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/source/RegTest.s43">\r
 <tool id="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/source/RegTest.s43" name="MSP430 Compiler" superClass="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398"/>\r
 </resourceConfiguration>\r
-<resourceConfiguration exclude="false" id="com.ti.ccstudio.buildDefinitions.MSP430.Debug.1203657382./RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.s43" name="portext.s43" rcbsApplicability="disable" resourcePath="/RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.asm" toolsToInvoke="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.s43">\r
-<tool id="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398./RTOSDemo/FreeRTOS_Source/portable/CCS4/MSP430X/portext.s43" name="MSP430 Compiler" superClass="com.ti.ccstudio.buildDefinitions.MSP430_3.3.exe.compilerDebug.2087986398"/>\r
-</resourceConfiguration>\r
 </configuration>\r
 <macros/>\r
 </project>\r

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat b/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat
index 8d0e30052c13a141c3afe7af450cabc06b158b4a..5dff36f851270b0928816a72e7614b52eb8c6cc3 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat
+++ b/Demo/MSP430X_MSP430F5438_CCS4/CreateProjectDirectoryStructure.bat
@@ -29,7 +29,7 @@ IF EXIST FreeRTOS_Source Goto END
        copy ..\..\Source\include\*.* FreeRTOS_Source\include\r
        \r
        REM Copy the portable layer files\r
-       copy ..\..\Source\portable\GCC\ARM_CM3\*.* FreeRTOS_Source\portable\CCS4\MSP430X\r
+       copy ..\..\Source\portable\CCS4\MSP430X\*.* FreeRTOS_Source\portable\CCS4\MSP430X\r
        \r
        REM Copy the basic memory allocation files\r
        copy ..\..\Source\portable\MemMang\heap_1.c FreeRTOS_Source\portable\MemMang\r

diff --git a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
index 7f83be8ca4380bc316bdd3e96d8c116ec50317ff..3434e17892243d523e18b632e9c1877b19c5cb59 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
+++ b/Demo/MSP430X_MSP430F5438_CCS4/Demo_Source/main.c
@@ -236,6 +236,13 @@ typedef struct
 \r
 /*-----------------------------------------------------------*/\r
 \r
+/* The following #error directive is to remind users that a batch file must be\r
+ * executed prior to this project being built.  The batch file *cannot* be \r
+ * executed from within CCS4!  Once it has been executed, re-open the CCS4\r
+ * project and remove the #error line below.\r
+ */\r
+#error Ensure CreateProjectDirectoryStructure.bat has been executed before building.  See comment immediately above.\r
+\r
 void main( void )\r
 {\r
        /* Configure the peripherals used by this demo application.  This includes\r