Correction de bug - À vérifier
This commit is contained in:
parent
b74fbf3477
commit
7d392117e9
src/fr/monlouyan/bakefile
@ -3,6 +3,7 @@ package fr.monlouyan.bakefile;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Moteur principal de l'application Bake.
|
* Moteur principal de l'application Bake.
|
||||||
@ -85,4 +86,12 @@ public class BakeEngine {
|
|||||||
executor.execute(rule);
|
executor.execute(rule);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Récupère les noms de toutes les règles.
|
||||||
|
* @return Un ensemble contenant les noms de toutes les règles
|
||||||
|
*/
|
||||||
|
public static Set<String> getAllRuleNames() {
|
||||||
|
return ruleMap.keySet();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -1,6 +1,7 @@
|
|||||||
package fr.monlouyan.bakefile;
|
package fr.monlouyan.bakefile;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -73,135 +74,171 @@ public class Rule {
|
|||||||
* Vérifie si la règle doit être mise à jour.
|
* Vérifie si la règle doit être mise à jour.
|
||||||
* @return true si la règle doit être mise à jour, false sinon
|
* @return true si la règle doit être mise à jour, false sinon
|
||||||
*/
|
*/
|
||||||
public boolean needsUpdate() {
|
public boolean needsUpdate() {
|
||||||
if (BakeCLI.isDebug()){
|
if (BakeCLI.isDebug()){
|
||||||
System.out.println("Debug : Checking if rule " + name + " needs update");
|
System.out.println("Debug : Checking if rule " + name + " needs update");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Les règles phony sont toujours mises à jour
|
// Les règles phony sont toujours mises à jour
|
||||||
if (isPhony) {
|
if (isPhony) {
|
||||||
if (BakeCLI.isDebug()) {
|
if (BakeCLI.isDebug()) {
|
||||||
System.out.println("Debug : Rule " + name + " is phony, always needs update");
|
System.out.println("Debug : Rule " + name + " is phony, always needs update");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip targets with tilde in path (home directory) to match make behavior
|
// Skip targets with tilde in path (home directory) to match make behavior
|
||||||
if (name.startsWith("~")) {
|
if (name.startsWith("~")) {
|
||||||
if (BakeCLI.isDebug()) {
|
if (BakeCLI.isDebug()) {
|
||||||
System.out.println("Debug : Skipping home directory path: " + name);
|
System.out.println("Debug : Skipping home directory path: " + name);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Vérifier d'abord toutes les dépendances avant d'exécuter quoi que ce soit
|
// Si le fichier cible n'existe pas et qu'il y a des commandes, il doit être mis à jour
|
||||||
for (String dependency : dependencies) {
|
File targetFile = new File(name);
|
||||||
// Skip dependencies with tilde in path
|
if (!targetFile.exists() && !commands.isEmpty()) {
|
||||||
if (dependency.startsWith("~")) {
|
if (BakeCLI.isDebug()) {
|
||||||
continue;
|
System.out.println("Debug : Target file " + name + " does not exist and has commands, needs update");
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
File depFile = new File(dependency);
|
// Vérifier d'abord toutes les dépendances avant d'exécuter quoi que ce soit
|
||||||
boolean hasRule = BakeEngine.hasRule(dependency);
|
for (String dependency : dependencies) {
|
||||||
|
// Skip dependencies with tilde in path
|
||||||
|
if (dependency.startsWith("~")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Ignorer les options de compilation qui pourraient avoir un ':' dedans
|
// Ignorer les options de compilation qui pourraient avoir un ':' dedans
|
||||||
if (dependency.startsWith("-") || dependency.contains(":")) {
|
if (dependency.startsWith("-") || dependency.contains(":")) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!depFile.exists() && !dependency.isEmpty() && !hasRule) {
|
File depFile = new File(dependency);
|
||||||
System.out.println("bake: *** No rule to make target `" + dependency + "', needed by `" + name + "'. Stop.");
|
boolean hasRule = BakeEngine.hasRule(dependency);
|
||||||
System.exit(2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Si le fichier cible n'existe pas et qu'il y a des commandes, il doit être mis à jour
|
if (!depFile.exists() && !dependency.isEmpty() && !hasRule) {
|
||||||
File targetFile = new File(name);
|
// Vérifier si on est en situation de dépendance circulaire déjà traitée
|
||||||
if (!targetFile.exists() && !commands.isEmpty()) {
|
boolean isPartOfCircularDependency = false;
|
||||||
if (BakeCLI.isDebug()) {
|
|
||||||
System.out.println("Debug : Target file " + name + " does not exist and has commands, needs update");
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Si la règle n'a pas de commandes, on vérifie seulement si une dépendance doit être mise à jour
|
// Vérifier si cette dépendance est impliquée dans une relation circulaire
|
||||||
if (commands.isEmpty()) {
|
for (Rule rule : getAllRules()) {
|
||||||
for (String dependency : dependencies) {
|
if (rule.getName().equals(dependency) && rule.getDependencies().contains(name)) {
|
||||||
// Skip dependencies with tilde in path or compiler options
|
if (BakeCLI.isDebug()) {
|
||||||
if (dependency.startsWith("~") || dependency.startsWith("-") || dependency.contains(":")) {
|
System.out.println("Debug: Found circular dependency between " + name + " and " + dependency);
|
||||||
continue;
|
}
|
||||||
}
|
isPartOfCircularDependency = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Rule depRule = BakeEngine.getRule(dependency);
|
if (isPartOfCircularDependency) {
|
||||||
if (depRule != null && depRule.needsUpdate()) {
|
if (BakeCLI.isDebug()) {
|
||||||
if (BakeCLI.isDebug()) {
|
System.out.println("Debug: Ignoring circular dependency: " + dependency);
|
||||||
System.out.println("Debug : Dependency rule " + dependency + " needs update");
|
}
|
||||||
}
|
continue;
|
||||||
return true;
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pour les règles avec des commandes, on vérifie aussi les timestamps
|
System.out.println("bake: *** No rule to make target `" + dependency + "', needed by `" + name + "'. Stop.");
|
||||||
if (BakeCLI.isDebug()){
|
System.exit(2);
|
||||||
System.out.println("Debug : Checking if target file " + name + " exist and is up to date");
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
long targetTimestamp = targetFile.exists() ? TimestampManager.getTimestamp(targetFile) : 0;
|
// Si la règle n'a pas de commandes, on vérifie seulement si une dépendance doit être mise à jour
|
||||||
|
if (commands.isEmpty()) {
|
||||||
|
for (String dependency : dependencies) {
|
||||||
|
// Skip dependencies with tilde in path or compiler options
|
||||||
|
if (dependency.startsWith("~") || dependency.startsWith("-") || dependency.contains(":")) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (BakeCLI.isDebug()) {
|
Rule depRule = BakeEngine.getRule(dependency);
|
||||||
System.out.println("Debug : Target file '" + name + "' last modified at " + TimestampManager.formatTimestamp(targetTimestamp));
|
if (depRule != null && depRule.needsUpdate()) {
|
||||||
}
|
if (BakeCLI.isDebug()) {
|
||||||
|
System.out.println("Debug : Dependency rule " + dependency + " needs update");
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
long currentTime = System.currentTimeMillis();
|
// Pour les règles avec des commandes, on vérifie aussi les timestamps
|
||||||
|
if (BakeCLI.isDebug()){
|
||||||
|
System.out.println("Debug : Checking if target file " + name + " exist and is up to date");
|
||||||
|
}
|
||||||
|
|
||||||
for (String dependency : dependencies) {
|
long targetTimestamp = targetFile.exists() ? TimestampManager.getTimestamp(targetFile) : 0;
|
||||||
// Skip dependencies with tilde in path or compiler options
|
|
||||||
if (dependency.startsWith("~") || dependency.startsWith("-") || dependency.contains(":")) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
File depFile = new File(dependency);
|
if (BakeCLI.isDebug()) {
|
||||||
if (!depFile.exists()) {
|
System.out.println("Debug : Target file '" + name + "' last modified at " + TimestampManager.formatTimestamp(targetTimestamp));
|
||||||
continue;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
long depTimestamp = TimestampManager.getTimestamp(depFile);
|
long currentTime = System.currentTimeMillis();
|
||||||
|
|
||||||
// Vérifier si le timestamp de la dépendance est dans le futur
|
for (String dependency : dependencies) {
|
||||||
if (depTimestamp > currentTime) {
|
// Skip dependencies with tilde in path or compiler options
|
||||||
// Avertissement similaire à make
|
if (dependency.startsWith("~") || dependency.startsWith("-") || dependency.contains(":")) {
|
||||||
System.out.println("bake: Warning: File '" + dependency + "' has modification time "
|
continue;
|
||||||
+ ((depTimestamp - currentTime) / 1000) + " s in the future");
|
}
|
||||||
if (BakeCLI.isDebug()) {
|
|
||||||
System.out.println("Debug : Dependency " + dependency + " has a timestamp in the future, needs update");
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (BakeCLI.isDebug()) {
|
File depFile = new File(dependency);
|
||||||
System.out.println("Debug : Dependency '" + dependency + "' last modified at " + TimestampManager.formatTimestamp(depTimestamp));
|
if (!depFile.exists()) {
|
||||||
}
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
// Si la dépendance est une règle et qu'elle a besoin d'être mise à jour
|
long depTimestamp = TimestampManager.getTimestamp(depFile);
|
||||||
Rule depRule = BakeEngine.getRule(dependency);
|
|
||||||
if (depRule != null && depRule.needsUpdate()) {
|
|
||||||
if (BakeCLI.isDebug()) {
|
|
||||||
System.out.println("Debug : Dependency rule " + dependency + " needs update");
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Vérifier les timestamps seulement si le fichier existe
|
// Vérifier si le timestamp de la dépendance est dans le futur
|
||||||
if (depTimestamp > targetTimestamp) {
|
if (depTimestamp > currentTime) {
|
||||||
if (BakeCLI.isDebug()) {
|
// Avertissement similaire à make
|
||||||
System.out.println("Debug : Dependency " + dependency + " is newer than target file " + name + ", needs update");
|
System.out.println("bake: Warning: File '" + dependency + "' has modification time "
|
||||||
}
|
+ ((depTimestamp - currentTime) / 1000) + " s in the future");
|
||||||
return true;
|
if (BakeCLI.isDebug()) {
|
||||||
}
|
System.out.println("Debug : Dependency " + dependency + " has a timestamp in the future, needs update");
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
if (BakeCLI.isDebug()) {
|
||||||
}
|
System.out.println("Debug : Dependency '" + dependency + "' last modified at " + TimestampManager.formatTimestamp(depTimestamp));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Si la dépendance est une règle et qu'elle a besoin d'être mise à jour
|
||||||
|
Rule depRule = BakeEngine.getRule(dependency);
|
||||||
|
if (depRule != null && depRule.needsUpdate()) {
|
||||||
|
if (BakeCLI.isDebug()) {
|
||||||
|
System.out.println("Debug : Dependency rule " + dependency + " needs update");
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Vérifier les timestamps seulement si le fichier existe
|
||||||
|
if (depTimestamp > targetTimestamp) {
|
||||||
|
if (BakeCLI.isDebug()) {
|
||||||
|
System.out.println("Debug : Dependency " + dependency + " is newer than target file " + name + ", needs update");
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Permet de récupérer la liste de toutes les règles
|
||||||
|
* @return La liste de toutes les règles
|
||||||
|
*/
|
||||||
|
private List<Rule> getAllRules() {
|
||||||
|
List<Rule> allRules = new ArrayList<>();
|
||||||
|
for (String ruleName : BakeEngine.getAllRuleNames()) {
|
||||||
|
Rule rule = BakeEngine.getRule(ruleName);
|
||||||
|
if (rule != null) {
|
||||||
|
allRules.add(rule);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return allRules;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user