summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2b6b8a)
raw | patch | inline | side by side (parent: d2b6b8a)
author | Sinthu Raja M <x0257345@ti.com> | |
Thu, 26 Apr 2018 07:16:03 +0000 (12:46 +0530) | ||
committer | Sinthu Raja M <x0257345@ti.com> | |
Thu, 26 Apr 2018 07:16:03 +0000 (12:46 +0530) |
Modified xs files to build error free in nightly builds
build/buildlib.xs | patch | blob | history | |
example/Module.xs | patch | blob | history | |
include/Module.xs | patch | blob | history | |
src/Module.xs | patch | blob | history |
diff --git a/build/buildlib.xs b/build/buildlib.xs
index 657617046628337ea529bc0c30cc575b05aba2c7..779aa9fe9668774b2e8bc56cf1fac98344bf6be6 100755 (executable)
--- a/build/buildlib.xs
+++ b/build/buildlib.xs
case String(C66LE):
tooldir="C6X_GEN_INSTALL_PATH";
cmdprefix="";
- targetDir="c66";
+ targetDir="c66/release";
targetname=C66LE;
break;
case String(C66BE):
tooldir="C6X_GEN_INSTALL_PATH";
cmdprefix="";
- targetDir="c66";
+ targetDir="c66/release";
targetname=C66BE;
break;
case String(A15LE):
tooldir="TOOLCHAIN_PATH_A15";
cmdprefix="CROSS_TOOL_PRFX";
- targetDir="armv7";
+ targetDir="a15/release";
targetname=A15LE;
break;
case String(A9LE):
tooldir="TOOLCHAIN_PATH_A9";
cmdprefix="CROSS_TOOL_PRFX";
- targetDir="armv7";
+ targetDir="a9/release";
targetname=A9LE;
break;
case String(A8LE):
tooldir="TOOLCHAIN_PATH_A8";
cmdprefix="CROSS_TOOL_PRFX";
- targetDir="armv7";
+ targetDir="a8/release";
targetname=A8LE;
break;
case String(M4LE):
tooldir="TOOLCHAIN_PATH_M4";
cmdprefix="";
- targetDir="m4";
+ targetDir="m4/release";
targetname=M4LE;
break;
case String(C674LE):
tooldir="C6X_GEN_INSTALL_PATH";
cmdprefix="";
- targetDir="c674";
+ targetDir="c674/release";
targetname=C674LE;
break;
libmakefile.writeLine("LNKFLAGS_INTERNAL = " +targetname.lnk.opts);
libmakefile.writeLine("INTERNALDEFS = -MD -MF $@.dep");
libmakefile.writeLine("INTERNALLINKDEFS = -o $@ -m $@.map"); /* TBD */
- libmakefile.writeLine("OBJDIR = $(LIBDIR)/" + device.toString() + "/" + targetDir +"/obj");
+ libmakefile.writeLine("OBJDIR = ./obj/obj_" +targetname.suffix +"/" + device.toString() + "/" + targetDir +"/obj" + "/" + objExtDir);
}
else
/* libmakefile.writeLine("INTERNALDEFS = -D"+stringname.replace(/\./g,"_")+" -Dxdc_target_types__=ti/targets/std.h -DMAKEFILE_BUILD -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep");*/
libmakefile.writeLine("INTERNALDEFS = -D"+stringname.replace(/\./g,"_")+" -DMAKEFILE_BUILD -eo.$(OBJEXT) -ea.$(AOBJEXT) -fr=$(@D) -fs=$(@D) -ppa -ppd=$@.dep");
libmakefile.writeLine("INTERNALLINKDEFS = -o $@ -m $@.map");
- libmakefile.writeLine("OBJDIR = $(LIBDIR)/" + device.toString() + "/" + targetDir +"/obj");
- }
+ libmakefile.writeLine("OBJDIR = ./obj/obj_" +targetname.suffix +"/" + device.toString() + "/" + targetDir +"/obj" + "/" + objExtDir);
+ }
return libmakefile;
if (target.name == "A15F")
{
- targetDir = "armv7";
+ targetDir = "a15/release";
}
else if (target.name == "A9F")
{
- targetDir = "armv7";
+ targetDir = "a9/release";
}
else if (target.name == "A8F")
{
- targetDir = "armv7";
+ targetDir = "a8/release";
}
else if (target.name == "M4")
{
- targetDir = "m4";
+ targetDir = "m4/release";
}
else if (target.name == "C674")
{
diff --git a/example/Module.xs b/example/Module.xs
index 7444a0a5072ac8fd1fa33c66a61e73767530fc29..1e2f246c65fbb107f92d8935fbdc21abcbae9fc2 100644 (file)
--- a/example/Module.xs
+++ b/example/Module.xs
var exampleFiles = libUtility.listAllFiles (".txt", "example", true);
for (var k = 0 ; k < exampleFiles.length; k++)
Pkg.otherFiles[Pkg.otherFiles.length++] = exampleFiles[k];
+
+ /* Add all the .mk files to the release package. */
+ var mkFiles = libUtility.listAllFiles (".mk", "example", true);
+ for (var k = 0 ; k < mkFiles.length; k++)
+ Pkg.otherFiles[Pkg.otherFiles.length++] = mkFiles[k];
}
diff --git a/include/Module.xs b/include/Module.xs
index 388e2f6df9494fa48f558ed08158e92c01d5835a..8faf45ab0ea2ffbb9ffe906a9fbf18c053da5a29 100644 (file)
--- a/include/Module.xs
+++ b/include/Module.xs
var testFiles = libUtility.listAllFiles (".h", "include", true);
for (var k = 0 ; k < testFiles.length; k++)
Pkg.otherFiles[Pkg.otherFiles.length++] = testFiles[k];
+
+ /* Add all the .mk files to the release package. */
+ var mkFiles = libUtility.listAllFiles (".mk", "include", true);
+ for (var k = 0 ; k < mkFiles.length; k++)
+ Pkg.otherFiles[Pkg.otherFiles.length++] = mkFiles[k];
}
diff --git a/src/Module.xs b/src/Module.xs
index 96debe7e6feaf25fdc019f0bdf92e19266c88d79..a91726d8c61a77f05ff27f1e58e666752b8c466a 100644 (file)
--- a/src/Module.xs
+++ b/src/Module.xs
function modBuild()
{
- /* Build the device independent libraries for all the targets specified. */
- for (var targets=0; targets < socs["all"].targets.length; targets++)
+ if (socs.length != 0)
{
- var targetFiles = mcbsplldFile.slice(); /* make copy */
- var libOptions = {
- copts: socs["all"].copts,
- incs: mcbsplldIncPath,
- };
- libUtility.buildLibrary ("", "false", libOptions, Pkg.name, socs["all"].targets[targets], targetFiles);
- }
-
-
- /* Build library targets for device dependent SoCs */
- for (var soc=0; soc < soc_names.length; soc++)
- {
- var dev = socs[soc_names[soc]];
+ /* Build the device independent libraries for all the targets specified. */
+ for (var targets=0; targets < socs["all"].targets.length; targets++)
+ {
+ if(socs["all"].build == "false")
+ continue;
+ var targetFiles = mcasplldFiles.slice(); /* make copy */
+ var libOptions = {
+ copts: socs["all"].copts,
+ incs: lldIncludePath,
+ };
+ libUtility.buildLibrary ("", "false", "false", libOptions, Pkg.name, socs["all"].targets[targets], targetFiles);
+ }
- /* do not proceed if this SoC is not configured to be built */
- if (dev.build == "false")
- continue;
+ /* Build library targets for device dependent SoCs */
+ for (var soc=0; soc < soc_names.length; soc++)
+ {
+ var dev = socs[soc_names[soc]];
+
+ /* do not proceed if this SoC is not configured to be built */
+ if (dev.build == "false")
+ continue;
- if (dev.socDevLib == "true")
- {
- var targetFiles_soc = mcbsplldFile.slice(); /* make copy */
- targetFiles_soc.push (deviceConstruct[0]+soc_names[soc]+deviceConstruct[1]);
- /* Build the libraries for all the targets specified. */
- for (var targets=0; targets < dev.targets.length; targets++)
- {
- var libOptions = {
- copts: dev.copts,
- incs: mcbsplldIncPath,
- };
- libUtility.buildLibrary (soc_names[soc], "true", libOptions, Pkg.name, dev.targets[targets], targetFiles_soc);
+ if (dev.socDevLib == "true")
+ {
+ var targetFiles_soc = mcasplldFiles.slice(); /* make copy */
+ targetFiles_soc.push (deviceConstruct[0]+soc_names[soc]+deviceConstruct[1]);
+ /* Build the libraries for all the targets specified. */
+ for (var targets=0; targets < dev.targets.length; targets++)
+ {
+ var libOptions = {
+ copts: dev.copts,
+ incs: lldIncludePath,
+ };
+ libUtility.buildLibrary (soc_names[soc], "false", "true", libOptions, Pkg.name, dev.targets[targets], targetFiles_soc);
+ }
}
- }
-
-
+ }
}
/* Add all the .c files to the release package. */
var testFiles = libUtility.listAllFiles (".h", "src", true);
for (var k = 0 ; k < testFiles.length; k++)
Pkg.otherFiles[Pkg.otherFiles.length++] = testFiles[k];
+
+ /* Add all the .mk files to the release package. */
+ var mkFiles = libUtility.listAllFiles (".mk", "src", true);
+ for (var k = 0 ; k < mkFiles.length; k++)
+ Pkg.otherFiles[Pkg.otherFiles.length++] = mkFiles[k];
}