MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

ui for annotation processors: ability to customize generated sources output dir on per-module basis

Browse Source
This commit is contained in:
Eugene Zhuravlev
2009-11-18 22:17:49 +03:00
parent e4521bca9f
commit fb29c8059d
7 changed files with 154 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/openapi/src/com/intellij/compiler/CompilerConfiguration.java
+3 -8
View File
@@ -19,7 +19,6 @@ package com.intellij.compiler;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
import java.util.Map;
@@ -55,16 +54,12 @@ public abstract class CompilerConfiguration {
public abstract void setAnnotationProcessorsMap(Map<String, String> map);
public abstract void setAnotationProcessedModules(Map<Module, Boolean> modules);
public abstract void setAnotationProcessedModules(Map<Module, String> modules);
public abstract Map<Module, Boolean> getAnotationProcessedModules();
public abstract Map<Module, String> getAnotationProcessedModules();
public abstract boolean isAnnotationProcessingEnabled(Module module);
public abstract boolean isStoreGeneratedSourcesUnderContent(Module module);
public abstract String getGeneratedSourceDirName(Module module);
@NotNull
public abstract String getGeneratedDirName();
public abstract void setGeneratedDirName(String generatedDirName);
}
java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerPaths.java
+11 -4
View File
@@ -51,6 +51,7 @@ public class CompilerPaths {
return o1.compareTo(o2);
}
};
private static final String DEFAULT_GENERATED_DIR_NAME = "generated";
/**
* Returns a directory
@@ -190,10 +191,12 @@ public class CompilerPaths {
return outPathUrl != null? VirtualFileManager.extractPath(outPathUrl) : null;
}
@Nullable
public static String getAnnotationProcessorsGenerationPath(Module module) {
final CompilerConfiguration config = CompilerConfiguration.getInstance(module.getProject());
if (config.isStoreGeneratedSourcesUnderContent(module)) {
final String sourceDirName = config.getGeneratedSourceDirName(module);
if (sourceDirName != null && sourceDirName.length() > 0) {
final String[] roots = ModuleRootManager.getInstance(module).getContentRootUrls();
if (roots.length == 0) {
return null;
@@ -201,14 +204,18 @@ public class CompilerPaths {
if (roots.length > 1) {
Arrays.sort(roots, URLS_COMPARATOR);
}
return VirtualFileManager.extractPath(roots[0]) + "/" + config.getGeneratedDirName();
return VirtualFileManager.extractPath(roots[0]) + "/" + sourceDirName;
}
final String url = CompilerProjectExtension.getInstance(module.getProject()).getCompilerOutputUrl();
final CompilerProjectExtension extension = CompilerProjectExtension.getInstance(module.getProject());
if (extension == null) {
return null;
}
final String url = extension.getCompilerOutputUrl();
if (url == null) {
return null;
}
return VirtualFileManager.extractPath(url) + "/generated/" + module.getName().toLowerCase();
return VirtualFileManager.extractPath(url) + "/" + DEFAULT_GENERATED_DIR_NAME + "/" + module.getName().toLowerCase();
}
@NonNls