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

[<dgr...@us...>]

Revision: 19843
          http://x10.svn.sourceforge.net/x10/?rev=19843&view=rev
Author:   dgrove-oss
Date:     2011-01-31 22:41:51 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
Remove obsolete output exclusion logic from the CXXCommandBuilder.
This enabled the libx10.properties file to be built independent of 
C++ codegen of the library, which enables a future build system change
(subsequent commit) to eliminate the dependency of dist-java 
on dist-cpp to produce the libx10.properties file.

Modified Paths:
--------------
    trunk/x10.compiler/src/x10cpp/postcompiler/CXXCommandBuilder.java
    trunk/x10.compiler/src/x10cpp/postcompiler/PrecompiledLibrary.java
    trunk/x10.runtime/src-cpp/Makefile

Modified: trunk/x10.compiler/src/x10cpp/postcompiler/CXXCommandBuilder.java
===================================================================
--- trunk/x10.compiler/src/x10cpp/postcompiler/CXXCommandBuilder.java	2011-01-31 21:41:23 UTC (rev 19842)
+++ trunk/x10.compiler/src/x10cpp/postcompiler/CXXCommandBuilder.java	2011-01-31 22:41:51 UTC (rev 19843)
@@ -243,21 +243,10 @@
             addExecutablePath(cxxCmd);
         }
 
-        // TODO: do we really need this excludes logic here?
-        //       seems like putting the source file in the manifest 
-        //       would have been enough to squash the job from generating
-        //       the file in the first place
-        Set<String> exclude = CollectionFactory.newHashSet();
-        for (PrecompiledLibrary pco:options.x10libs) {
-            exclude.addAll(pco.generatedFiles);
-        }
-
         Iterator<String> iter = outputFiles.iterator();
         for (; iter.hasNext(); ) {
             String file = (String) iter.next();
             file = file.replace(File.separatorChar,'/');
-            if (exclude.contains(file))
-                continue;
             if (file.endsWith(".cu")) continue;
             cxxCmd.add(file);
         }

Modified: trunk/x10.compiler/src/x10cpp/postcompiler/PrecompiledLibrary.java
===================================================================
--- trunk/x10.compiler/src/x10cpp/postcompiler/PrecompiledLibrary.java	2011-01-31 21:41:23 UTC (rev 19842)
+++ trunk/x10.compiler/src/x10cpp/postcompiler/PrecompiledLibrary.java	2011-01-31 22:41:51 UTC (rev 19843)
@@ -16,14 +16,12 @@
     public final String absolutePathToRoot;
     public final String sourceJar;
     public final Collection<String> sourceFiles;
-    public final Collection<String> generatedFiles;
     
     public PrecompiledLibrary(String absPath, Properties p) {
         super (p);
         absolutePathToRoot = absPath;
         sourceJar = p.getProperty("SRC_JAR");
         sourceFiles = split(p.getProperty("SRC_FILES"));
-        generatedFiles = split(p.getProperty("GEN_FILES"));
     }
 
 }

Modified: trunk/x10.runtime/src-cpp/Makefile
===================================================================
--- trunk/x10.runtime/src-cpp/Makefile	2011-01-31 21:41:23 UTC (rev 19842)
+++ trunk/x10.runtime/src-cpp/Makefile	2011-01-31 22:41:51 UTC (rev 19843)
@@ -83,7 +83,7 @@
 	cd ../src-x10 && "$(DISTDIR)"/bin/x10c++ -c $(X10CPPFLAGS) -d ../src-cpp/gen $(XRX_SRCS)
 	find gen -name "*.cc" -print > $@
 
-$(XRX_PROPERTIES): $(XRX_REL_SRCS) gen/all-cpp-generated
+$(XRX_PROPERTIES): $(XRX_REL_SRCS)
 	@echo "PLATFORM=$(X10RT_PLATFORM)" > $@
 	@echo "TIMESTAMP=$(shell date)" >> $@
 	@echo "CXX=$(CXX)" >> $@
@@ -92,7 +92,6 @@
 	@echo "LDLIBS=$(XRX_PROPS_LDLIBS)" >> $@
 	@echo "SRC_JAR=x10.jar" >> $@
 	@echo "SRC_FILES=$(XRX_SRCS)" >> $@
-	@echo "GEN_FILES=$(shell sed -e's@^gen/\(.*\)\.cc$$@\1.o@' gen/all-cpp-generated)" >> $@
 
 ##########################
 # Manually-written Files #


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