Skip to content

Commit

Permalink
Windows: use default shell env for ijar execution, so that .dlls can …
Browse files Browse the repository at this point in the history
…be found.

On Windows, ijar.exe needs msys-2.0.dll and zlib1.dll in PATH.

Needed for #276.

--
MOS_MIGRATED_REVID=114947735
  • Loading branch information
dslomov authored and damienmg committed Feb 18, 2016
1 parent 5c5b0b8 commit cc8fd60
Showing 1 changed file with 4 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,10 @@ protected Artifact createIjarAction(Artifact inputJar, boolean addPrefix) {
.addInput(inputJar)
.addOutput(interfaceJar)
.setExecutable(ijarTarget)
// On Windows, ijar.exe needs msys-2.0.dll and zlib1.dll in PATH.
// Use default shell environment so that those can be found.
// TODO(dslomov): revisit this. If ijar is not msys-dependent, this is not needed.
.useDefaultShellEnvironment()
.addArgument(inputJar.getExecPathString())
.addArgument(interfaceJar.getExecPathString())
.setProgressMessage("Extracting interface " + ruleContext.getLabel())
Expand Down

0 comments on commit cc8fd60

Please sign in to comment.