Merge pull request #131 from IBM/fix/makefile_rules_override

Fix `Rules.mk` blanking out dependencies, fix incorrect `actions.json` usage

Author: worksofliam

cli/src/builders/make/customRules.ts

@@ -67,8 +67,9 @@ export function readAllRules(targets: Targets, project: MakeProject) {
             const currentTarget = targets.getTarget({systemName: targetName, type: targetType});
 
             if (currentTarget) {
-              // We set this to empty since we're overriding them
-              currentTarget.deps = [];
+              // We actually don't want to clear out existing deps found by SO
+              // Instead, let's combine them with the deps found in rules.mk
+              // currentTarget.deps = [];
 
               const parts = value.split(` `).map(p => p.trim()).filter(p => p.length > 0);
 
@@ -80,17 +81,19 @@ export function readAllRules(targets: Targets, project: MakeProject) {
                 const objType = partSplit[1] as ObjectType;
 
                 if (objName && objType) {
-                  const obj = targets.searchForObject({systemName: objName, type: objType});
-
-                  if (obj) {
-                    currentTarget.deps.push(obj);
-                  } else {
-                    warningOut(`make: Failed to find '${part}' in '${relative}'`);
+                  if (!currentTarget.deps.some(d => d.systemName === objName && d.type === objType)) {
+                    const obj = targets.searchForObject({systemName: objName, type: objType});
+
+                    if (obj) {
+                      currentTarget.deps.push(obj);
+                    } else {
+                      warningOut(`make: Failed to find '${part}' in '${relative}'`);
+                    }
                   }
                 }
               }
             }
-        }
+          }
 
         }
       }

cli/src/builders/make/index.ts

@@ -24,6 +24,7 @@ export class MakeProject {
 	private noChildren: boolean = false;
 	private settings: iProject = new iProject();
 	private projectActions: ProjectActions;
+	private actionsEnabled: boolean = false;
 
 	private folderSettings: {[folder: string]: FolderOptions} = {};
 
@@ -35,8 +36,14 @@ export class MakeProject {
 		this.noChildren = noChildren;
 	}
 
+	public useActions() {
+		this.actionsEnabled = true;
+	}
+
 	async setupSettings() {
-		await this.projectActions.loadAllActions();
+		if (this.actionsEnabled) {
+			await this.projectActions.loadAllActions();
+		}
 
 		// First, let's setup the project settings
 		try {

cli/src/cli.ts

@@ -5,6 +5,7 @@ export let cliSettings = {
 	cliMode: false,
 	infoMessages: false,
 	buildFile: "none" as BuildFiles,
+	withActions: false,
 	fixIncludes: false,
 	autoRename: false,
 	fileList: false,

cli/src/index.ts

@@ -58,6 +58,10 @@ async function main() {
 				i++;
 				break;
 
+			case `-wa`:
+				cliSettings.withActions = true;
+				break;
+
 			case '-nc':
 			case '--no-children':
 				cliSettings.makeFileNoChildren = true;
@@ -95,6 +99,9 @@ async function main() {
 				console.log(`\t-bf make|bob|imd|json\tCreate build files of a specific format`);
 				console.log(`\t\t\t\tExample: -bf make`);
 				console.log(``);
+				console.log(`\t-wa\t\tWhen using '-bf make', use commands`);
+				console.log(`\t\t\tthat are found in the 'actions.json' files.`);
+				console.log(``);
 				console.log(`\t-bl <name>\tSet the BRANCHLIB environment variable based on `);
 				console.log(`\t\t\ta user provided branch name, and will write it out.`);
 				console.log(`\t\t\tExample: -bl feature/123-cool-idea`);
@@ -213,6 +220,12 @@ async function main() {
 			break;
 		case `make`:
 			const makeProj = new MakeProject(cwd, targets, fs);
+
+			// Enables the use of actions.json for commands
+			if (cliSettings.withActions) {
+				makeProj.useActions();
+			}
+
 			await makeProj.setupSettings();
 
 			makeProj.setNoChildrenInBuild(cliSettings.makeFileNoChildren);

cli/src/targets.ts

@@ -927,7 +927,11 @@ export class Targets {
 								const simpleName = trimQuotes(def.object.name, `"`);
 								// TODO: do we need to look for SRVPGM (function) or PGM (procedure) here?
 								const resolvedObject = this.searchForAnyObject({ name: simpleName, types: [`FILE`, `SRVPGM`, `PGM`] });
-								if (resolvedObject) newTarget.deps.push(resolvedObject);
+								if (resolvedObject) {
+									if (!newTarget.deps.find(d => d.systemName === resolvedObject.systemName && d.type === resolvedObject.type)) {
+										newTarget.deps.push(resolvedObject);
+									}
+								}
 								else if (!isSqlFunction(def.object.name)) {
 									this.logger.fileLog(newTarget.relativePath, {
 										message: `No object found for reference '${def.object.name}'`,

cli/test/cs_srvpgm.test.ts

@@ -78,6 +78,7 @@ describe(`pseudo tests`, () => {
 
   test('makefile', async () => {
     const makefile = new MakeProject(targets.getCwd(), targets, fs);
+    makefile.useActions();
     await makefile.setupSettings();
 
     const contents = makefile.getMakefile().join(`\n`);
@@ -87,8 +88,7 @@ describe(`pseudo tests`, () => {
 
     expect(contents).not.toContain(`EMPDET.SRVPGM`); // Ensure no service program is created
     expect(contents).toContain(`EMPDET.MODULE`);
-
-    console.log(contents);
+    expect(contents).toContain(`CRTSQLRPGI OBJ($(BIN_LIB)/EMPDET) SRCSTMF('qrpglesrc/empdet.sqlrpgle') COMMIT(*NONE) DBGVIEW(*SOURCE) COMPILEOPT('TGTCCSID(*JOB)') RPGPPOPT(*LVL2) OPTION(*EVENTF) OBJTYPE(*MODULE)`);
 
     // As picked up from the actions.json
     expect(contents).toContain(`system "CRTBNDRPG NAME(mypgm) THEPARM('qrpglesrc/mypgm.pgm.rpgle')" > .logs/mypgm.splf`);