Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b129b7cb authored by Anas Sulaiman's avatar Anas Sulaiman Committed by Gerrit Code Review
Browse files

Merge "Allow specifying sub-dir in sbox output" into main

parents 12f239fd b4dff134
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -1157,11 +1157,15 @@ func (c *RuleBuilderCommand) Outputs(paths WritablePaths) *RuleBuilderCommand {

// OutputDir adds the output directory to the command line. This is only available when used with RuleBuilder.Sbox,
// and will be the temporary output directory managed by sbox, not the final one.
func (c *RuleBuilderCommand) OutputDir() *RuleBuilderCommand {
func (c *RuleBuilderCommand) OutputDir(subPathComponents ...string) *RuleBuilderCommand {
	if !c.rule.sbox {
		panic("OutputDir only valid with Sbox")
	}
	return c.Text(sboxOutDir)
	path := sboxOutDir
	if len(subPathComponents) > 0 {
		path = filepath.Join(append([]string{sboxOutDir}, subPathComponents...)...)
	}
	return c.Text(path)
}

// DepFile adds the specified depfile path to the paths returned by RuleBuilder.DepFiles and adds it to the command