rife2/bld
rife2/bld
2
0
Fork 0
mirror of https://github.com/ethauvin/bld.git synced 2025-04-26 00:37:10 -07:00
Code Activity

Backing out messaging about each command that's starting

Browse source
This commit is contained in:
Geert Bevin 2024-07-18 22:20:16 -04:00
parent 454c51db12
commit bb4c980e66
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/rife/bld/BldCache.java
View file

@ -22,18 +22,23 @@ import java.util.List;
import java.util.Properties; import java.util.Properties;
/** /**
* Provides functionalities related to dependency hashing and caching.
* *
* @author Geert Bevin (gbevin[remove] at uwyn dot com) * @author Geert Bevin (gbevin[remove] at uwyn dot com)
* @since 2.0 * @since 2.0
*/ */
public class BldCache { public class BldCache {
/**
* Represents the name of a cache file used by bld.
* @since 2.0
*/
public static final String BLD_CACHE = "bld.cache"; public static final String BLD_CACHE = "bld.cache";
private static final String PROPERTY_SUFFIX_HASH = ".hash"; private static final String PROPERTY_SUFFIX_HASH = ".hash";
private static final String PROPERTY_SUFFIX_LOCAL = ".local"; private static final String PROPERTY_SUFFIX_LOCAL = ".local";
public static final String WRAPPER_PROPERTIES_HASH = Wrapper.WRAPPER_PROPERTIES + PROPERTY_SUFFIX_HASH; private 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 BLD_BUILD_HASH = "bld-build" + PROPERTY_SUFFIX_HASH;
private static final String PROPERTY_EXTENSIONS_PREFIX = "bld.extensions"; private static final String PROPERTY_EXTENSIONS_PREFIX = "bld.extensions";
private static final String PROPERTY_EXTENSIONS_HASH = PROPERTY_EXTENSIONS_PREFIX + PROPERTY_SUFFIX_HASH; private static final String PROPERTY_EXTENSIONS_HASH = PROPERTY_EXTENSIONS_PREFIX + PROPERTY_SUFFIX_HASH;

10
src/main/java/rife/bld/BuildExecutor.java
View file

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