Changeset 1174

Show
Ignore:
Timestamp:
05/24/08 21:31:03 (8 months ago)
Author:
fraserofthenight
Message:

Moved descent.building to its own plugin to allow it to depend on decent.ui. Also, some progress on building UI

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/descent.launching/plugin.xml

    r1172 r1174  
    88   <extension-point id="runtimeClasspathEntryResolvers" name="%runtimeClasspathEntryResolvers" schema="schema/runtimeClasspathEntryResolvers.exsd"/> 
    99   <extension-point id="runtimeClasspathEntries" name="%runtimeClasspathEntries" schema="schema/runtimeClasspathEntries.exsd"/> 
    10    <extension-point id="dBuilders" name="%dBuilders" schema="schema/dBuilders.exsd"/> 
    1110 
    1211<!-- Extensions --> 
    …… 
    6968      </runtimeClasspathEntry> 
    7069   </extension> 
    71    <extension 
    72          point="org.eclipse.debug.core.launchModes"> 
    73       <launchMode 
    74             label="Build" 
    75             launchAsLabel="Build As" 
    76             mode="descent.launching.buildMode"> 
    77       </launchMode> 
    78    </extension> 
    79    <extension 
    80          point="org.eclipse.debug.ui.launchGroups"> 
    81       <launchGroup 
    82             bannerImage="icons/full/wizban/builders.gif" 
    83             id="descent.launching.builders" 
    84             image="icons/full/obj16/builders.gif" 
    85             label="D Builders" 
    86             mode="descent.launching.buildMode" 
    87             title="Select or configure the target to build"> 
    88       </launchGroup> 
    89    </extension> 
    90    <extension 
    91          point="org.eclipse.ui.actionSets"> 
    92       <actionSet 
    93             id="descent.launching.building" 
    94             label="D Building" 
    95             visible="false"> 
    96          <action 
    97                class="descent.internal.launching.ui.BuildersToolbarAction" 
    98                disabledIcon="icons/full/obj16/builders_disabled.gif" 
    99                hoverIcon="icons/full/obj16/builders.gif" 
    100                icon="icons/full/obj16/builders.gif" 
    101                id="descent.launching.actions.BuildingDropDownAction" 
    102                label="D Builders..." 
    103                style="pulldown" 
    104                toolbarPath="org.eclipse.debug.ui.launchActionSet/debug" 
    105                tooltip="Select or configure the target to build"> 
    106          </action> 
    107          <menu 
    108                id="org.eclipse.ui.run" 
    109                label="Run" 
    110                path="additions"> 
    111             <groupMarker 
    112                   name="descent.launching.buildersMenuGroup"> 
    113             </groupMarker> 
    114          </menu> 
    115       </actionSet> 
    116    </extension> 
    117    <extension 
    118          point="org.eclipse.ui.perspectiveExtensions"> 
    119       <perspectiveExtension 
    120             targetID="org.eclipse.ui.resourcePerspective"> 
    121          <actionSet 
    122                id="descent.launching.building"> 
    123          </actionSet> 
    124       </perspectiveExtension> 
    125       <perspectiveExtension 
    126             targetID="descent.ui.JavaPerspective"> 
    127          <actionSet 
    128                id="descent.launching.building"> 
    129          </actionSet> 
    130       </perspectiveExtension> 
    131       <perspectiveExtension 
    132             targetID="org.eclipse.debug.ui.DebugPerspective"> 
    133          <actionSet 
    134                id="descent.launching.building"> 
    135          </actionSet> 
    136       </perspectiveExtension> 
    137       <perspectiveExtension 
    138             targetID="descent.ui.JavaBrowsingPerspective"> 
    139          <actionSet 
    140                id="descent.launching.building"> 
    141          </actionSet> 
    142       </perspectiveExtension> 
    143    </extension> 
    144    <extension 
    145          point="org.eclipse.debug.ui.launchConfigurationTypeImages"> 
    146       <launchConfigurationTypeImage 
    147             configTypeID="descent.launching.builders.debuild" 
    148             icon="icons/full/obj16/builders.gif" 
    149             id="descent.launching.builders.debuildImage"> 
    150       </launchConfigurationTypeImage> 
    151    </extension> 
    152    <extension 
    153          point="org.eclipse.debug.ui.launchConfigurationTabGroups"> 
    154       <launchConfigurationTabGroup 
    155             class="descent.internal.launching.ui.DebuildTabGroup" 
    156             description="The default Descent builder" 
    157             id="descent.launching.builders.debuildTabGroup" 
    158             type="descent.launching.builders.debuild"> 
    159       </launchConfigurationTabGroup> 
    160    </extension> 
    161    <extension 
    162          point="org.eclipse.debug.core.launchConfigurationTypes"> 
    163       <launchConfigurationType 
    164             delegate="descent.launching.BuilderLaunchDelegate" 
    165             delegateDescription="The default Descent builder" 
    166             delegateName="Descent Builder" 
    167             id="descent.launching.builders.debuild" 
    168             modes="descent.launching.buildMode" 
    169             name="Descent Builder"> 
    170       </launchConfigurationType> 
    171    </extension> 
    172    <extension 
    173          point="descent.launching.dBuilders"> 
    174       <builder 
    175             class="descent.internal.launching.debuild.DebuildBuilder" 
    176             id="descent.launching.builders.debuildBuilder" 
    177             launchConfigurationType="descent.launching.builders.debuild"> 
    178       </builder> 
    179    </extension>  
    18070 
    18171</plugin> 

  • trunk/descent.launching/src/descent/internal/launching/dmd/DmdCompiler.java

    r1071 r1174  
    99import descent.launching.AbstractVMInstall; 
    1010import descent.launching.IVMInstallType; 
    11 import descent.launching.compiler.ICompilerInterface; 
    1211 
    1312public class DmdCompiler extends AbstractVMInstall { 
    …… 
    6059        return new File(getInstallLocation(), "bin/dmd"); 
    6160    } 
    62  
    63     public ICompilerInterface getCompilerInterface() 
    64     { 
    65         return DmdCompilerInterface.getInstance(); 
    66     } 
    6761} 

  • trunk/descent.launching/src/descent/internal/launching/gdc/GdcCompiler.java

    r1071 r1174  
    1010import descent.launching.AbstractVMInstall; 
    1111import descent.launching.IVMInstallType; 
    12 import descent.launching.compiler.ICompilerInterface; 
    1312 
    1413public class GdcCompiler extends AbstractVMInstall { 
    …… 
    6665        return new File(getInstallLocation(), "bin/gdc"); 
    6766    } 
    68  
    69     public ICompilerInterface getCompilerInterface() 
    70     { 
    71         // TODO Auto-generated method stub 
    72         return null; 
    73     } 
    7467} 

  • trunk/descent.launching/src/descent/launching/AbstractVMInstall.java

    r1101 r1174  
    11package descent.launching; 
    2  
    32 
    43import java.io.File; 
    …… 
    1110import descent.internal.launching.LaunchingMessages; 
    1211import descent.internal.launching.LaunchingPlugin; 
    13 import descent.launching.compiler.ICompilerInterface; 
     12 
    1413/** 
    1514 * Abstract implementation of a VM install. 
    …… 
    242241        // TODO 
    243242        return new File("C:\\d\\dmd\\bin\\dmd.exe"); 
    244     }    
    245      
    246     public ICompilerInterface getCompilerInterface() 
    247     { 
    248         return null; 
    249243    } 
    250244} 

  • trunk/descent.launching/src/descent/launching/IVMInstall.java

    r1101 r1174  
    33import java.io.File; 
    44import java.net.URL; 
    5  
    6 import descent.launching.compiler.ICompilerInterface; 
    75 
    86/** 
    …… 
    103101     */ 
    104102    public String getJavaVersion(); 
    105      
    106     /** 
    107      * Gets the class used to interface with this compiler type. 
    108      *  
    109      * Note: This is in this class instead of in {@link IVMInstallType} since 
    110      * different versions of D compilers may have slightly different features 
    111      * or interfaces. Generally, though, compilers of the same type will have 
    112      * the same interface. 
    113      *  
    114      * @return a definition of the command-line interface of this compiler type 
    115      */ 
    116     public ICompilerInterface getCompilerInterface(); 
    117103     
    118104    /** 

  • trunk/descent.launching/src/descent/launching/IVMInstallType.java

    r1071 r1174  
    44 
    55import org.eclipse.core.runtime.IStatus; 
    6  
    7 import descent.launching.compiler.ICompilerInterface; 
    86 
    97/** 

  • trunk/descent.launching/src/descent/launching/VMStandin.java

    r1101 r1174  
    11package descent.launching; 
    2  
    3 import descent.internal.launching.LaunchingPlugin; 
    4 import descent.launching.compiler.ICompilerInterface; 
    5  
    6  
    72 
    83/** 

  • trunk/descent.ui/META-INF/MANIFEST.MF

    r1149 r1174  
    3838 descent.internal.ui.viewsupport, 
    3939 descent.internal.ui.wizards, 
     40 descent.internal.ui.wizards.dialogfields, 
    4041 descent.ui, 
    4142 descent.ui.actions, 

  • trunk/descent.ui/src/descent/internal/ui/wizards/dialogfields/ListDialogField.java

    r1152 r1174  
    567567        return new ArrayList(fElements); 
    568568    } 
     569     
     570    /** 
     571     * Gets the elements in the list. 
     572     * The list returned should not be modified and is subject to change. 
     573     */ 
     574    public List getElementsNoCopy() { 
     575        return fElements; 
     576    } 
    569577 
    570578    /** 

  • trunk/descent.unittest/flute/.classpath

    r1081 r1174  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
    3     <classpathentry kind="src" path="src"/> 
     3    <classpathentry kind="src" path=""/> 
    44    <classpathentry kind="con" path="descent.launching.JRE_CONTAINER"/> 
    5     <classpathentry kind="output" path="bin"/> 
     5    <classpathentry kind="output" path=""/> 
    66</classpath> 

  • trunk/descent.unittest/flute/.settings/descent.core.prefs

    r1169 r1174  
    1 #Sat May 17 20:27:32 PDT 2008 
     1#Fri May 23 16:24:41 PDT 2008 
    22descent.core.compiler.allowDeprecated=disabled 
    33descent.core.compiler.debugIdentifiers= 
    …… 
    99descent.core.compiler.taskPriorities=NORMAL,HIGH,LOW,HIGH,LOW,NORMAL 
    1010descent.core.compiler.taskTags=TODO,FIXME,PERHAPS,WTF,NEXTVERSION,TANGO 
    11 descent.core.compiler.versionIdentifiers=DigitalMars, Windows, Win32, X86, LittleEndian, D_InlineAsm, D_InlineAsm_X86, all, Tango 
     11descent.core.compiler.versionIdentifiers=DigitalMars, Windows, Win32, X86, LittleEndian, D_InlineAsm, D_InlineAsm_X86, all 
    1212descent.core.compiler.versionLevel=0 
    1313descent.core.formatter.alignment_for_array_literals=16 

  • trunk/descent.unittest/testdata/.classpath

    r1052 r1174  
    11<?xml version="1.0" encoding="UTF-8"?> 
    22<classpath> 
    3     <classpathentry kind="src" path="src"/> 
     3    <classpathentry kind="src" path=""/> 
    44    <classpathentry kind="con" path="descent.launching.JRE_CONTAINER"/> 
    5     <classpathentry kind="output" path="bin"/> 
     5    <classpathentry kind="output" path=""/> 
    66</classpath>