[X10-commits] SF.net SVN: x10:[10518] trunk

[<ipe...@us...>]

Revision: 10518
          http://x10.svn.sourceforge.net/x10/?rev=10518&view=rev
Author:   ipeshansky
Date:     2009-06-25 04:20:00 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Fix manifest handling.

Modified Paths:
--------------
    trunk/x10.compiler.p3/src/polyglot/ext/x10/ExtensionInfo.java
    trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/ExtensionInfo.java

Modified: trunk/x10.compiler.p3/src/polyglot/ext/x10/ExtensionInfo.java
===================================================================
--- trunk/x10.compiler.p3/src/polyglot/ext/x10/ExtensionInfo.java	2009-06-25 03:57:45 UTC (rev 10517)
+++ trunk/x10.compiler.p3/src/polyglot/ext/x10/ExtensionInfo.java	2009-06-25 04:20:00 UTC (rev 10518)
@@ -305,8 +305,11 @@
     		    return new AllBarrierGoal("CodeGenBarrier", this) {
     		    	@Override
     		    	public Goal prereqForJob(Job job) {
-    		    	    if (((ExtensionInfo) extInfo).manifestContains(job.source().path()))
+    		    	    if (!scheduler.commandLineJobs().contains(job) &&
+    		    	            ((ExtensionInfo) extInfo).manifestContains(job.source().path()))
+    		    	    {
     		    	        return null;
+    		    	    }
     		    	    return Serialized(job);
     		    	}
     		    };

Modified: trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/ExtensionInfo.java
===================================================================
--- trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/ExtensionInfo.java	2009-06-25 03:57:45 UTC (rev 10517)
+++ trunk/x10.cppbackend.17/src/polyglot/ext/x10cpp/ExtensionInfo.java	2009-06-25 04:20:00 UTC (rev 10518)
@@ -168,8 +168,11 @@
 		        return new AllBarrierGoal("NewCodeGenBarrier", this) {
 		            @Override
 		            public Goal prereqForJob(Job job) {
-		                if (((ExtensionInfo) extInfo).manifestContains(job.source().path()))
+		                if (!scheduler.commandLineJobs().contains(job) &&
+		                        ((ExtensionInfo) extInfo).manifestContains(job.source().path()))
+		                {
 		                    return null;
+		                }
 		                return StaticNestedClassesRemoved(job);
 		            }
 		        };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.