Update: Fixed Issue #59, improved envrionment parsing (a bit faster), better documentation, new test case,

Author: MrcSnm

source/redub/api.d

@@ -246,7 +246,7 @@ int createNewProject(string projectType, string  single, string targetDirectory)
     projectName = single.length ? single.stripExtension : baseName(path);
     userName = getUserName();
     int returnCode = 0;
-    string gitIgnore = "*.exe\n*.pdb\n*.o\n*.obj\n*.lst\n*.lnk\n.history\n.dub\ndocs.json\n__dummy.html\ndocs/\nbuild/\n/"~projectName;
+    string gitIgnore = "*.exe\n*.pdb\n*.o\n*.obj\n*.lst\n*.lnk\n*.ilk\n.history\n.dub\ndocs.json\n__dummy.html\ndocs/\nbuild/\n/"~projectName;
     foreach(ext; [".so", ".dylib", ".dll", ".a", ".lib", "-test-*"])
         gitIgnore~= "\n" ~ projectName ~ ext;
     string appSource =
@@ -747,7 +747,7 @@ ProjectDetails resolveDependencies(
         );
 
     CompilerBinary cBin = req.cfg.getCompiler(compiler);
-    redub.parsers.environment.setupEnvironmentVariablesForRootPackage(cast(immutable)req);
+    redub.parsers.environment.setupEnvironmentVariablesForRootPackage(req);
     if(cDetails.includeEnvironmentVariables)
         req.cfg = req.cfg.merge(redub.parsers.environment.parse());
 
@@ -762,10 +762,7 @@ ProjectDetails resolveDependencies(
     redub.parsers.environment.setupEnvironmentVariablesForPackageTree(tree);
     ///That now only happens at the last stage since some environment variables only finished the definition at that stage
     foreach(ProjectNode n; tree.collapse)
-        n.requirements.cfg = redub.parsers.environment.parseEnvironment(n.requirements.cfg);
-
-
-
+        n.requirements.cfg = redub.parsers.environment.parseEnvironment(n.requirements.cfg); //Second pass on environment, important since now we have all projects available in the env
 
     import redub.libs.colorize;
     import redub.package_searching.dub;

source/redub/buildapi.d

@@ -7,7 +7,7 @@ import redub.package_searching.api;
 
 
 ///vX.X.X
-enum RedubVersionOnly = "v1.26.1";
+enum RedubVersionOnly = "v1.26.2";
 ///Redub vX.X.X
 enum RedubVersionShort = "Redub "~RedubVersionOnly;
 ///Redub vX.X.X - Description
@@ -127,8 +127,12 @@ TargetType targetFrom(string s)
     return ret;
 }
 
-enum excludeRoot;
+///cacheExclude means that the value does not enter in the recipe file cache generation formula. That is good to reuse the project's output
 enum cacheExclude;
+///That means the same thing from cacheExclude, except it will only be excluded for the root project.
+enum excludeRoot;
+///Absolutized means that the strings have their environment value parsed inside the redub.parsers.automatic.postProcessBuildRequirements
+enum absolutized;
 
 struct PluginExecution
 {
@@ -195,18 +199,18 @@ struct BuildConfiguration
     string name;
     string[] versions;
     string[] debugVersions;
-    string[] importDirectories;
-    string[] libraryPaths;
-    string[] stringImportPaths;
+    @absolutized string[] importDirectories;
+    @absolutized string[] libraryPaths;
+    @absolutized string[] stringImportPaths;
     string[] libraries;
     string[] frameworks;
     string[] linkFlags;
     string[] dFlags;
-    string[] sourcePaths;
-    string[] sourceFiles;
-    string[] excludeSourceFiles;
+    @absolutized string[] sourcePaths;
+    @absolutized string[] sourceFiles;
+    @absolutized string[] excludeSourceFiles;
     string[] extraDependencyFiles;
-    string[] filesToCopy;
+    @absolutized string[] filesToCopy;
     string[][] commands;
     PluginExecution[] preBuildPlugins;
     string workingDir;

source/redub/building/cache.d

@@ -197,15 +197,6 @@ ubyte[] hashFunction(const ubyte[] input, ref ubyte[8] output)
     return output;
 }
 
-bool attrIncludesUDA(LookType, Attribs...)()
-{
-    bool hasFound = false;
-    static foreach (value; Attribs)
-        static if (is(typeof(value) == LookType) || is(LookType == value))
-            hasFound = true;
-    return hasFound;
-}
-
 /**
  *
  * Params:

source/redub/command_generators/commons.d

@@ -418,6 +418,15 @@ void setSpanModeAsBreadth(bool breadth)
     atomicStore(usingBreadth, breadth);
 }
 
+bool attrIncludesUDA(LookType, Attribs...)()
+{
+    bool hasFound = false;
+    static foreach (value; Attribs)
+        static if (is(typeof(value) == LookType) || is(LookType == value))
+            hasFound = true;
+    return hasFound;
+}
+
 auto dirEntriesBreadth(string inputPath)
 {
     import std.file;

source/redub/parsers/automatic.d

@@ -110,7 +110,7 @@ BuildRequirements postProcessBuildRequirements(BuildRequirements req, BuildConfi
         req.cfg.flags|= BuildConfigurationFlags.outputsDeps;
 
     partiallyFinishBuildRequirements(req, pending);    ///Merge need to happen after partial finish, since other configuration will be merged
-    req.cfg = redub.parsers.environment.parseEnvironment(req.cfg);
+    req.cfg = redub.parsers.environment.parseEnvironment(req.cfg); //First pass in env parsing
     return req;
 }
 
@@ -149,8 +149,9 @@ private void partiallyFinishBuildRequirements(ref BuildRequirements req, BuildCo
     {
         foreach(ref string dir; *arr)
         {
-            import redub.command_generators.commons : escapePath;
-            if(!isAbsolute(dir)) 
+            import redub.parsers.environment;
+            dir = parseStringWithEnvironment(dir);
+            if(!isAbsolute(dir))
                 dir = redub.misc.path.buildNormalizedPath(req.cfg.workingDir, dir);
         }
     }

source/redub/parsers/environment.d

@@ -126,7 +126,7 @@ struct PackageDubVariables
 /** 
  * Reflects InitialDubVariables in the environment
  */
-void setupBuildEnvironmentVariables(InitialDubVariables dubVars)
+void setupBuildEnvironmentVariables(const ref InitialDubVariables dubVars)
 {
     import std.process;
     static foreach(member; __traits(allMembers, InitialDubVariables))
@@ -166,7 +166,7 @@ InitialDubVariables getInitialDubVariablesFromArguments(DubArguments args, DubBu
  * Params:
  *   root = The root project being parsed
  */
-void setupEnvironmentVariablesForRootPackage(immutable BuildRequirements root)
+void setupEnvironmentVariablesForRootPackage(const ref BuildRequirements root)
 {
     import std.process;
     import std.conv:to;
@@ -186,7 +186,7 @@ void setupEnvironmentVariablesForRootPackage(immutable BuildRequirements root)
  * Params:
  *   root = The root where <PKG>_PACKAGE_DIR will be started to be put on environment
  */
-void setupEnvironmentVariablesForPackageTree(ProjectNode root)
+void setupEnvironmentVariablesForPackageTree(ref ProjectNode root) //It is const
 {
     ///Path to a specific package that is part of the package's dependency graph. $ must be in uppercase letters without the semver string.
     // <PKG>_PACKAGE_DIR ;
@@ -202,7 +202,7 @@ void setupEnvironmentVariablesForPackageTree(ProjectNode root)
  * - DUB_TARGET_NAME
  * - DUB_MAIN_SOURCE_FILE
  */
-PackageDubVariables getEnvironmentVariablesForPackage(const BuildConfiguration cfg)
+PackageDubVariables getEnvironmentVariablesForPackage(const ref BuildConfiguration cfg)
 {
     import std.conv:to;
 
@@ -224,7 +224,7 @@ PackageDubVariables getEnvironmentVariablesForPackage(const BuildConfiguration c
  * - DUB_TARGET_NAME
  * - DUB_MAIN_SOURCE_FILE
  */
-void setupEnvironmentVariablesForPackage(const BuildConfiguration cfg)
+void setupEnvironmentVariablesForPackage(const ref BuildConfiguration cfg)
 {
     PackageDubVariables pack = getEnvironmentVariablesForPackage(cfg);
     static foreach(mem; __traits(allMembers, PackageDubVariables))
@@ -275,15 +275,17 @@ string parseStringWithEnvironment(string str)
         string strVar = str[v.start+1 + bracketOffset..v.end - bracketOffset];
         diffLength-= 1+strVar.length + bracketOffset*2; //$.length + (abcd).length {}.length (optionally)
 
+
         if(strVar.length == 0) //$
             continue;
-        else if(!getEnvVariable(strVar))
+        string envValue = getEnvVariable(strVar);
+        if(!envValue.length)
         {
             variables = variables[0..i] ~ variables[i+1..$];
             i--;
             continue;
         }
-        diffLength+= getEnvVariable(strVar).length;
+        diffLength+= envValue.length;
     }
 	if(variables.length == 0) return str;
 
@@ -369,25 +371,24 @@ BuildConfiguration parseEnvironmentForPreGenerate(BuildConfiguration cfg, out st
  */
 BuildConfiguration parseEnvironment(BuildConfiguration cfg)
 {
+    import redub.command_generators.commons : attrIncludesUDA;
     redub.parsers.environment.setupEnvironmentVariablesForPackage(cfg);
     with(cfg)
     {
-        importDirectories = arrParseEnv(importDirectories);
-        sourcePaths = arrParseEnv(sourcePaths);
-        sourceFiles = arrParseEnv(sourceFiles);
-        libraries = arrParseEnv(libraries);
-        libraryPaths = arrParseEnv(libraryPaths);
-        dFlags = arrParseEnv(dFlags);
-        linkFlags = arrParseEnv(linkFlags);
-
+        static foreach(mem; __traits(allMembers, BuildConfiguration))
+        {
+            static if(
+                !attrIncludesUDA!(absolutized, __traits(getAttributes, __traits(getMember, cfg, mem)))
+                && is(typeof(__traits(getMember, cfg, mem)) == string[])
+            )
+                __traits(getMember, cfg, mem) = arrParseEnv(__traits(getMember, cfg, mem));
+        }
         if(cfg.commands.length > RedubCommands.postGenerate)
             cfg.commands[RedubCommands.postGenerate] = arrParseEnv(cfg.commands[RedubCommands.postGenerate]);
         if(cfg.commands.length > RedubCommands.preBuild)
             cfg.commands[RedubCommands.preBuild] = arrParseEnv(cfg.commands[RedubCommands.preBuild]);
         if(cfg.commands.length > RedubCommands.postBuild)
             cfg.commands[RedubCommands.postBuild] = arrParseEnv(cfg.commands[RedubCommands.postBuild]);
-        stringImportPaths = arrParseEnv(stringImportPaths);
-        filesToCopy = arrParseEnv(filesToCopy);
     }
     return cfg;
 }
@@ -522,7 +523,21 @@ else
     string getEnvVariable(string key)
     {
         string* ret = key in redubEnv;
-        if(ret) return *ret;
+        while(ret)
+        {
+            key = *ret;
+            if(key.length == 0)
+                return null;
+            else if(key[0] != '$')
+                return key;
+            else
+            {
+                key = key[1..$];
+                if(key.length > 1 && key[0] == '{' && key[$-1] == '}')
+                    key = key[1..$-1];
+            }
+            ret = key in redubEnv;
+        }
         return null;
     }
     shared static this()

tests/env/.gitignore

@@ -0,0 +1,20 @@
+*.exe
+*.pdb
+*.o
+*.obj
+*.lst
+*.lnk
+*.ilk
+.history
+.dub
+docs.json
+__dummy.html
+docs/
+build/
+/env
+env.so
+env.dylib
+env.dll
+env.a
+env.lib
+env-test-*

tests/env/dub.json

@@ -0,0 +1,4 @@
+{
+    "name": "env",
+    "stringImportPaths": ["$LOL"]
+}

tests/env/repro.bat

@@ -0,0 +1,3 @@
+set LOL=%CD%\simport
+echo LOL variable set to %LOL%
+redub -v -f

tests/env/simport/main.inl

@@ -0,0 +1,5 @@
+void main()
+{
+	import std;
+	writeln("Everything OK.");
+}