MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 06:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

more logging added to make

Browse Source
This commit is contained in:
Eugene Zhuravlev
2005-03-28 19:05:11 +04:00
parent 08099bc568
commit ff95d0e3c5
4 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/com/intellij/compiler/OutputParser.java
+3
View File
@@ -57,6 +57,9 @@ public abstract class OutputParser {
}
private void processParsingMessage(final Callback callback, final String filePath) {
if (LOG.isDebugEnabled()) {
LOG.debug("Process parsing message: " + filePath);
}
int index = filePath.lastIndexOf('/');
final String name = index >= 0 ? filePath.substring(index + 1) : filePath;
source/com/intellij/compiler/impl/CompilerUtil.java
-8
View File
@@ -31,14 +31,6 @@ public class CompilerUtil {
return path;
}
public static String normalizePath(String path, char pathSeparator) {
int index = path.lastIndexOf(pathSeparator);
if (index >= 0) {
return path.substring(0, index).toLowerCase() + path.substring(index);
}
return path;
}
public static boolean startsWith(String path1, String path2) {
if (path2.length() > path1.length()) {
return false;
source/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
+40 -26
View File
@@ -403,6 +403,12 @@ class BackendCompilerWrapper {
private void runTransformingCompilers(final ModuleChunk chunk) {
final Compiler[] transformers = CompilerManager.getInstance(myProject).getCompilers(JavaSourceTransformingCompiler.class);
if (transformers.length == 0) {
return;
}
if (LOG.isDebugEnabled()) {
LOG.debug("Running transforming compilers...");
}
final Module[] modules = chunk.getModules();
for (int idx = 0; idx < transformers.length; idx++) {
final JavaSourceTransformingCompiler transformer = (JavaSourceTransformingCompiler)transformers[idx];
@@ -501,6 +507,9 @@ class BackendCompilerWrapper {
final Set<VirtualFile> compiledWithErrors = getFilesCompiledWithErrors();
final FileTypeManager typeManager = FileTypeManager.getInstance();
final String outputDirPath = outputDir.replace(File.separatorChar, '/');
if (LOG.isDebugEnabled()) {
LOG.debug("myFileNameToSourceMap contains entries: " + myFileNameToSourceMap.size());
}
for (int idx = 0; idx < sourceRoots.length; idx++) {
final VirtualFile root = sourceRoots[idx];
final String packagePrefix = myProjectFileIndex.getPackageNameByDirectory(root);
@@ -633,6 +642,9 @@ class BackendCompilerWrapper {
}
private void putName(String sourceFileName, String relativePathToSource, String pathToClass) {
if (LOG.isDebugEnabled()) {
LOG.debug("Registering [sourceFileName, relativePathToSource, pathToClass] = [" + sourceFileName + "; " + relativePathToSource + "; " + pathToClass + "]");
}
Set<Pair<String, String>> paths = myFileNameToSourceMap.get(sourceFileName);
if (paths == null) {
@@ -643,33 +655,35 @@ class BackendCompilerWrapper {
}
private void updateOutputItemsList(final String outputDir, VirtualFile javaFile, Set<VirtualFile> compiledWithErrors, VirtualFile sourceRoot, final String packagePrefix) {
final String javaFileName = javaFile.getName();
if (myFileNameToSourceMap.containsKey(javaFileName)) {
Set<Pair<String, String>> paths = myFileNameToSourceMap.get(javaFileName);
final Set<Pair<String, String>> paths = myFileNameToSourceMap.get(javaFile.getName());
if (LOG.isDebugEnabled()) {
LOG.debug("Checking java file " + javaFile.getPresentableUrl());
LOG.debug("myFileNameToSourceMap contains: " + paths);
}
if (paths != null && paths.size() > 0) {
final String prefix = packagePrefix != null && packagePrefix.length() > 0? packagePrefix.replace('.', '/') + "/" : "";
final String filePath = "/" + prefix + VfsUtil.getRelativePath(javaFile, sourceRoot, '/');
if (paths != null && paths.size() > 0) {
final String prefix = packagePrefix != null && packagePrefix.length() > 0? packagePrefix.replace('.', '/') + "/" : "";
final String filePath = !SystemInfo.isFileSystemCaseSensitive ?
"/" + CompilerUtil.normalizePath(prefix + VfsUtil.getRelativePath(javaFile, sourceRoot, '/'), '/') :
"/" + prefix + VfsUtil.getRelativePath(javaFile, sourceRoot, '/');
for (Iterator<Pair<String, String>> it = paths.iterator(); it.hasNext();) {
final Pair<String, String> pair = it.next();
if (filePath.equals(pair.getSecond())) {
final String outputPath = pair.getFirst().replace(File.separatorChar, '/');
final Pair<String, String> realLocation = moveToRealLocation(outputDir, outputPath, javaFile);
if (realLocation != null) {
myOutputItems.add(new OutputItemImpl(realLocation.getFirst(), realLocation.getSecond(), javaFile));
if (LOG.isDebugEnabled()) {
LOG.debug("Added output item: [outputDir; outputPath; sourceFile] = [" + realLocation.getFirst() + "; " + realLocation.getSecond() + "; " + javaFile.getPresentableUrl() + "]");
}
if (!compiledWithErrors.contains(javaFile)) {
mySuccesfullyCompiledJavaFiles.add(javaFile);
}
for (Iterator<Pair<String, String>> it = paths.iterator(); it.hasNext();) {
final Pair<String, String> pair = it.next();
if (LOG.isDebugEnabled()) {
LOG.debug("Checking pair [pathToClass; relPathToSource] = [" + pair.getFirst() + "; " + pair.getSecond() + "]");
}
if (CompilerUtil.pathsEqual(filePath, pair.getSecond())) {
final String outputPath = pair.getFirst().replace(File.separatorChar, '/');
final Pair<String, String> realLocation = moveToRealLocation(outputDir, outputPath, javaFile);
if (realLocation != null) {
myOutputItems.add(new OutputItemImpl(realLocation.getFirst(), realLocation.getSecond(), javaFile));
if (LOG.isDebugEnabled()) {
LOG.debug("Added output item: [outputDir; outputPath; sourceFile] = [" + realLocation.getFirst() + "; " + realLocation.getSecond() + "; " + javaFile.getPresentableUrl() + "]");
}
else {
if (LOG.isDebugEnabled()) {
LOG.debug("Failed to move to real location: " + outputPath + "; from " + outputDir);
}
if (!compiledWithErrors.contains(javaFile)) {
mySuccesfullyCompiledJavaFiles.add(javaFile);
}
}
else {
if (LOG.isDebugEnabled()) {
LOG.debug("Failed to move to real location: " + outputPath + "; from " + outputDir);
}
}
}
@@ -691,7 +705,7 @@ class BackendCompilerWrapper {
realOutputDir = getOutputDir(module);
}
if (tempOutputDir.equals(realOutputDir)) { // no need to move
if (CompilerUtil.pathsEqual(tempOutputDir, realOutputDir)) { // no need to move
myFilesToRefresh.add(new File(pathToClass));
return new Pair<String, String>(realOutputDir, pathToClass);
}
source/com/intellij/compiler/impl/javaCompiler/CompilerParsingThread.java
+3 -1
View File
@@ -74,7 +74,9 @@ public abstract class CompilerParsingThread extends Thread implements OutputPars
public final String getNextLine() {
try {
final String line = readLine(myErrorStreamReader);
//System.out.println("Line read: " + line);
if (LOG.isDebugEnabled()) {
LOG.debug("LIne read: " + line);
}
return TERMINATION_STRING.equals(line)? null : line;
}
catch(IOException e) {