new file option: 'Always In Build'

Author: github0null

src/CodeBuilder.ts

@@ -92,6 +92,7 @@ export interface BuilderParams {
     sha?: { [options_name: string]: string };
     env?: { [name: string]: any };
     sysPaths?: string[];
+    alwaysInBuildSources?: string[];
 }
 
 export interface CompilerCommandsDatabaseItem {
@@ -130,11 +131,13 @@ export abstract class CodeBuilder {
 
     protected genSourceInfo(): {
         sources: string[],
-        params?: { [name: string]: string; }
+        params?: { [name: string]: string; },
+        alwaysBuildSourceFiles?: string[]
     } {
 
         const srcParams: { [name: string]: string; } = {};
         const srcList: { path: string, virtualPath?: string; }[] = this.project.getAllSources();
+        const alwaysBuildSourceFiles: string[] = [];
 
         // append user options for files
         try {
@@ -175,6 +178,14 @@ export abstract class CodeBuilder {
                     const parttenInfo = options?.files;
                     matcher(parttenInfo, 'path');
                 }
+
+                if (Array.isArray(options.alwaysBuildSourceFiles)) {
+                    options.alwaysBuildSourceFiles.forEach((srcPath) => {
+                        if (srcList.findIndex((inf) => this.project.comparePath(inf.path, srcPath)) != -1) {
+                            alwaysBuildSourceFiles.push(srcPath);
+                        }
+                    });
+                }
             }
 
         } catch (err) {
@@ -184,7 +195,8 @@ export abstract class CodeBuilder {
 
         return {
             sources: srcList.map((inf) => inf.path),
-            params: srcParams
+            params: srcParams,
+            alwaysBuildSourceFiles
         }
     }
 
@@ -384,6 +396,7 @@ export abstract class CodeBuilder {
             libDirs: this.getLibDirs().map(p => this.project.toRelativePath(p)),
             defines: this.getProjectCMacroList(),
             sourceList: sourceInfo.sources.sort(),
+            alwaysInBuildSources: sourceInfo.alwaysBuildSourceFiles,
             sourceParams: sourceInfo.params,
             options: JSON.parse(JSON.stringify(compileOptions)),
             env: this.project.getProjectVariables(),

src/EIDEProject.ts

@@ -782,6 +782,7 @@ export interface BaseProjectInfo {
 export interface SourceExtraCompilerOptionsCfg {
     files?: { [key: string]: string };
     virtualPathFiles?: { [key: string]: string };
+    alwaysBuildSourceFiles?: string[];
 }
 
 export interface SourceFileOptions {
@@ -916,6 +917,19 @@ export abstract class AbstractProject implements CustomConfigurationProvider, Pr
         return this.replacePathEnv(p);
     }
 
+    public comparePath(path1: string, path2: string): boolean {
+        const abs1 = this.toAbsolutePath(path1);
+        const abs2 = this.toAbsolutePath(path2);
+        // windows 上盘符可能不区分大小写，因此需比较相对路径
+        if (platform.osType() == 'win32') {
+            const repath1 = this.toRelativePath(abs1);
+            const repath2 = this.toRelativePath(abs2);
+            return repath1 === repath2;
+        } else {
+            return abs1 === abs2;
+        }
+    }
+
     public registerBuiltinVar(key: string, func: () => string) {
         this.builtinEnvVars[key] = func;
     }
@@ -2297,6 +2311,13 @@ $(OUT_DIR):
             }
         }
 
+        if (cfg.alwaysBuildSourceFiles) {
+            const idx = cfg.alwaysBuildSourceFiles.findIndex(p => this.comparePath(p, fspath));
+            if (idx !== -1) {
+                return true;
+            }
+        }
+
         return false;
     }
 

src/EIDEProjectExplorer.ts

@@ -5399,6 +5399,20 @@ export class ProjectExplorer implements CustomConfigurationProvider {
             },
         };
 
+        let isAlwaysInBuild = false;
+        if (extraArgs.alwaysBuildSourceFiles)
+            isAlwaysInBuild = extraArgs.alwaysBuildSourceFiles
+                .findIndex(p => project.comparePath(p, <string>fspath)) !== -1;
+        ui_cfg.items['always_in_build'] = {
+            type: 'bool',
+            attrs: {},
+            name: 'Always In Build',
+            data: <SimpleUIConfigData_boolean>{
+                value: isAlwaysInBuild,
+                default: isAlwaysInBuild,
+            }
+        };
+
         try {
             const db = project.getSourceCompileDatabase(fspath);
             if (db) {
@@ -5431,21 +5445,35 @@ export class ProjectExplorer implements CustomConfigurationProvider {
             }
 
             let category: string = 'files';
-            let argsConf: any = extraArgs;
+            let fileOptions: any = extraArgs;
 
             if (virtpath) {
                 category = 'virtualPathFiles';
             }
 
-            if (!argsConf[category])
-                argsConf[category] = {};
+            if (!fileOptions[category])
+                fileOptions[category] = {};
 
             if (nArgs) {
-                argsConf[category][pattern] = nArgs;
+                fileOptions[category][pattern] = nArgs;
+            } else {
+                if (fileOptions[category][pattern] != undefined)
+                    delete fileOptions[category][pattern];
+            }
+
+            // option: always in build
+            const isAlwaysInBuild = (<SimpleUIConfigData_boolean>new_cfg.items['always_in_build'].data).value;
+            let alwaysBuildSourceFiles: string[] = fileOptions.alwaysBuildSourceFiles || [];
+            if (isAlwaysInBuild) {
+                alwaysBuildSourceFiles.push(<string>fspath);
             } else {
-                if (argsConf[category][pattern] != undefined)
-                    delete argsConf[category][pattern];
+                const idx = alwaysBuildSourceFiles.findIndex(p => project.comparePath(p, <string>fspath));
+                if (idx !== -1) {
+                    alwaysBuildSourceFiles.splice(idx, 1);
+                }
             }
+            alwaysBuildSourceFiles = ArrayDelRepetition(alwaysBuildSourceFiles);
+            fileOptions.alwaysBuildSourceFiles = alwaysBuildSourceFiles.length > 0 ? alwaysBuildSourceFiles : undefined;
 
             project.setSourceExtraArgsCfg(extraArgs);
             project.onSourceCompilerOptionsChanged();