Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion build/gradle.go
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ func (gm *GradleModule) createGradleRunConfig(gradleExecPath string) (*gradleRun
if err != nil {
return nil, err
}
gm.containingBuild.logger.Debug("Created extractor properties file at: ", extractorPropsFile)
return &gradleRunConfig{
env: gm.gradleExtractorDetails.props,
gradle: gradleExecPath,
Expand Down Expand Up @@ -257,6 +258,14 @@ func (config *gradleRunConfig) GetCmd() *exec.Cmd {
if config.initScript != "" {
cmd = append(cmd, "--init-script", config.initScript)
}
// Add BUILDINFO_PROPFILE system property if extractor properties file exists
if config.extractorPropsFile != "" {
jvmProp := fmt.Sprintf("-D%s=%s", extractorPropsDir, config.extractorPropsFile)
if strings.Contains(config.extractorPropsFile, " ") {
jvmProp = fmt.Sprintf("-D%s='%s'", extractorPropsDir, config.extractorPropsFile)
}
cmd = append(cmd, jvmProp)
}
cmd = append(cmd, formatCommandProperties(config.tasks)...)
config.logger.Info("Running gradle command:", strings.Join(cmd, " "))
return exec.Command(cmd[0], cmd[1:]...)
Expand Down Expand Up @@ -294,7 +303,6 @@ func (config *gradleRunConfig) runCmd(stdout, stderr io.Writer) error {
for k, v := range config.env {
command.Env = append(command.Env, k+"="+v)
}
command.Env = append(command.Env, extractorPropsDir+"="+config.extractorPropsFile)
command.Stderr = stderr
command.Stdout = stdout
return command.Run()
Expand Down
Loading