Skip to content

Commit

Permalink
Backing out messaging about each command that's starting
Browse files Browse the repository at this point in the history
  • Loading branch information
gbevin committed Jul 19, 2024
1 parent 454c51d commit bb4c980
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
9 changes: 7 additions & 2 deletions src/main/java/rife/bld/BldCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,23 @@
import java.util.Properties;

/**
* Provides functionalities related to dependency hashing and caching.
*
* @author Geert Bevin (gbevin[remove] at uwyn dot com)
* @since 2.0
*/
public class BldCache {
/**
* Represents the name of a cache file used by bld.
* @since 2.0
*/
public static final String BLD_CACHE = "bld.cache";

private static final String PROPERTY_SUFFIX_HASH = ".hash";
private static final String PROPERTY_SUFFIX_LOCAL = ".local";

public static final String WRAPPER_PROPERTIES_HASH = Wrapper.WRAPPER_PROPERTIES + PROPERTY_SUFFIX_HASH;
public static final String BLD_BUILD_HASH = "bld-build" + PROPERTY_SUFFIX_HASH;
private static final String WRAPPER_PROPERTIES_HASH = Wrapper.WRAPPER_PROPERTIES + PROPERTY_SUFFIX_HASH;
private static final String BLD_BUILD_HASH = "bld-build" + PROPERTY_SUFFIX_HASH;

private static final String PROPERTY_EXTENSIONS_PREFIX = "bld.extensions";
private static final String PROPERTY_EXTENSIONS_HASH = PROPERTY_EXTENSIONS_PREFIX + PROPERTY_SUFFIX_HASH;
Expand Down
10 changes: 1 addition & 9 deletions src/main/java/rife/bld/BuildExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,6 @@ public boolean executeCommand(String command)

// try to find a match for the provided command amongst
// the ones that are known
var matched = false;
if (definition == null) {
// try to find starting matching options
var matches = new ArrayList<>(buildCommands().keySet().stream()
Expand All @@ -464,7 +463,7 @@ public boolean executeCommand(String command)
// only proceed if exactly one match was found
if (matches.size() == 1) {
matched_command = matches.get(0);
matched = true;
System.out.println("Executing matched command: " + matched_command);
definition = buildCommands().get(matched_command);
}
}
Expand All @@ -474,13 +473,6 @@ public boolean executeCommand(String command)
currentCommandName_.set(matched_command);
currentCommandDefinition_.set(definition);
try {
if (matched) {
System.out.println("Executing matched command: " + matched_command);
}
else {
System.out.println("Executing command: " + currentCommandName_);
}

definition.execute();
} catch (ExitStatusException e) {
exitStatus(e.getExitStatus());
Expand Down

0 comments on commit bb4c980

Please sign in to comment.