Assume the default build target is 'all'

'all' is a well-known name

The default target must be explicitly named on the dry-run command line,
because of [Remaking Makefiles](https://www.gnu.org/software/make/manual/html_node/Remaking-Makefiles.html)
rule of GNU Make. In order to avoid remaking makefiles during a dry-run,
the makefile must also be given as an explicit target.

If the makefile were given as the only target, the dry-run would not
mean 'dry-run the default target', but 'dry-run nothing'. Thus, if the
makefile must be given as a target, the default target must be made
explicit, and thus is must be defined.

Also, previously 'all' was added to the make invokation for listing
targets. This would prevent the .DEFAULT_GOAL to be correctly set as the
Makefile declared, and instead be set to the value given on the command
line. An explicit target is no longer given on the --print-data-base
invocation, so the output .DEFAULT_GOAL will be the genuine default goal.

This commit makes currentTarget always defined, with the default value
'all'; this is a reasonable, well-known default.

Author: drok

src/configuration.ts

@@ -936,24 +936,22 @@ export async function readMakefileConfigurations(): Promise<void> {
 // Last target picked from the set of targets that are run by the makefiles
 // when building for the current configuration.
 // Saved into the settings storage. Also reflected in the configuration status bar button
-let currentTarget: string | undefined;
-export function getCurrentTarget(): string | undefined { return currentTarget; }
-export function setCurrentTarget(target: string | undefined): void { currentTarget = target; }
+// Assume the well-known "all" target for the default goal
+let currentTarget: string = "all";
+export function getCurrentTarget(): string { return currentTarget; }
+// Set the current target, or 'all' if none was given
+export function setCurrentTarget(target: string = "all"): void { currentTarget = target; }
 
 // Read current target from workspace state, update status bar item
 function readCurrentTarget(): void {
     let buildTarget : string | undefined = extension.getState().buildTarget;
+    setCurrentTarget(buildTarget);
     if (!buildTarget) {
-        logger.message("No target defined in the workspace state. Assuming 'Default'.");
-        statusBar.setTarget("Default");
-        // If no particular target is defined in settings, use 'Default' for the button
-        // but keep the variable empty, to not append it to the make command.
-        currentTarget = "";
+        logger.message(`No target defined in the workspace state. Assuming '${currentTarget}'.`);
     } else {
-        currentTarget = buildTarget;
         logger.message(`Reading current build target "${currentTarget}" from the workspace state.`);
-        statusBar.setTarget(currentTarget);
     }
+    statusBar.setTarget(currentTarget);
 }
 
 let configureOnOpen: boolean | undefined;

src/make.ts

@@ -446,17 +446,6 @@ export async function generateParseContent(progress: vscode.Progress<{}>,
     // Continue with the make dryrun invocation
     let makeArgs: string[] = [];
 
-    // Prepend the target to the arguments given in the makefile.configurations object,
-    // unless we want to parse for the full set of available targets.
-    if (forTargets) {
-        makeArgs.push("all");
-    } else {
-        let currentTarget: string | undefined = configuration.getCurrentTarget();
-        if (currentTarget) {
-            makeArgs.push(currentTarget);
-        }
-    }
-
     // Include all the make arguments defined in makefile.configurations.makeArgs
     makeArgs = makeArgs.concat(configuration.getConfigurationMakeArgs());
 
@@ -492,6 +481,9 @@ export async function generateParseContent(progress: vscode.Progress<{}>,
             }
         });
 
+        // Append the target to the arguments given in the makefile.configurations object
+        makeArgs.push(configuration.getCurrentTarget());
+
         logger.messageNoCR(`Generating ${getConfigureIsInBackground() ? "in the background a new " : ""}configuration cache with command: `);
     }
 

src/test/fakeSuite/extension.test.ts

@@ -64,7 +64,6 @@ suite('Fake dryrun parsing', /*async*/() => {
       await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
       configuration.setCurrentLaunchConfiguration(undefined);
       configuration.setCurrentMakefileConfiguration("Default");
-      configuration.setCurrentTarget(undefined);
       configuration.initFromState();
       await configuration.initFromSettings();
 
@@ -118,7 +117,6 @@ suite('Fake dryrun parsing', /*async*/() => {
          await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
          configuration.setCurrentLaunchConfiguration(undefined);
          configuration.setCurrentMakefileConfiguration("Default");
-         configuration.setCurrentTarget(undefined);
          configuration.initFromState();
          await configuration.initFromSettings();
 
@@ -173,7 +171,6 @@ suite('Fake dryrun parsing', /*async*/() => {
          await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
          configuration.setCurrentLaunchConfiguration(undefined);
          configuration.setCurrentMakefileConfiguration("Default");
-         configuration.setCurrentTarget(undefined);
          configuration.initFromState();
          await configuration.initFromSettings();
 
@@ -250,7 +247,6 @@ suite('Fake dryrun parsing', /*async*/() => {
          await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
          configuration.setCurrentLaunchConfiguration(undefined);
          configuration.setCurrentMakefileConfiguration("Default");
-         configuration.setCurrentTarget(undefined);
          configuration.initFromState();
          await configuration.initFromSettings();
 
@@ -312,7 +308,6 @@ suite('Fake dryrun parsing', /*async*/() => {
          await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
          configuration.setCurrentLaunchConfiguration(undefined);
          configuration.setCurrentMakefileConfiguration("Default");
-         configuration.setCurrentTarget(undefined);
          configuration.initFromState();
          await configuration.initFromSettings();
 
@@ -374,7 +369,6 @@ suite('Fake dryrun parsing', /*async*/() => {
          await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
          configuration.setCurrentLaunchConfiguration(undefined);
          configuration.setCurrentMakefileConfiguration("Default");
-         configuration.setCurrentTarget(undefined);
          configuration.initFromState();
          await configuration.initFromSettings();
 
@@ -434,7 +428,6 @@ suite('Fake dryrun parsing', /*async*/() => {
       await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
       configuration.setCurrentLaunchConfiguration(undefined);
       configuration.setCurrentMakefileConfiguration("Default");
-      configuration.setCurrentTarget(undefined);
       configuration.initFromState();
       await configuration.initFromSettings();
 
@@ -476,7 +469,6 @@ suite('Fake dryrun parsing', /*async*/() => {
       await vscode.workspace.getConfiguration("makefile").update("launchConfigurations", undefined);
       configuration.setCurrentLaunchConfiguration(undefined);
       configuration.setCurrentMakefileConfiguration("Default");
-      configuration.setCurrentTarget(undefined);
       configuration.initFromState();
       await configuration.initFromSettings();