Skip to content

Commit

Permalink
Issue #53: The option of using the external copiler was removed in ID…
Browse files Browse the repository at this point in the history
…EA 14. It is the only supported behavior.
  • Loading branch information
travismorton committed Jul 22, 2014
1 parent 59f6255 commit d65ccc8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
6 changes: 5 additions & 1 deletion META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<id>com.nmatveev.idea-plugin-protobuf</id>
<vendor>Strintec</vendor>
<name>Google Protocol Buffers support</name>
<version>0.5.7</version>
<version>0.5.8</version>
<category>Custom Languages</category>
<description>
<![CDATA[
Expand All @@ -15,6 +15,10 @@
<idea-version since-build="133"/><!-- Idea 13 -->
<change-notes>
<![CDATA[
<p>0.5.8</p>
<ul>
<li>IDEA 14 compatibility</li>
</ul>
<p>0.5.7</p>
<ul>
<li>Fix an incompatibility with version 13.x due to an API method removal.</li>
Expand Down
3 changes: 3 additions & 0 deletions ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
==== 0.5.8
* IDEA 14 compatibility.

==== 0.5.7
* Fix an incompatibility with version 13.x due to an API method removal.
* Due to the API change, the minimum supported version is now IDEA 13.
Expand Down
12 changes: 4 additions & 8 deletions src/protobuf/compiler/PbPrecompileTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,10 @@ public boolean execute(CompileContext context) {
boolean result = true;
final Project project = context.getProject();

boolean useOutOfProcessBuild = CompilerWorkspaceConfiguration.getInstance(project).useOutOfProcessBuild();
if (useOutOfProcessBuild) {
// When using the out of process build, kick off the {@PBCompiler protobuffers generating compiler}.
// When using the internal compiler, the {@PBCompiler} is invoked directly by IDEA.
PbCompiler compiler = new PbCompiler(project);
GeneratingCompiler.GenerationItem[] generationItems = compiler.getGenerationItems(context);
compiler.generate(context, generationItems, null);
}
// Kick off the {@PBCompiler protobuffers generating compiler}.
PbCompiler compiler = new PbCompiler(project);
GeneratingCompiler.GenerationItem[] generationItems = compiler.getGenerationItems(context);
compiler.generate(context, generationItems, null);
return result;
}

Expand Down

0 comments on commit d65ccc8

Please sign in to comment.