Changeset 1229

Timestamp:

07/14/08 01:05:01 (2 months ago)

Author:

fraserofthenight

Message:

Builder stuff

Files:

• trunk/descent.building/src/descent/building/BuilderLaunchDelegate.java (modified) (1 diff)
• trunk/descent.building/src/descent/building/IDBuilder.java (modified) (2 diffs)
• trunk/descent.building/src/descent/internal/building/BuilderUtil.java (modified) (9 diffs)
• trunk/descent.building/src/descent/internal/building/debuild/BuildRequest.java (modified) (2 diffs)
• trunk/descent.building/src/descent/internal/building/debuild/ConditionalEvaluator.java (added)
• trunk/descent.building/src/descent/internal/building/debuild/DebuildBuilder.java (modified) (7 diffs)
• trunk/descent.building/src/descent/internal/building/debuild/IncrementalConsistencyManager.java (added)
• trunk/descent.building/src/descent/internal/building/debuild/ObjectFileFactory.java (modified) (2 diffs)
• trunk/descent.building/src/descent/internal/building/debuild/RecursiveDependancyCollector.java (modified) (7 diffs)

trunk/descent.building/src/descent/building/BuilderLaunchDelegate.java

@@ -35 +35 @@
-            throw error(String.format(DebuildMessages.BuilderLaunchDelegate_error_could_not_instantiate_builder, builderType.getIdentifier()));
-        
-
+launch, 
-    }
-    

trunk/descent.building/src/descent/building/IDBuilder.java

@@ -1 +1 @@
-package descent.building;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-
@@ -24 +24 @@
-public interface IDBuilder
-{
-
+
+
-}

trunk/descent.building/src/descent/internal/building/BuilderUtil.java

@@ -11 +11 @@
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-
@@ -21 +23 @@
-
-/**
-
+
+
- * 
- * @author Robert Fraser
@@ -28 +31 @@
-public class BuilderUtil
-{
+    //--------------------------------------------------------------------------
+    // OS-Specific functionality
+    
-    /**
-     * True if the current OS is Windows-based, false otherwise
@@ -41 +47 @@
-    static
-    {
+        // This needs to be initialized here to prevent constant folding
-        IS_WINDOWS = System.getProperty("os.name").startsWith("Windows"); //$NON-NLS-1$ //$NON-NLS-2$
-        
@@ -60 +67 @@
-        }
-    }
+    
+    //--------------------------------------------------------------------------
+    // Version/debug identifier management
-    
-    /**
@@ -100 +110 @@
-    
-    /**
-
-
-
-
+
+
+
+
+
-     * @return
-     */
-    public static String getAbsolutePath(IPath path)
-    {
-        IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-        if(null != res)
-            path = res.getLocation();
-        
-        return path.toString();
-    }
-
-    public static boolean isValidIdentifier(String id)
-    {
@@ -129 +131 @@
-    }
-    
+    private static boolean isValidIdStart(char c)
+    {
+        return Character.isJavaIdentifierStart(c) && !(c == '$');
+    }
+    
+    private static boolean isValidIdPart(char c)
+    {
+        return Character.isJavaIdentifierPart(c) && !(c == '$');
+    }
+    
+    //--------------------------------------------------------------------------
+    // Compiler management
+    
-    private static final CompilerInterfaceRegistry registry = 
-        CompilerInterfaceRegistry.getInstance();
-    
-    /**
-el
+le
-     * 
-     * @param compiler the compiler to get the interface for
@@ -158 +173 @@
-    }
-    
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    /**
@@ -181 +288 @@
-    public static final Object[] EMPTY_ARRAY = new Object[] {};
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}

trunk/descent.building/src/descent/internal/building/debuild/BuildRequest.java

@@ -314 +314 @@
-        "std.",
-    };
+    
-    private static final String[] tangoIgnored = new String[]
-    {
@@ -319 +320 @@
-        "gcc.",
-    };
+    
+    public final String[] getIgnoredModules()
+    {
+        // TODO
+        return phobosIgnored;
+    }
-}

trunk/descent.building/src/descent/internal/building/debuild/DebuildBuilder.java

@@ -7 +7 @@
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
+
+
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-
-import descent.core.IClasspathEntry;
@@ -23 +19 @@
-import descent.internal.building.BuilderUtil;
-import descent.building.IDBuilder;
+import descent.building.compiler.IObjectFile;
-
-public class DebuildBuilder implements IDBuilder
@@ -28 +25 @@
-    /* package */ static final boolean DEBUG = true;
-    
-    /**
-     * Note: don't use this as the main null progress monitor, since its 
-     * canceleld state is not garunteed.
-     */
-    private static final IProgressMonitor NO_MONITOR = new NullProgressMonitor();
-    
-    private BuildRequest req;
-    private ErrorReporter err;
-    private List<File> importPath;
-    
-ProgressMonitor pm)
-throws CoreException
+Launch launch,
+IProgressMonitor pm)
-    {   
-        if(null == pm)
@@ -57 +48 @@
-            // If the launch configuration has changed, clear the output folder
-            // to do a full rebuild
-
+
+
+
-            pm.worked(5); // 10
-            
@@ -67 +60 @@
-                return null;
-            
+            // Collect dependancies and create the associated object files
+            ObjectFileFactory objFactory = new ObjectFileFactory(req);
+            RecursiveDependancyCollector collector = 
+                new RecursiveDependancyCollector(req, objFactory);
+            IObjectFile[] objectFiles = collector.getModules(
+                    new SubProgressMonitor(pm, 35)); // 50
+            
-            // TODO
-            return null;
@@ -73 +73 @@
-        {
-            err.projectError(e.getMessage());
-
+
+
+
-        }
-        catch(Exception e)
@@ -88 +90 @@
-            pm.done();
-        }
-    }
-    
-    /**
-     * If the launch configuration has changed, all pre-compiled resources need to
-     * be removed and a full rebuild done (PERHAPS a more selective mechanism -- if
-     * the user just changed the output file, for example, no rebuild is needed).
-     * This method detects if the current launch configuration is different than the
-     * existing launch configuration and if so deletes everything in the folder.
-     * 
-     * @param config
-     */
-    private void managePrecomiledResources()
-    {
-        // TODO this doesn't work (it adds a new launch). FInd out if there's a way
-        // not to, alternatively a new serialization mechanism needs to be created
-        // (or maybe just somehow store the age/revision of the last change).
-        try
-        {
-            // Check if the folder exists
-            IFolder folder = req.getOutputResource();
-            if(!folder.exists())
-            {
-                folder.create(true, true, NO_MONITOR);
-                createConfigFile();
-                return;
-            }
-
-            folder.refreshLocal(IResource.DEPTH_INFINITE, NO_MONITOR);
-            IResource launchConfigFile = folder.findMember(getLaunchConfigFilename());
-            if(null == launchConfigFile || !(launchConfigFile instanceof IFile))
-            {
-                System.out.println("File doesn't exist!");
-                clearOutputFolder();
-                createConfigFile();
-                return;
-            }
-            
-            ILaunchConfiguration launchConfig = DebugPlugin.getDefault().
-                    getLaunchManager().getLaunchConfiguration((IFile) launchConfigFile);
-            if(!BuilderUtil.launchConfigsEqual(launchConfig, req.getLaunchConfig()))
-            {
-                System.out.println("Not equal!");
-                clearOutputFolder();
-                createConfigFile();
-                return;
-            }
-            
-            // If we get here, we can safely use any object files already
-            // generated for incremental compilation.
-            System.out.println("Contents saved!!!");
-        }
-        catch(CoreException e)
-        {
-            throw new DebuildException(String.format(
-                    "Error preparing output folder: %1$s", e.getMessage()));
-        }
-        
-    }
-    
-    private String getLaunchConfigFilename()
-    {
-        return req.getLaunchConfig().getName().concat(".").
-                concat(ILaunchConfiguration.LAUNCH_CONFIGURATION_FILE_EXTENSION);
-    }
-
-    private void createConfigFile() throws CoreException
-    {
-        ILaunchConfiguration config = req.getLaunchConfig();
-        ILaunchConfigurationWorkingCopy copy = config.copy(config.getName());
-        copy.setContainer(req.getOutputResource());
-        copy.doSave();
-    }
-    
-    private void clearOutputFolder() throws CoreException
-    {
-        System.out.println("Folder cleared!!!");
-        
-        IFolder outputFolder = req.getOutputResource();
-        IResource[] members = outputFolder.members();
-        for(IResource file : members)
-        {
-            try
-            {
-                file.delete(true, NO_MONITOR);
-            }
-            catch(CoreException e)
-            {
-                throw new DebuildException(String.format(
-                        "Error deleting resource %1$s: %2$s", 
-                        file.getFullPath().toString(), e.getMessage()));
-            }
-        }
-    }
-

trunk/descent.building/src/descent/internal/building/debuild/ObjectFileFactory.java

@@ -4 +4 @@
-
-import descent.building.compiler.IObjectFile;
+import descent.core.ICompilationUnit;
+import descent.internal.building.BuilderUtil;
-
-/* package */ final class ObjectFileFactory
@@ -36 +38 @@
-        }
-    }
+    
+    private static final int MAX_FILENAME_LENGTH = 240;
+    
+    private final BuildRequest req;
+    
+    public ObjectFileFactory(BuildRequest req)
+    {
+        this.req = req;
+    }
+    
+    public IObjectFile create(ICompilationUnit cu,
+            boolean isLibraryFile)
+    {
+        File inputFile = new File(BuilderUtil.getAbsolutePath(cu.getResource().
+                getLocation()));
+        File outputFile = new File(req.getOutputLocation().getAbsolutePath() +
+                File.separator + getOutputFilename(cu));
+        return new ObjectFile(inputFile, outputFile, isLibraryFile);
+    }
+    
+    private static String getOutputFilename(ICompilationUnit cu)
+    {
+        String name = cu.getFullyQualifiedName().replace('.', '-') + "." +
+            BuilderUtil.EXTENSION_OBJECT_FILE;
+        int len = name.length();
+        if(len > MAX_FILENAME_LENGTH)
+            name = name.substring(len - MAX_FILENAME_LENGTH);
+        return name;
+    }
-}

trunk/descent.building/src/descent/internal/building/debuild/RecursiveDependancyCollector.java

@@ -26 +26 @@
- * Class that can recurse through dependencies to generate a list of all files
- * that need to be compiled in a module. This class mainly exists to abstract
-
-
-
-
-
+
- * 
- * @author Robert Fraser
- */
-/* package */ class RecursiveDependancyCollector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    private final BuildRequest req;
-    private final ObjectFileFactory factory;
+    private final ConditionalEvaluator eval;
-    
-    private final Map<String, IObjectFile> objectFiles = 
@@ -71 +46 @@
-    private final Set<IJavaProject> visitedProjectAccumulator = new HashSet<IJavaProject>();
-    
-
-
+
+
+
+
-    {
-        this.factory = factory;
-        this.req = req;
-
-
-
+
+
+
+
+
+
+
+
-    {
+        ICompilationUnit[] modules = req.getModules();
-        try
-        {
-            pm.beginTask("Collecting dependencies", modules.length * 10);
-            
-String moduleNam
+ICompilationUnit modul
-            {
-
-
+
+
+
-                if(pm.isCanceled())
-
-
-
-
+
-            }
-            
@@ -114 +95 @@
-    }
-    
-
+, IProgressMonitor pm
-        throws JavaModelException
-
+
+
+
+
+
-        // Check if we've already traversed this module
-        if(objectFiles.containsKey(moduleName))
-            return;
-        
-n
-/* TODO 
+m
+
-            if(moduleName.startsWith(ignore))
- */
+
-        
-        // Find the module
@@ -138 +123 @@
-        // Recurse through imports
-        for(String importedModule : getImports(module))
-
+, pm
-    }
-    
@@ -144 +129 @@
-            boolean isLibraryFile)
-    {
-
-
+
-    }
-    
@@ -247 +231 @@
-            {
-                IConditional cond = (IConditional) element;
-
+eval.
-                    cond.getElseChildren()), imports);
-                continue;
@@ -253 +237 @@
-        }
-    }
-    
-    private boolean isActive(IConditional cond)
-    {
-        System.out.println("Conditional with displayString: " + cond.getElementName());
-        // TODO check if it's active
-        return true;
-    }
-}