Partial fix

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

Author: worksofliam

cli/src/builders/make/index.ts

@@ -24,15 +24,15 @@ interface Step {
  * parents: this property controls the all target. It will include all the parents of partial build objects.
  * partial: if this property is true, the makefile will only include targets for the partial build objects (and optionally their parents)
  */
-type PartialOptions = { partial: boolean, parents: boolean };
+type PartialOptions = { partial?: boolean, parents?: boolean, parentsChildren?: boolean };
 
 interface PartialTargets {
 	partial: ILEObject[];
 	children?: ILEObject[];
 }
 
 export class MakeProject {
-	private partialOptions: PartialOptions = { partial: false, parents: false };
+	private partialOptions: PartialOptions = { partial: false, parents: false, parentsChildren: false };
 	private settings: iProject = new iProject();
 	private projectActions: ProjectActions;
 	private actionsEnabled: boolean = false;
@@ -235,6 +235,8 @@ export class MakeProject {
 			return;
 		}
 
+		// Gets children of the partial build objects.
+		let allChildren: ILEObject[]|undefined = this.partialOptions.partial ? this.targets.getRequiredObjects(partialBuild) : undefined;
 		let allParents: ILEObject[]|undefined;
 
 		// we also want to build their parents too. We update `partialBuild`
@@ -256,7 +258,9 @@ export class MakeProject {
 			partialBuild = allParents;
 		}
 
-		let allChildren: ILEObject[]|undefined = this.partialOptions.partial ? this.targets.getRequiredObjects(partialBuild) : undefined;
+		if (this.partialOptions.parentsChildren) {
+			allChildren = this.targets.getRequiredObjects(partialBuild);
+		}
 
 		return {
 			partial: partialBuild,

cli/src/cli.ts

@@ -12,6 +12,7 @@ export let cliSettings = {
 	userBranch: ``,
 	makefileIsPartial: false,
 	makefileWithParents: false,
+	makefileWithParentsChildren: false,
 	assumeSourcesArePrograms: false,
 };
 

cli/src/index.ts

@@ -77,6 +77,11 @@ async function main() {
 				cliSettings.makefileWithParents = true;
 				break;
 
+			case `-wpc`:
+			case `--with-parents-children`:
+				cliSettings.makefileWithParentsChildren = true;
+				break;
+
 			case '-ap':
 			case '--assume-programs':
 				cliSettings.assumeSourcesArePrograms = true;
@@ -248,7 +253,8 @@ async function main() {
 
 			makeProj.setPartialOptions({
 				partial: cliSettings.makefileIsPartial,
-				parents: cliSettings.makefileWithParents
+				parents: cliSettings.makefileWithParents,
+				parentsChildren: cliSettings.makefileWithParentsChildren
 			})
 
 			let specificObjects: ILEObject[] | undefined = cliSettings.lookupFiles ? cliSettings.lookupFiles.map(f => targets.getResolvedObject(path.join(cwd, f))).filter(o => o) : undefined;

cli/test/cs_with_bnddir.test.ts

@@ -105,12 +105,17 @@ describe(`pseudo tests`, () => {
 
     const nept = resolvedObjects.find(f => f.systemName === `NEMP` && f.type === `FILE`);
     const targetsOut = makefile.generateTargets([nept]).join(`\n`);
+    console.log(targetsOut);
 
     expect(targetsOut).toContain(`all: .logs .evfevent library $(PREPATH)/NEMP.FILE $(PREPATH)/NEWEMP.PGM $(PREPATH)/DEPTS.PGM`);
     expect(targetsOut).not.toContain(`$(PREPATH)/NEWEMP.PGM:`);
 
     const rules = makefile.generateGenericRules([nept]).join(`\n`);
     console.log(rules);
+
+    expect(rules).toContain(`$(PREPATH)/NEMP.FILE:`);
+    expect(rules).toContain(`$(PREPATH)/NEWEMP.PGM:`);
+    expect(rules).toContain(`$(PREPATH)/DEPTS.PGM:`);
   });
 
   test('ibmi-bob rules', () => {