1. Update version to 1.3.7

2. The virtual path was not being honored for finding newer Java source code in earlier directories in the list. If vpath was provided, the findUpdatedJavaAndJarFiles method will now use the contents to find when newer Java files are closer in the virtual path.
pantsbuild · Jun 2, 2010 · 130388e · 130388e
1 parent e2adb38
commit 130388e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/com/sun/tools/jmake/Main.java b/src/com/sun/tools/jmake/Main.java
@@ -34,7 +34,7 @@
 public class Main {
 
     static final String DEFAULT_STORE_NAME = "jmake.pdb";
-    static final String VERSION = "1.3.6";
+    static final String VERSION = "1.3.7";
     private String pdbFileName = null;
     private List<String> allProjectJavaFileNamesList =
             new ArrayList<String>(100);

diff --git a/src/com/sun/tools/jmake/PCDManager.java b/src/com/sun/tools/jmake/PCDManager.java
@@ -602,6 +602,19 @@ private void findUpdatedJavaAndJarFiles() {
             if (entry.javaFileFullPath.endsWith(".java")) {
                 initializeClassFileFullPath(entry);
                 if (projectSpecifiedAsAllSources) {
+                    if (ClassPath.getVirtualPath() != null) {
+                        String paths[] = ClassPath.getVirtualPath().split(File.pathSeparator);
+                        String tmpClassName = entry.className;
+                        tmpClassName = tmpClassName.replaceAll("\\Q$\\E.*$", "");
+                        for (int i=0; i<paths.length; i++) {
+                            String tmpFilename = paths[i] + File.separator + tmpClassName + ".java";
+                            File tmpFile = new File(tmpFilename);
+                            if (tmpFile.exists()) {
+                                entry.javaFileFullPath = tmpFile.getAbsolutePath();
+                                break;
+                            }
+                        }
+                    }
                     Utils.startTiming(Utils.TIMING_CLASS_FILE_OBSOLETE_TMP);
                     if (classFileObsoleteOrDeleted(entry)) {
                         updatedJavaFiles.add(entry.javaFileFullPath);