ae.sys.d.manager: Skip dlang.org LATEST calculation when VERSION file…

… present
CyberShadow · Jan 5, 2017 · 3161dfa · 3161dfa
1 parent a399533
commit 3161dfa
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/sys/d/manager.d b/sys/d/manager.d
@@ -1495,15 +1495,23 @@ EOS";
 				submodule.saveFileState(makeFileName);
 				scope(exit) submodule.saveFileState("dpl-docs/dub.selections.json");
 
-				auto latest = getLatest;
-				log("LATEST=" ~ latest);
-
-				run(getMake(env) ~ [
-					"-f", makeFileName,
-					"all", "kindle", "pdf", "verbatim",
-					] ~ (config.build.components.website.noDateTime ? ["NODATETIME=nodatetime.ddoc"] : []) ~ [ // Can't be last due to https://issues.dlang.org/show_bug.cgi?id=14682
-					"LATEST=" ~ latest,
-				] ~ gnuMakeArgs, env.vars, sourceDir);
+				string latest = null;
+				if (!sourceDir.buildPath("VERSION").exists)
+				{
+					latest = getLatest();
+					log("LATEST=" ~ latest);
+				}
+				else
+					log("VERSION file found, not passing LATEST parameter");
+
+				auto args =
+					getMake(env) ~
+					[ "-f", makeFileName ] ~
+					(config.build.components.website.noDateTime ? ["NODATETIME=nodatetime.ddoc"] : []) ~
+					(latest ? ["LATEST=" ~ latest] : []) ~
+					[ "all", "kindle", "pdf", "verbatim" ] ~
+					gnuMakeArgs;
+				run(args, env.vars, sourceDir);
 			}
 		}