Update: Using newest version of redub with a bunch of bug fixes

MrcSnm · MrcSnm · commit bf6459e7d5cc · 2026-02-03T16:38:10.000-03:00
diff --git a/tools/hbuild/dub.json b/tools/hbuild/dub.json
@@ -5,7 +5,7 @@
 	"copyright": "Copyright © 2023, Hipreme",
 	"dependencies": {
 		"arsd-official:terminal": "~>11.5.0",
-		"redub": "~>1.24.13",
+		"redub": "~>1.26.7",
 		"handy-httpd": "~>8.4.3",
 		"archive": "~>0.7.1",
 		"my-ip": "~>0.2.0"
diff --git a/tools/hbuild/dub.selections.json b/tools/hbuild/dub.selections.json
@@ -2,31 +2,27 @@
 	"fileVersion": 1,
 	"versions": {
 		"archive": "0.7.1",
-		"arsd-official:minigui": "11.5.3",
-		"arsd-official:simpledisplay": "11.5.3",
-		"arsd-official:color_base": "11.5.3",
-		"arsd-official:core": "11.5.3",
-		"arsd-official:textlayouter": "11.5.3",
-		"arsd-official:terminal": "11.5.3",
+		"arsd-official": "11.5.3",
 		"handy-httpd": "8.4.5",
 		"httparsed": "1.2.2",
 		"path-matcher": "1.2.0",
 		"slf4d": "3.0.1",
 		"streams": "3.6.0",
 		"my-ip": "0.2.0",
-		"redub": "1.24.14",
-		"adv_diff":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\dub\\packages\\redub\\1.24.14\\redub\\adv_diff"},
-		"hipjson":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\dub\\packages\\redub\\1.24.14\\redub\\hipjson"},
-		"d-segmented-hashmap": "1.0.5",
-		"colorize":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\dub\\packages\\redub\\1.24.14\\redub\\colorize"},
-		"d_dependencies":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\dub\\packages\\redub\\1.24.14\\redub\\d_dependencies"},
-		"dub_sdl_to_json":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\dub\\packages\\redub\\1.24.14\\redub\\dub_sdl_to_json"},
-		"sdlite": "1.3.3",
+		"redub": "1.26.7",
+		"adv_diff":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\.dub\\packages\\redub\\1.26.7\\redub\\adv_diff"},
+		"hipjson": "1.1.1",
+		"d-segmented-hashmap": "1.1.0",
+		"murmurhash-d": "1.0.0",
+		"intel-intrinsics": "1.12.3",
+		"colorize":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\.dub\\packages\\redub\\1.26.7\\redub\\colorize"},
+		"d_dependencies":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\.dub\\packages\\redub\\1.26.7\\redub\\d_dependencies"},
+		"d_downloader":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\.dub\\packages\\redub\\1.26.7\\redub\\d_downloader"},
+		"dub_sdl_to_json":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\.dub\\packages\\redub\\1.26.7\\redub\\dub_sdl_to_json"},
+		"sdlite": "1.3.4",
 		"taggedalgebraic": "1.0.1",
-		"package_suppliers":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\dub\\packages\\redub\\1.24.14\\redub\\package_suppliers"},
-		"semver":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\dub\\packages\\redub\\1.24.14\\redub\\semver"},
-		"xxhash3": "0.0.5",
-		"wasm-sourcemaps": "69e6c80",
-		"wasm-reader": "0.0.6"
+		"package_suppliers":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\.dub\\packages\\redub\\1.26.7\\redub\\package_suppliers"},
+		"semver":  {"path": "..\\..\\..\\..\\..\\AppData\\Local\\.dub\\packages\\redub\\1.26.7\\redub\\semver"},
+		"xxhash3": "0.0.5"
 	}
 }
diff --git a/tools/hbuild/source/app.d b/tools/hbuild/source/app.d
@@ -106,9 +106,6 @@ struct EngineVariables
 			string dmdPath;
 			@("The current DMD path is treated as version")
 			string dmdVersion;
-
-			@("Which dub will be used to compile. Useful for dub development test. Automatically inferred from LDC")
-			string dubPath;
 		}
 		@Section("LDC")
 		{
@@ -388,8 +385,6 @@ void main(string[] args)
 			return;
 		}
 	}
-	if(!("DUB" in environment))
-		environment["DUB"] = getDubPath();
 	Choice[] choices;
 	version(Windows)
 	{
diff --git a/tools/hbuild/source/commons.d b/tools/hbuild/source/commons.d
@@ -903,12 +903,6 @@ Choice getBackChoice()
 }
 
 
-string getDubPath()
-{
-	string dub = buildNormalizedPath(configs["dubPath"].str, "dub");
-	version(Windows) dub = dub.setExtension("exe");
-	return dub;
-}
 
 bool writeTemplate(ref Terminal t, string projectPath, string enginePath)
 {
@@ -1007,33 +1001,6 @@ struct DubArguments
 			c = buildNormalizedPath(configs["dmdPath"].str, "dmd".executableExtension);
 		return c;
 	}
-	
-	string getDubRunCommand()
-	{
-		string dub = getDubPath();
-		string a = command; ///Arguments
-		compiler = getCompiler();
-		if(parallel)      a~= " --parallel";
-		if(recipe)        a~= " --recipe="~recipe;
-		if(build)         a~= " --build="~build;
-		if(arch)          a~= " --arch="~arch;
-		if(compiler != "")a~= " --compiler="~compiler;
-		if(deep)		  a~= " --deep";
-		if(configuration) a~= " -c "~configuration;
-		if(opts != CompilationOptions.init) a~= opts.getDubOptions();
-		if(runArgs)       a~= " -- "~runArgs;
-
-
-		version(Windows)
-		{
-			if(confirmKey) a~= " && pause";
-		}
-		else version(Posix)
-		{
-			if(confirmKey) a~= " && read -p \"Press any key to continue... \" -n1 -s";
-		}
-		return preCommands~dub~" "~a;
-	}
 }
 
 int waitRedub(ref Terminal t, DubArguments dArgs, out ProjectDetails proj, string copyLinkerFilesTo = null)
@@ -1087,21 +1054,10 @@ void inParallel(scope void delegate()[] args...)
 	// }
 }
 
-int waitDub(ref Terminal t, DubArguments dArgs, string copyLinkerFilesTo = null)
+int waitRedub(ref Terminal t, DubArguments dArgs, string copyLinkerFilesTo = null)
 {
-	///Detects the presence of a template file before executing.
 	ProjectDetails d;
-	if(dArgs._command.length >= 3 && dArgs._command[0..3] != "run") return waitRedub(t, dArgs, d, copyLinkerFilesTo);
-	if(execDubBase(t, dArgs) == -1) return -1;
-	string toExec = dArgs.getDubRunCommand();
-	t.writeln(toExec);
-	t.flush;
-	return t.wait(spawnShell(toExec));
-}
-
-int waitDubTarget(ref Terminal t, string target, DubArguments dArgs, string copyLinkerFilesTo = null)
-{
-	return waitDub(t, dArgs.recipe(buildPath(getBuildTarget(target), "dub.json")), copyLinkerFilesTo);
+	return waitRedub(t, dArgs, d, copyLinkerFilesTo);
 }
 
 int waitAndPrint(ref Terminal t, Pid pid)
diff --git a/tools/hbuild/source/features/ldc.d b/tools/hbuild/source/features/ldc.d
@@ -33,7 +33,6 @@ bool installLdc(ref Terminal t, ref RealTimeConsoleInput input, TargetVersion ve
     version(Windows) rdmd = rdmd.setExtension("exe");
     configs["ldcVersion"] = ver.toString;
     configs["ldcPath"] = ldcPath;
-    configs["dubPath"] = binPath;
     updateConfigFile();
     
 
diff --git a/tools/hbuild/source/targets/windows.d b/tools/hbuild/source/targets/windows.d
@@ -114,7 +114,7 @@ ChoiceResult prepareWindows(Choice* c, ref Terminal t, ref RealTimeConsoleInput
 
 	// waitOperations([{
 		std.file.chdir(configs["gamePath"].str);
-		if(timed(t, waitDub(t, DubArguments().command("build").configuration("script").opts(cOpts)) != 0))
+		if(timed(t, waitRedub(t, DubArguments().command("build").configuration("script").opts(cOpts)) != 0))
 			return ChoiceResult.Error;
 			// return false;
 		// return true;
@@ -123,7 +123,7 @@ ChoiceResult prepareWindows(Choice* c, ref Terminal t, ref RealTimeConsoleInput
 		if(!c.scriptOnly)
 		{
 			std.file.chdir(getHipPath);
-			if(timed(t, waitDub(t, DubArguments().command("build").configuration("script").opts(cOpts))) != 0)
+			if(timed(t, waitRedub(t, DubArguments().command("build").configuration("script").opts(cOpts))) != 0)
 				return ChoiceResult.Error;
 		}
 		// return true;

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,6 @@ struct EngineVariables`
`106`	`106`	`string dmdPath;`
`107`	`107`	`@("The current DMD path is treated as version")`
`108`	`108`	`string dmdVersion;`
`109`		`-`
`110`		`- @("Which dub will be used to compile. Useful for dub development test. Automatically inferred from LDC")`
`111`		`- string dubPath;`
`112`	`109`	`}`
`113`	`110`	`@Section("LDC")`
`114`	`111`	`{`
`@@ -388,8 +385,6 @@ void main(string[] args)`
`388`	`385`	`return;`
`389`	`386`	`}`
`390`	`387`	`}`
`391`		`- if(!("DUB" in environment))`
`392`		`- environment["DUB"] = getDubPath();`
`393`	`388`	`Choice[] choices;`
`394`	`389`	`version(Windows)`
`395`	`390`	`{`