- allow user defined ar params for libs generator

- move libs.makefile path

Author: github0null

res/data/template.libs.yml

@@ -10,6 +10,12 @@
 #
 ##########################################################################################
 
+# -----------
+# Config
+# -----------
+# $AR_PATH: '/Your/AR/Executable/Path'
+# $AR_CMD : '-rcv ${out} ${in}'
+
 ## ----------------------------
 ## examples
 ##  This examples will generate 2 libs after build done, 

src/CodeBuilder.ts

@@ -481,20 +481,22 @@ export abstract class CodeBuilder {
         this.preHandleOptions(builderOptions.options);
 
         // gen libs.makefile
-        const mkfile = File.fromArray([this.project.ToAbsolutePath(outDir), 'libs.makefile']);
-        const mk_txt = this.project.genLibsMakefileContent(mkfile.name);
-        if (mk_txt) {
+        const mkfile_dir  = new File(this.project.ToAbsolutePath(outDir + '/.lib'));
+        const mkfile_path = `${mkfile_dir.name}/Makefile`;
+        const mkfile_cont = this.project.genLibsMakefileContent(mkfile_path);
+        if (mkfile_cont) {
             try {
-                mkfile.Write(mk_txt);
+                if (!mkfile_dir.IsDir()) mkfile_dir.CreateDir(true);
+                fs.writeFileSync(`${this.project.ToAbsolutePath(outDir)}/${mkfile_path}`, mkfile_cont);
                 let command: any = {
-                    name: 'make libs',
-                    command: `make --directory=./${outDir} --makefile=./${mkfile.name} all`
+                    name: 'make libraries',
+                    command: `make --directory=./${outDir} --makefile=./${mkfile_path} all`
                 };
                 if (builderOptions.options.afterBuildTasks == undefined)
                     builderOptions.options.afterBuildTasks = [];
                 builderOptions.options.afterBuildTasks = [command].concat(builderOptions.options.afterBuildTasks);
             } catch (error) {
-                GlobalEvent.emit('msg', newMessage('Warning', `Generating '${mkfile.name}' failed !`));
+                GlobalEvent.emit('msg', newMessage('Warning', `Generating '${mkfile_path}' failed !`));
                 GlobalEvent.emit('globalLog', ExceptionToMessage(error, 'Error'));
             }
         }

src/EIDEProject.ts

@@ -1827,7 +1827,10 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         return optFile;
     }
 
-    genLibsMakefileContent(makefileName: string): string | undefined {
+    /**
+     * @param makefile_repath a path relative from build output dir, like: '.lib/Makefile'
+    */
+    genLibsMakefileContent(makefile_repath: string): string | undefined {
 
         const fcfg = this.getLibsGeneratorCfgFile(true);
         if (!fcfg.IsFile())
@@ -1906,6 +1909,9 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
 
         for (const name in cfg) {
 
+            if (name.startsWith('$'))
+                continue; // skip internal vars
+
             let exprs: string[] = cfg[name];
             if (!Array.isArray(exprs)) continue;
 
@@ -1931,6 +1937,11 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
             }
         }
 
+        if (cfg['$AR_PATH'])
+            AR_PATH   = File.ToUnixPath(this.toAbsolutePath(cfg['$AR_PATH']));
+        if (cfg['$AR_CMD'])
+            AR_PARAMS = cfg['$AR_CMD'];
+
         // --------------------------
         // - gen makefile
         // --------------------------
@@ -1945,7 +1956,7 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
                 .replace('${out}', outname);
             let rule_tmp = `# ${libname}
 lib${libname}_OBJS += ${objs.join(AR_OBJ_SEP)}
-lib${libname}: $(lib${libname}_OBJS) ${makefileName}
+lib${libname}: $(lib${libname}_OBJS) ${makefile_repath}
 \t@echo -e $(COLOR_BLUE)-------------------------$(COLOR_END)
 \t@echo -e $(COLOR_BLUE)AR "${outname}"$(COLOR_END)
 \t@echo -e $(COLOR_BLUE)-------------------------$(COLOR_END)
@@ -1990,7 +2001,7 @@ $(OUT_DIR):
 
         mk_tmp = mk_tmp
             .replace('<LIB_TARGETS>', lib_rules.join('\n'))
-            .replace('<LIB_OUT_DIR>', '.lib');
+            .replace('<LIB_OUT_DIR>', NodePath.dirname(makefile_repath));
 
         return mk_tmp;
     }