MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

honor external javac setting on rebuild

Browse Source
This commit is contained in:
peter
2012-04-15 12:41:05 +02:00
parent 2ed1fd1e53
commit 2018d30e57
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
View File

@@ -345,12 +345,14 @@ public class CompileServerManager implements ApplicationComponent{
final CompileServerClient client = ensureServerRunningAndClientConnected(true);
if (client != null) {
final Map<String, String> userData = new LinkedHashMap<String, String>();
userData.putAll(_userData);
if (!isRebuild) { //todo pass user data on rebuild as well?
userData.putAll(_userData);
}
if (Registry.is("compiler.server.use.external.javac.process")) {
userData.put(GlobalOptions.USE_EXTERNAL_JAVAC_OPTION, "true");
}
final RequestFuture requestFuture = isRebuild ?
client.sendRebuildRequest(projectId, handler) :
client.sendRebuildRequest(projectId, handler, userData) :
client.sendCompileRequest(isMake, projectId, modules, artifacts, paths, userData, handler);
futureRef.set(requestFuture);
}

4
jps/jps-builders/src/org/jetbrains/jps/client/CompileServerClient.java
View File

@@ -44,9 +44,9 @@ public class CompileServerClient extends SimpleProtobufClient<JpsServerResponseH
}
@NotNull
public RequestFuture sendRebuildRequest(String projectId, JpsServerResponseHandler handler) throws Exception{
public RequestFuture sendRebuildRequest(String projectId, JpsServerResponseHandler handler, Map<String, String> userData) throws Exception{
checkConnected();
return sendRequest(ProtoUtil.createRebuildRequest(projectId, Collections.<String, String>emptyMap()), handler);
return sendRequest(ProtoUtil.createRebuildRequest(projectId, userData), handler);
}
@NotNull