Fixed: Setting importPaths won't break cache anymore since importPaths now directly depends on sourcePaths and it is being handled in a single place

Author: MrcSnm

source/redub/buildapi.d

@@ -8,7 +8,7 @@ import redub.package_searching.api;
 
 
 ///vX.X.X
-enum RedubVersionOnly = "v1.25.0";
+enum RedubVersionOnly = "v1.25.1";
 ///Redub vX.X.X
 enum RedubVersionShort = "Redub "~RedubVersionOnly;
 ///Redub vX.X.X - Description
@@ -253,10 +253,7 @@ struct BuildConfiguration
 
         ret.language = l;
         if(initialSource)
-        {
             ret.sourcePaths = [initialSource];
-            ret.importDirectories = [initialSource];
-        }
         if(initialStringImport) ret.stringImportPaths = [initialStringImport];
         ret.targetType = TargetType.autodetect;
         ret.outputDirectory = ".";
@@ -1041,7 +1038,6 @@ class ProjectNode
         static void finishMerging(ProjectNode target, ProjectNode input, ref bool[ProjectNode] linkPropagated)
         {
             import redub.misc.path;
-            vvlog("Merging ", input.name, " into ", target.name);
             target.requirements.cfg = target.requirements.cfg.mergeImport(input.requirements.cfg);
             target.requirements.cfg = target.requirements.cfg.mergeExcludedSourceFiles(input.requirements.cfg);
             target.requirements.cfg = target.requirements.cfg.mergeStringImport(input.requirements.cfg);

source/redub/parsers/automatic.d

@@ -187,6 +187,7 @@ private void partiallyFinishBuildRequirements(ref BuildRequirements req, BuildCo
     import std.algorithm.iteration;
     auto libraries = req.cfg.sourceFiles.filter!((name) => name.extension.isLibraryExtension);
     req.cfg.libraries.exclusiveMergePaths(libraries);
+    req.cfg.importDirectories.exclusiveMergePaths(req.cfg.sourcePaths); //importPaths is always a mix of custom imports + sourcePaths
 
     ///Remove libraries from the sourceFiles.
     req.cfg.sourceFiles = inPlaceFilter(req.cfg.sourceFiles, (string file) => !file.extension.isLibraryExtension);

source/redub/parsers/base.d

@@ -64,12 +64,7 @@ void setName(ref BuildRequirements req, string name, ParseConfig c)
 void setTargetName(ref BuildRequirements req, string name, ParseConfig c){req.cfg.targetName = name;}
 void setTargetPath(ref BuildRequirements req, string path, ParseConfig c){req.cfg.outputDirectory = path;}
 void setTargetType(ref BuildRequirements req, string targetType, ParseConfig c){req.cfg.targetType = targetFrom(targetType);}
-void addImportPaths(ref BuildRequirements req, JSONStringArray paths, ParseConfig c)
-{
-    import std.array;
-    if(c.firstRun) req.cfg.importDirectories = cast(string[])paths.array;
-    else req.cfg.importDirectories.exclusiveMerge(paths);
-}
+void addImportPaths(ref BuildRequirements req, JSONStringArray paths, ParseConfig c){req.cfg.importDirectories.exclusiveMerge(paths);}
 void addStringImportPaths(ref BuildRequirements req, JSONStringArray paths, ParseConfig c){req.cfg.stringImportPaths.exclusiveMergePaths(paths);}
 void addExtraDependencyFiles(ref BuildRequirements req, JSONStringArray files, ParseConfig c){req.cfg.extraDependencyFiles.exclusiveMerge(files);}
 void addFilesToCopy(ref BuildRequirements req, JSONStringArray files, ParseConfig c){req.cfg.filesToCopy = req.cfg.filesToCopy.append(files);}