Fix binary backend executable name/location

atilaneves · Feb 16, 2024 · 19f5cee · 19f5cee
1 parent 36c9d40
commit 19f5cee
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/src/reggae/reggae.d b/src/reggae/reggae.d
@@ -290,7 +290,7 @@ private Binary buildReggaefileDub(O)(
     import std.path: buildPath;
     import std.algorithm: map, joiner;
     import std.range: chain, only;
-    import std.array: replace;
+    import std.array: replace, join;
 
      // calculates .dep so getReggaeFileDependenciesDlang works below
     calculateReggaeFileDeps(output, options);
@@ -318,13 +318,21 @@ private Binary buildReggaefileDub(O)(
     const dubRecipeDir = hiddenDirAbsPath(options);
     const dubRecipePath = buildPath(dubRecipeDir, "dub.sdl");
 
+    const linesIfBinary = [
+        `targetPath ".."`,
+        `targetName "build"`,
+    ];
+    const extraLines = options.backend == Backend.binary
+        ? linesIfBinary
+        : [];
+
     writeIfDiffers(
         output,
         dubRecipePath,
         reggaeFileDubSdl.format(
             userSourceFilesForDubSdl,
             importPathsForDubSdl,
-        ),
+        ) ~ extraLines.join("\n"),
     );
 
     writeIfDiffers(
@@ -499,7 +507,7 @@ private string getBuildGenName(in Options options) @safe pure nothrow {
     import reggae.rules.common: exeExt;
 
     const baseName =  options.backend == Backend.binary
-        ? buildPath("../build")
+        ? "../build"
         : "buildgen";
     return baseName ~ exeExt;
 }

diff --git a/tests/it/runtime/regressions.d b/tests/it/runtime/regressions.d
@@ -106,3 +106,23 @@ unittest {
         ninja.shouldFailToExecute(testPath);
     }
 }
+
+@("buildgen.binary")
+@Tags("binary")
+unittest {
+    import reggae.rules.common: exeExt;
+    with(immutable ReggaeSandbox()) {
+        writeFile(
+            "reggaefile.d",
+            q{
+                import reggae;
+                alias lib = staticLibrary!("mylib", Sources!("src"));
+                mixin build!lib;
+            }
+        );
+
+        writeFile("src/foo.d", "void foo() {}");
+        runReggae("-b", "binary");
+        shouldExist("build" ~ exeExt);
+    }
+}