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

system-independent file separators in annotation processor profiles (IDEA-145718)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2015-10-01 12:14:09 +02:00
parent 829af376c6
commit 9d66d04c4a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/model-serialization/src/org/jetbrains/jps/model/serialization/java/compiler/AnnotationProcessorProfileSerializer.java
+6 -4
View File
@@ -45,10 +45,12 @@ public class AnnotationProcessorProfileSerializer {
profile.setEnabled(Boolean.valueOf(element.getAttributeValue(ENABLED, "false")));
final Element srcOutput = element.getChild("sourceOutputDir");
profile.setGeneratedSourcesDirectoryName(srcOutput != null ? srcOutput.getAttributeValue(NAME) : null, false);
final String out = srcOutput != null ? srcOutput.getAttributeValue(NAME) : null;
profile.setGeneratedSourcesDirectoryName(out != null? FileUtil.toSystemDependentName(out) : null, false);
final Element srcTestOutput = element.getChild("sourceTestOutputDir");
profile.setGeneratedSourcesDirectoryName(srcTestOutput != null ? srcTestOutput.getAttributeValue(NAME) : null, true);
final String testOut = srcTestOutput != null ? srcTestOutput.getAttributeValue(NAME) : null;
profile.setGeneratedSourcesDirectoryName(testOut != null? FileUtil.toSystemDependentName(testOut) : null, true);
final Element isRelativeToContentRoot = element.getChild("outputRelativeToContentRoot");
if (isRelativeToContentRoot != null) {
@@ -104,10 +106,10 @@ public class AnnotationProcessorProfileSerializer {
final String srcDirName = profile.getGeneratedSourcesDirectoryName(false);
if (!StringUtil.equals(ProcessorConfigProfile.DEFAULT_PRODUCTION_DIR_NAME, srcDirName)) {
addChild(element, "sourceOutputDir").setAttribute(NAME, srcDirName);
addChild(element, "sourceOutputDir").setAttribute(NAME, FileUtil.toSystemIndependentName(srcDirName));
}
final String testSrcDirName = profile.getGeneratedSourcesDirectoryName(true);
if (!StringUtil.equals(ProcessorConfigProfile.DEFAULT_TESTS_DIR_NAME, testSrcDirName)) {
if (!StringUtil.equals(ProcessorConfigProfile.DEFAULT_TESTS_DIR_NAME, FileUtil.toSystemIndependentName(testSrcDirName))) {
addChild(element, "sourceTestOutputDir").setAttribute(NAME, testSrcDirName);
}