Renamed package information in tirex to be compatible with 3.4.0.0.
authorJianzhong Xu <xuj@ti.com>
Mon, 10 Dec 2018 18:13:23 +0000 (13:13 -0500)
committerJianzhong Xu <xuj@ti.com>
Tue, 11 Dec 2018 15:57:09 +0000 (10:57 -0500)
Signed-off-by: Jianzhong Xu <xuj@ti.com>
ti/dsplib/docs/bundle/doxygen/release.h.xdt
ti/dsplib/package.bld
ti/dsplib/package.ccs.json.xdt
ti/dsplib/package.tirex.json.xdt

index e056e68c874c47692d3585f0f64bb942005c3221..4e2744f690b4d8e8bb07b62e8703fff94fa8f521 100644 (file)
  *
  * <h2><a name="Whats_New">What's New</a></h2>
  *  
  *
  * <h2><a name="Whats_New">What's New</a></h2>
  *  
- * This release makes DSPLIB compilation part of Processor SDK RTOS build.
- *
+ *   - DSPLIB compilation and build is now part of Proc-SDK build process.
+ *   - TIREX metadata is included in the package. It enables CCS to detect
+ *     and install DSPLIB without going through pop-up installation window
+ *     and restarting CCS.
  *  
  * <hr size="2" width="50%" align="left">
  *
  *  
  * <hr size="2" width="50%" align="left">
  *
index 5aa796cb5e44cda77d5dcf7b6c94d19a97e5a84e..f26e9d2ebd19a15ea2ba37fcbbdd8b5271131e00 100644 (file)
                   {name:"DSP_w_vec",srcDir:"c674"}]
 
 
                   {name:"DSP_w_vec",srcDir:"c674"}]
 
 
-var TIREX_TARGET;
+var TIREX_TARGET_ROOT;
+var TIREX_TARGET_ID;
+var TIREX_TARGET_NAME;
 
   for (var k = 0; k < arguments.length; k++)
   {
    switch (arguments[k])
    {
     case "c66x":
 
   for (var k = 0; k < arguments.length; k++)
   {
    switch (arguments[k])
    {
     case "c66x":
-      TIREX_TARGET  = "C66X";
+      TIREX_TARGET_ID   = "c66x";
+      TIREX_TARGET_NAME = "C66x";
+      TIREX_TARGET_ROOT = "C66X";
       break;
     case "c674x":
       break;
     case "c674x":
-      TIREX_TARGET  = "C674X";
+      TIREX_TARGET_ID   = "c674x";
+      TIREX_TARGET_NAME = "C674x";
+      TIREX_TARGET_ROOT = "C674X";
       break;
     case "c64Px":
       break;
     case "c64Px":
-      TIREX_TARGET  = "C64PX";
+      TIREX_TARGET_ID   = "c64Px";
+      TIREX_TARGET_NAME = "C64x+";
+      TIREX_TARGET_ROOT = "C64PX";
       break;
    }
   }
       break;
    }
   }
@@ -997,10 +1005,10 @@ Package.archiveFiles["CommonArchiveFiles"] = {
   /* Generate TI REX meta data */
   print( "Generating TI REX"); 
   var tirex_tplt = xdc.loadTemplate("./package.ccs.json.xdt");
   /* Generate TI REX meta data */
   print( "Generating TI REX"); 
   var tirex_tplt = xdc.loadTemplate("./package.ccs.json.xdt");
-  tirex_tplt.genFile("./.metadata/.tirex/package.ccs.json",null,[TIREX_TARGET]);
+  tirex_tplt.genFile("./.metadata/.tirex/package.ccs.json",null,[TIREX_TARGET_ROOT]);
 
   tirex_tplt = xdc.loadTemplate("./package.tirex.json.xdt");
 
   tirex_tplt = xdc.loadTemplate("./package.tirex.json.xdt");
-  tirex_tplt.genFile("./.metadata/.tirex/package.tirex.json",null,[Package.version,TIREX_TARGET]);
+  tirex_tplt.genFile("./.metadata/.tirex/package.tirex.json",null,[Package.version,TIREX_TARGET_ID, TIREX_TARGET_NAME]);
 
   /* Include custom makefile to generate doxygen documents */
   Package.includeMake("Makedocs.mk");
 
   /* Include custom makefile to generate doxygen documents */
   Package.includeMake("Makedocs.mk");
index 37a8fe6f5a50ef195e103c403ede4a235f16e1ed..5c9fc5e3f8e44059850ac436749ad0bfa22f661b 100644 (file)
@@ -6,7 +6,8 @@
 %%}\r
 [\r
     {\r
 %%}\r
 [\r
     {\r
-        "rootMacroName": "COM_TI_MAS_`TARGET`_DSPLIB_INSTALL_DIR",\r
+        "rootMacroName": "COM_TI_MAS_DSPLIB_`TARGET`_INSTALL_DIR",\r
+        "deprecatedRootMacroNames": ["TI_MAS_DSPLIB_`TARGET`_INSTALL_DIR"],\r
         "compilerIncludePath": [ ],\r
         "compilerSymbols": [ ],\r
         "linkerSearchPath": [ ],\r
         "compilerIncludePath": [ ],\r
         "compilerSymbols": [ ],\r
         "linkerSearchPath": [ ],\r
index 6f3b521ac7d21c0a0abd2e3feb8c5319b1674920..a6bd3e190d9d62f9fb32a90b7b1fad1c11fc55f4 100644 (file)
                break; \r
        }\r
     var packageVersion= version[0]+"."+version[1]+"."+version[2]+"."+version[3];\r
                break; \r
        }\r
     var packageVersion= version[0]+"."+version[1]+"."+version[2]+"."+version[3];\r
-    var TARGET = $args[1];    \r
+    var TARGET_id = $args[1];    \r
+    var TARGET_name = $args[2];    \r
 %%}\r
 \r
 [\r
     {\r
 %%}\r
 \r
 [\r
     {\r
-        "id": "com.ti.`TARGET`_DSPLIB",\r
-        "name": "DSPLIB `TARGET`",\r
+        "id": "ti.mas.dsplib.`TARGET_id`",\r
+        "name": "DSPLIB `TARGET_name`",\r
         "version": "`packageVersion`",\r
         "type": "software",\r
         "image": "./tirex_logo_256.png",\r
         "version": "`packageVersion`",\r
         "type": "software",\r
         "image": "./tirex_logo_256.png",\r
-        "description": "Optimized `TARGET` DSP function library for C programmers",\r
+        "description": "Optimized `TARGET_name` DSP function library for C programmers",\r
         "allowPartialDownload": "false",\r
         "devices": [],\r
         "metadataVersion": "3.0.0"\r
         "allowPartialDownload": "false",\r
         "devices": [],\r
         "metadataVersion": "3.0.0"\r