stiti/SAE32_2024
stiti/SAE32_2024
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Suppression des vérifications de chemins avec tilde pour les dépendances et les règles afin de correspondre au comportement de make

Browse Source
This commit is contained in:
Yanis HAMOUDI 2025-03-16 17:54:19 +01:00
parent f5dfdb93de
commit 2b82ea4026
3 changed files with 1 additions and 38 deletions

3
src/fr/monlouyan/bakefile/CommandExecutor.java

@ -56,9 +56,6 @@ public class CommandExecutor {
// Vérifier les timestamps des dépendances pour détecter ceux dans le futur
for (String dependency : rule.getDependencies()) {
if (dependency.startsWith("~")) {
continue;
}
File depFile = new File(dependency);
if (depFile.exists() && TimestampManager.getTimestamp(depFile) > System.currentTimeMillis()) {

16
src/fr/monlouyan/bakefile/DependencyResolver.java

@ -75,13 +75,7 @@ public class DependencyResolver {
// Construire la liste finale des règles dans l'ordre
for (String ruleName : buildOrder) {
// Skip rules with tilde in path (home directory) to match make behavior
if (ruleName.startsWith("~")) {
if (debug) {
System.out.println("Debug: Skipping home directory path in resolution: " + ruleName);
}
continue;
}
Rule rule = ruleMap.get(ruleName);
if (rule != null) {
@ -108,10 +102,6 @@ public class DependencyResolver {
// D'abord traiter les dépendances
for (String dep : rule.getDependencies()) {
// Skip dependencies with tilde in path
if (dep.startsWith("~")) {
continue;
}
topologicalSort(dep, processed, buildOrder);
}
@ -147,10 +137,6 @@ public class DependencyResolver {
if (rule != null) {
List<String> dependenciesCopy = new ArrayList<>(rule.getDependencies());
for (String dependency : dependenciesCopy) {
// Skip dependencies with tilde in path
if (dependency.startsWith("~")) {
continue;
}
if (ruleMap.containsKey(dependency)) {
detectCycle(dependency, visited, stack, ruleName);

20
src/fr/monlouyan/bakefile/Rule.java

@ -108,20 +108,8 @@ public class Rule {
return true;
}
// Skip targets with tilde in path (home directory) to match make behavior
if (name.startsWith("~")) {
if (BakeCLI.isDebug()) {
System.out.println("Debug : Skipping home directory path: " + name);
}
return false;
}
// Vérifier d'abord toutes les dépendances avant d'exécuter quoi que ce soit
for (String dependency : dependencies) {
// Skip dependencies with tilde in path
if (dependency.startsWith("~")) {
continue;
}
File depFile = new File(cleanFileName(dependency));
boolean hasRule = BakeEngine.hasRule(dependency);
@ -143,10 +131,6 @@ public class Rule {
// 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
if (dependency.startsWith("~")) {
continue;
}
Rule depRule = BakeEngine.getRule(dependency);
if (depRule != null && depRule.needsUpdate()) {
@ -173,10 +157,6 @@ public class Rule {
long currentTime = System.currentTimeMillis();
for (String dependency : dependencies) {
// Skip dependencies with tilde in path
if (dependency.startsWith("~")) {
continue;
}
File depFile = new File(cleanFileName(dependency));
if (!depFile.exists()) {