diff --git a/ninja_defs.go b/ninja_defs.go index da02aae..c640311 100644 --- a/ninja_defs.go +++ b/ninja_defs.go @@ -56,16 +56,15 @@ type PoolParams struct { // definition. type RuleParams struct { // These fields correspond to a Ninja variable of the same name. - Command string // The command that Ninja will run for the rule. - Depfile string // The dependency file name. - Deps Deps // The format of the dependency file. - Description string // The description that Ninja will print for the rule. - Generator bool // Whether the rule generates the Ninja manifest file. - Pool Pool // The Ninja pool to which the rule belongs. - Restat bool // Whether Ninja should re-stat the rule's outputs. - Rspfile string // The response file. - RspfileContent string // The response file content. - SymlinkOutputs []string // The list of Outputs or ImplicitOutputs that are symlinks. + Command string // The command that Ninja will run for the rule. + Depfile string // The dependency file name. + Deps Deps // The format of the dependency file. + Description string // The description that Ninja will print for the rule. + Generator bool // Whether the rule generates the Ninja manifest file. + Pool Pool // The Ninja pool to which the rule belongs. + Restat bool // Whether Ninja should re-stat the rule's outputs. + Rspfile string // The response file. + RspfileContent string // The response file content. // These fields are used internally in Blueprint CommandDeps []string // Command-specific implicit dependencies to prepend to builds @@ -85,7 +84,6 @@ type BuildParams struct { Rule Rule // The rule to invoke. Outputs []string // The list of explicit output targets. ImplicitOutputs []string // The list of implicit output targets. - SymlinkOutputs []string // The list of Outputs or ImplicitOutputs that are symlinks. Inputs []string // The list of explicit input dependencies. Implicits []string // The list of implicit input dependencies. OrderOnly []string // The list of order-only dependencies. @@ -207,15 +205,6 @@ func parseRuleParams(scope scope, params *RuleParams) (*ruleDef, r.Variables["rspfile_content"] = value } - if len(params.SymlinkOutputs) > 0 { - value, err = parseNinjaString(scope, strings.Join(params.SymlinkOutputs, " ")) - if err != nil { - return nil, fmt.Errorf("error parsing SymlinkOutputs param: %s", - err) - } - r.Variables["symlink_outputs"] = value - } - r.CommandDeps, err = parseNinjaStrings(scope, params.CommandDeps) if err != nil { return nil, fmt.Errorf("error parsing CommandDeps param: %s", err) @@ -376,12 +365,6 @@ func parseBuildParams(scope scope, params *BuildParams, setVariable("description", value) } - if len(params.SymlinkOutputs) > 0 { - setVariable( - "symlink_outputs", - simpleNinjaString(strings.Join(params.SymlinkOutputs, " "))) - } - if len(tags) > 0 { setVariable("tags", simpleNinjaString(formatTags(tags, rule))) }