More improvements to partial builds for makefiles

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

cli/src/builders/make/index.ts

@@ -28,7 +28,7 @@ type PartialOptions = { partial: boolean, parents: boolean };
 
 interface PartialTargets {
 	partial: ILEObject[];
-	children: ILEObject[];
+	children?: ILEObject[];
 }
 
 export class MakeProject {
@@ -231,7 +231,7 @@ export class MakeProject {
 	 * If `parents` is true, it will return all parent objects of the partial build objects, and their children/
 	 */
 	private getPartialTargets(partialBuild?: ILEObject[]): PartialTargets|undefined {
-		if (!partialBuild) {
+		if (partialBuild === undefined) {
 			return;
 		}
 
@@ -288,9 +288,9 @@ export class MakeProject {
 			)
 		}
 
-		if (buildObjects) {
+		if (buildObjects && buildObjects.children) {
 			// If we don't want the children to get built, we only generate the targets for the specific objects
-			for (const obj of buildObjects.children || []) {
+			for (const obj of buildObjects.children) {
 				if (obj.reference) continue; // Skip references
 
 				const target = this.targets.getTarget(obj);
@@ -376,7 +376,7 @@ export class MakeProject {
 					for (const ileObject of objects) {
 						if (ileObject.reference) continue;
 
-						if (buildObjects && !buildObjects.children.some(o => o.systemName === ileObject.systemName && o.type === ileObject.type)) {
+						if (buildObjects && buildObjects.children && !buildObjects.children.some(o => o.systemName === ileObject.systemName && o.type === ileObject.type)) {
 							continue; // Skip this object
 						}
 

cli/src/cli.ts

@@ -8,9 +8,9 @@ export let cliSettings = {
 	withActions: false,
 	fixIncludes: false,
 	autoRename: false,
-	fileList: false,
-	lookupFiles: [] as string[],
+	lookupFiles: undefined as string[]|undefined,
 	userBranch: ``,
+	makefileIsPartial: false,
 	makefileWithParents: false,
 	assumeSourcesArePrograms: false,
 };

cli/src/index.ts

@@ -67,6 +67,11 @@ async function main() {
 				warningOut(`--no-children is deprecated and is default when doing partial builds.`);
 				break;
 
+			case `-ip`:
+			case `--is-partial`:
+				cliSettings.makefileIsPartial = true;
+				break;
+
 			case `-wp`:
 			case `--with-parents`:
 				cliSettings.makefileWithParents = true;
@@ -84,7 +89,7 @@ async function main() {
 			case `-f`:
 			case `--files`:
 			case `-l`:
-				cliSettings.fileList = true;
+				cliSettings.lookupFiles = [];
 				break;
 
 			case `-h`:
@@ -132,6 +137,10 @@ async function main() {
 				console.log(``);
 				console.log(`Options specific to '-bf make':`);
 				console.log(``);
+				console.log(`\t-ip`);
+				console.log(`\t--is-partial\tWill only generate targets that are needed for`);
+				console.log(`\t\t\tthe objects that are being built.`);
+				console.log(``);
 				console.log(`\t-wp`);
 				console.log(`\t--with-parents\tUsed with '-bf make' and will add parents of`);
 				console.log(`\t\t\tobjects being partially built to the makefile.`);
@@ -140,7 +149,7 @@ async function main() {
 				break;
 
 			default:
-				if (cliSettings.fileList) {
+				if (cliSettings.lookupFiles !== undefined) {
 					cliSettings.lookupFiles.push(parms[i]);
 				}
 				break;
@@ -237,9 +246,12 @@ async function main() {
 
 			await makeProj.setupSettings();
 
-			makeProj.setPartialWithImpacts(cliSettings.makefileWithParents);
+			makeProj.setPartialOptions({
+				partial: cliSettings.makefileIsPartial,
+				parents: cliSettings.makefileWithParents
+			})
 
-			let specificObjects: ILEObject[] | undefined = cliSettings.fileList ? cliSettings.lookupFiles.map(f => targets.getResolvedObject(path.join(cwd, f))).filter(o => o) : undefined;
+			let specificObjects: ILEObject[] | undefined = cliSettings.lookupFiles ? cliSettings.lookupFiles.map(f => targets.getResolvedObject(path.join(cwd, f))).filter(o => o) : undefined;
 			writeFileSync(path.join(cwd, `makefile`), makeProj.getMakefile(specificObjects).join(`\n`));
 
 			break;