tcbuilder 1.1.4 → 1.1.6

package/dist/tcbuild.d.ts

@@ -10,23 +10,12 @@ declare global {
     var build: typeof _build;
     var extExecutable: typeof _extExecutable;
     var extFlags: typeof _extFlags;
+    var extSuffix: typeof _extSuffix;
     var groupFinalExecutable: typeof _groupFinalExecutable;
     var groupFinalExecutableSuffix: typeof _groupFinalExecutableSuffix;
     var groupFinalFlags: typeof _groupFinalFlags;
     var groupFile: typeof _groupFile;
     var group: typeof _group;
-    var debExtExecutable: typeof extExecutable;
-    var relExtExecutable: typeof extExecutable;
-    var debExtFlags: typeof extFlags;
-    var relExtFlags: typeof extFlags;
-    var debGroupFinalFlags: typeof groupFinalFlags;
-    var relGroupFinalFlags: typeof groupFinalFlags;
-    var debGroupFinalExecutable: typeof groupFinalExecutable;
-    var relGroupFinalExecutable: typeof groupFinalExecutable;
-    var debGroupFinalExecutableSuffix: typeof groupFinalExecutableSuffix;
-    var relGroupFinalExecutableSuffix: typeof groupFinalExecutableSuffix;
-    var debGroupFile: typeof groupFile;
-    var relGroupFile: typeof groupFile;
 }
 declare function _build(name?: string): Promise<void>;
 type StringKeyValue = Record<string, string>;
@@ -47,6 +36,7 @@ type Group = {
 };
 declare function _extExecutable(ext: string, exec?: string): string;
 declare function _extFlags(ext: string, flags?: string): string;
+declare function _extSuffix(ext: string, suffix?: string): string;
 declare function _groupFinalFlags(flags: string, toBeRemoved: string): string | undefined;
 declare function _groupFinalExecutable(exe: string): string | undefined;
 declare function _groupFinalExecutableSuffix(suffix: string): string | undefined;

package/dist/tcbuild.js

@@ -46,66 +46,9 @@ async function _build(name = '') {
 global.build = _build;
 const globalExtExecutable = {};
 const globalExtFlags = {};
+const globalExtSuffix = {};
 global.groups = {};
 let currentGroup = null;
-global.debExtExecutable = (...args) => {
-    if (is_debug)
-        return extExecutable(...args);
-    return '';
-};
-global.relExtExecutable = (...args) => {
-    if (!is_debug)
-        return extExecutable(...args);
-    return '';
-};
-global.debExtFlags = (...args) => {
-    if (is_debug)
-        return extFlags(...args);
-    return '';
-};
-global.relExtFlags = (...args) => {
-    if (!is_debug)
-        return extFlags(...args);
-    return '';
-};
-global.debGroupFinalFlags = (...args) => {
-    if (is_debug)
-        return groupFinalFlags(...args);
-    return '';
-};
-global.relGroupFinalFlags = (...args) => {
-    if (!is_debug)
-        return groupFinalFlags(...args);
-    return '';
-};
-global.debGroupFinalExecutable = (...args) => {
-    if (is_debug)
-        return groupFinalExecutable(...args);
-    return '';
-};
-global.relGroupFinalExecutable = (...args) => {
-    if (!is_debug)
-        return groupFinalExecutable(...args);
-    return '';
-};
-global.debGroupFinalExecutableSuffix = (...args) => {
-    if (is_debug)
-        return groupFinalExecutableSuffix(...args);
-    return '';
-};
-global.relGroupFinalExecutableSuffix = (...args) => {
-    if (!is_debug)
-        return groupFinalExecutableSuffix(...args);
-    return '';
-};
-global.debGroupFile = (...args) => {
-    if (is_debug)
-        return groupFile(...args);
-};
-global.relGroupFile = (...args) => {
-    if (!is_debug)
-        return groupFile(...args);
-};
 //
 function _extExecutable(ext, exec) {
     if (currentGroup === null) {
@@ -143,6 +86,17 @@ function _extFlags(ext, flags) {
     return '';
 }
 global.extFlags = _extFlags;
+function _extSuffix(ext, suffix) {
+    if (!globalExtSuffix[ext])
+        globalExtSuffix[ext] = '';
+    if (suffix) {
+        globalExtSuffix[ext] = suffix;
+        return suffix;
+    }
+    else
+        return globalExtSuffix[ext];
+}
+global.extSuffix = _extSuffix;
 function _groupFinalFlags(flags, toBeRemoved) {
     if (!currentGroup)
         throw 'any group function called outside of group';
@@ -183,7 +137,7 @@ function _groupFile(fileName, flags, options) {
             existisFile.flags += ` ${flags}`;
         if (options?.toBeRemoved)
             existisFile.toBeRemoved.push(options.toBeRemoved);
-        if (options?.includeInFinalOutput)
+        if (options?.includeInFinalOutput !== undefined)
             existisFile.includeInFinalOutput = options.includeInFinalOutput;
     }
     else {
@@ -195,7 +149,7 @@ function _groupFile(fileName, flags, options) {
         };
         if (options?.toBeRemoved)
             currentGroup.files[file].toBeRemoved.push(options.toBeRemoved);
-        if (options?.includeInFinalOutput)
+        if (options?.includeInFinalOutput !== undefined)
             currentGroup.files[file].includeInFinalOutput = options.includeInFinalOutput;
     }
 }
@@ -237,14 +191,17 @@ process.once('beforeExit', async () => {
         targets += `${out_name}${group.finalExeSuffix} `;
         let recipe = '';
         let objects = '';
+        let non_objects = '';
         for (const fileName in group.files) {
             if (!Object.hasOwn(group.files, fileName))
                 continue;
             const file = group.files[fileName];
             const fileLastExt = fileName.split('.').pop();
-            let obj_out = `${build_dir}/${fileName}.o`;
+            let obj_out = `${build_dir}/${fileName}${globalExtSuffix[fileLastExt] ? `.${globalExtSuffix[fileLastExt]}` : ""}`;
             if (file.includeInFinalOutput)
                 objects += ` ${obj_out}`;
+            else
+                non_objects += ` ${obj_out}`;
             let final_flags = `${ /* globalSrcFileFlags */''} ${file.flags ?? ''}`;
             for (const ext of fileName.split('.').slice(1)) {
                 if (ext.length <= 0)
@@ -260,7 +217,7 @@ process.once('beforeExit', async () => {
         if (group.finalFlagsToBeRemoved.length > 0)
             for (const remove of group.finalFlagsToBeRemoved)
                 group_final_flags = group_final_flags.replaceAll(remove, '');
-        make_out += `OBJ_${name}=${objects}\n${out_name}${group.finalExeSuffix}:$(OBJ_${name})\n\t${group.finalExe} ${group_final_flags}\n${recipe}-include $(OBJ_${name}:=.d)\n`;
+        make_out += `OBJ_${name}=${objects}\n${out_name}${group.finalExeSuffix}:$(OBJ_${name}) ${non_objects}\n\t${group.finalExe} ${group_final_flags}\n${recipe}-include $(OBJ_${name}:=.d)\n`;
     }
     await fs.promises.writeFile('./Makefile', `all: ${targets}\n${make_out}`);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tcbuilder",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Build System",
   "homepage": "https://github.com/umutfahriozkan/tcbuild#readme",
   "bugs": {