diff --git a/package.bld b/package.bld
index e2dd851c4f022dbe87c64c605acbf39403098246..d0c82a828f9fde8bcac6a7e6c847e97355f229fa 100644 (file)
--- a/package.bld
+++ b/package.bld
/******************************************************************************\r
- * FILE PURPOSE: Build description for the RM LLD Package\r
+ * FILE PURPOSE: Build description for the RM Package\r
******************************************************************************\r
* FILE NAME: package.bld\r
*\r
* DESCRIPTION: \r
- * This file contains the build specification and description for the RM LLD\r
+ * This file contains the build specification and description for the RM\r
* \r
* The file takes the following parameters from the command line through the\r
* XDCARGS variable.\r
- * XDCARGS[0] = RM LLD Install Type \r
+ * XDCARGS[0] = RM Install Type \r
* Valid Values are "TAR" or "SETUP"\r
* DEFAULT is "SETUP"\r
*\r
* Example for a valid command:\r
* xdc XDCARGS="SETUP" release \r
*\r
- * Copyright (C) 2012, Texas Instruments, Inc.\r
+ * Copyright (C) 2012-2014, Texas Instruments, Inc.\r
*****************************************************************************/\r
\r
+/* List of all subdirectories that combine to make the RM Package. */\r
+var subDirectories = ["src", "docs", "device", "include", "test", "util"];\r
+\r
+/* Generate rmver.h */\r
+var tplt = xdc.loadTemplate("./rmver.h.xdt");\r
+tplt.genFile("./rmver.h",lldReleaseVersion); \r
+\r
/* Determine if we need to create the InstallJammer Application or not? \r
- * RM LLD Deliverables be either of the following formats:\r
+ * RM Deliverables be either of the following formats:\r
* - TAR Ball Package\r
* - Setup Executable \r
* DEFAULT is a TAR Executable. */\r
* of the RTSC Build. Here we determine the name of the TAR Ball Package\r
* Format is as follows:\r
* lld_<version> */\r
-var lldRTSCFileName = "rmlld" + "_" + lldPartNumber + "_" +\r
+var lldRTSCFileName = "rm" + "_" + lldPartNumber + "_" +\r
lldReleaseVersion[0] + "_" + lldReleaseVersion[1] + "_" + \r
lldReleaseVersion[2] + "_" + lldReleaseVersion[3];\r
\r
************************ Release Banner **************************\r
******************************************************************/\r
\r
-print ("*************** RM LLD Build Information ****************");\r
-print ("RM LLD Install : " + lldInstallType);\r
-print ("RM LLD Version : " + lldReleaseVersion);\r
-print ("Tools Directory : " + toolsBaseDir);\r
-print ("RTSC File Name : " + lldRTSCFileName);\r
-print ("RM LLD Path : " + lldPath);\r
-print ("Coverity Analysis : " + (coverityAnalysis == "ON" ? "ON" : "OFF"));\r
-print ("CC LE opts : " + C66LE.ccOpts.prefix);\r
-print ("CC BE opts : " + C66BE.ccOpts.prefix);\r
+print ("*************** RM Build Information ****************");\r
+print ("RM Install : " + lldInstallType);\r
+print ("RM Version : " + lldReleaseVersion);\r
+print ("Tools Directory : " + toolsBaseDir);\r
+print ("RTSC File Name : " + lldRTSCFileName);\r
+print ("RM Path : " + lldPath);\r
+print ("Coverity Analysis : " + (coverityAnalysis == "ON" ? "ON" : "OFF"));\r
+print ("CC LE opts : " + C66LE.ccOpts.prefix);\r
+print ("CC BE opts : " + C66BE.ccOpts.prefix);\r
print ("***********************************************************");\r
\r
-/* Create the release package for the RM LLD */\r
+/* Create the release package for the RM */\r
Pkg.defaultRelease = Pkg.addRelease (lldRTSCFileName, {prefix: "./packages/"});\r
\r
/* Moving forward we need to set the Archiver of the package to be ZIP. This is currently\r
* uncompression into a temporary directory. XDC Tools with xdc-rXX support the ZIP archiver. */\r
//Pkg.attrs = {archiver : "zip"};\r
\r
+/* Cycle through all the sub-directories and build all the files */\r
+for (var i = 0; i < subDirectories.length; i++) \r
+{\r
+ /* Load the capsule in the sub directory. */\r
+ var caps = xdc.loadCapsule (subDirectories[i]+"/Module.xs");\r
+\r
+ print ("Building directory " + subDirectories[i]);\r
+\r
+ /* Build the capsule. */\r
+ caps.modBuild();\r
+\r
+ /* Package the module.xs files for building via package */\r
+ Pkg.otherFiles[Pkg.otherFiles.length++] = subDirectories[i]+"/Module.xs";\r
+}\r
\r
/* Package the remaining files */\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "config.bld";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "package.xdc";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "Settings.xdc";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "Settings.xdc.xdt";\r
-Pkg.otherFiles[Pkg.otherFiles.length++] = "rm_public_lld.h";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "rm.h";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "rm_services.h";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "rm_transport.h";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "rm_server_if.h";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "rm_osal.h";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "rmver.h";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "rmver.h.xdt";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/Doxyfile";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "docs/doxyfile.xdt";\r
Pkg.otherFiles[Pkg.otherFiles.length++] = "build/buildlib.xs";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "makefile";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "makefile_armv7";\r
+Pkg.otherFiles[Pkg.otherFiles.length++] = "build/armv7/librm_aearmv7.mk";\r
\r
/* Generate Users Manual Doxyfile */\r
var tplt = xdc.loadTemplate("./docs/doxyfile.xdt");\r
var tplt = xdc.loadTemplate("./Settings.xdc.xdt");\r
tplt.genFile("./Settings.xdc",lldReleaseVersion); \r
\r
-/* Generate paver.h */\r
-var tplt = xdc.loadTemplate("./rmver.h.xdt");\r
-tplt.genFile("./rmver.h",lldReleaseVersion); \r
-\r
/* Check if we need to create the mini package? */\r
var miniBuild = java.lang.System.getenv("MINI_PACKAGE");\r
\r
/* Create the Install Jammer Version Variable. This is used inside the \r
* MPI File to create the Final executable. \r
* The format supported is as follows:-\r
- * - setupwin32_rmlld_<part_number>_<version>.exe \r
- * This is for RM LLD Libraries and Header files\r
+ * - setupwin32_rm_<part_number>_<version>.exe \r
+ * This is for RM Libraries and Header files\r
*/\r
var InstallJammerVersion = "-DVersion " + lldPartNumber + "_" + lldReleaseVersion[0] + "_" +\r
lldReleaseVersion[1] + "_" + lldReleaseVersion[2] + "_" + lldReleaseVersion[3];\r
* the input directory for the Install Jammer. */ \r
var PackageBaseDir = " -DPackageBaseDir " + lldPath + "./tmp";\r
\r
- /* This is the location where the RM LLD will be installed by default. */\r
- var WinInstallDir = " -DWinInstallDir C:/Program Files/Texas Instruments/rmlld" + "_" + \r
+ /* This is the location where the RM will be installed by default. */\r
+ var WinInstallDir = " -DWinInstallDir C:/ti/rm" + "_" + \r
lldPartNumber + "_" + \r
lldReleaseVersion[0] + "_" + lldReleaseVersion[1] + "_" + \r
lldReleaseVersion[2] + "_" + lldReleaseVersion[3];\r
Pkg.makeEpilogue += "\t -$(CP) -R eclipse tmp\n";\r
Pkg.makeEpilogue += "\t tar -xf ./packages/" + lldRTSCFileName + ".tar" + " -Ctmp/packages \n";\r
Pkg.makeEpilogue += "\t installjammer " + InstallJammerVersion + PackageBaseDir + WinInstallDir + \r
- " --output-dir packages/ --build install/rmlld.mpi\n";\r
- Pkg.makeEpilogue += "\t -$(RMDIR) /S /Q tmp\n\n";\r
+ " --output-dir packages/ --build install/rm.mpi\n";\r
+ Pkg.makeEpilogue += "\t -$(RMDIR) tmp\n\n";\r
+}\r
\r
- /* We need to clean after ourselves; extend the 'clean' target to take care of this. */\r
- Pkg.makeEpilogue += "clean::\n";\r
- Pkg.makeEpilogue += "\t $(RM) packages/*.exe\n";\r
- Pkg.makeEpilogue += "\t $(RM) packages/*.bin\n";\r
+/* We need to clean after ourselves; extend the 'clean' target to take care of this. */\r
+Pkg.makeEpilogue += "clean::\n";\r
+Pkg.makeEpilogue += "\t -$(RM) docs/Doxyfile Settings.xdc rmver.h\n";\r
+Pkg.makeEpilogue += "\t -$(RM) makefile\n";\r
+Pkg.makeEpilogue += "\t -$(RMDIR) docs/doxygen\n";\r
+if (lldInstallType == "SETUP")\r
+{\r
+ Pkg.makeEpilogue += "\t -$(RM) packages/*.exe\n";\r
+ Pkg.makeEpilogue += "\t -$(RM) packages/*.bin\n";\r
+ Pkg.makeEpilogue += "\t -$(RMDIR) eclipse\n\n";\r
+}\r
+if (miniBuild == "ON")\r
+{\r
+ Pkg.makeEpilogue += "\t -$(RM) simpleC66LE.mak\n";\r
+ Pkg.makeEpilogue += "\t -$(RM) simpleC66BE.mak\n";\r
}\r
- \r