Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Fix unknown property issue with buildResults variable" #151

Closed
wants to merge 1 commit into from
Closed

Revert "Fix unknown property issue with buildResults variable" #151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/main/groovy/io/ballerina/plugin/BallerinaPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,7 @@ class BallerinaPlugin implements Plugin<Project> {
project.exec {
workingDir project.projectDir
environment 'JAVA_OPTS', '-DBALLERINA_DEV_COMPILE_BALLERINA_ORG=true'
standardOutput = new ByteArrayOutputStream()
showStandardStreams = true
def buildResult = new ByteArrayOutputStream()
if (buildOnDocker) {
createDockerEnvFile("$project.projectDir/docker.env")
def balPackWithDocker = """
Expand All @@ -281,18 +280,22 @@ class BallerinaPlugin implements Plugin<Project> {
"""
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine 'cmd', '/c', "$balPackWithDocker && exit %%ERRORLEVEL%%"
standardOutput = buildResult
} else {
commandLine 'sh', '-c', "$balPackWithDocker"
standardOutput = buildResult
}
} else {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
commandLine 'cmd', '/c', "$distributionBinPath/bal.bat pack --target-dir ${balBuildTarget} --offline && exit %%ERRORLEVEL%%"
standardOutput = buildResult
} else {
commandLine 'sh', '-c', "$distributionBinPath/bal pack --target-dir ${balBuildTarget} --offline"
standardOutput = buildResult
}
}
}
println "Command output: ${standardOutput.toString()}"
println "Command output: ${buildResult.toString()}"

def balaPath = "$project.projectDir/${balBuildTarget}/bala"
def balaDir = new File(balaPath)
Expand Down
Loading