Changeset 328

Show
Ignore:
Timestamp:
05/01/07 13:28:54 (5 years ago)
Author:
asterite
Message:

- Added library ant.jar to project anttasks
- Renamed package anttasks to descent.ant.tasks
- Now descent.core registers the ant task in Eclipse.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/anttasks/.classpath

    r292 r328  
    33    <classpathentry kind="src" path="src"/> 
    44    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5     <classpathentry kind="lib" path="C:/downloads/apache-ant-1.7.0-bin/apache-ant-1.7.0/lib/ant.jar"/> 
     5    <classpathentry kind="lib" path="lib/ant.jar"/> 
    66    <classpathentry kind="output" path="bin"/> 
    77</classpath> 

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

    r310 r328  
    1111 org.eclipse.core.filesystem, 
    1212 org.eclipse.text, 
    13  org.apache.ant, 
    1413 org.eclipse.ui, 
    1514 org.eclipse.ui.console, 
    16  org.eclipse.ant.core 
     15 org.eclipse.ant.core, 
     16 org.apache.ant 
    1717Eclipse-LazyStart: true 
    1818Export-Package: descent.core, 
    …… 
    2525 descent.internal.compiler.parser 
    2626Eclipse-BuddyPolicy: registered 
     27Bundle-ClassPath: . 

  • trunk/descent.core/build.properties

    r132 r328  
    33bin.includes = META-INF/,\ 
    44               .,\ 
    5                plugin.xml 
     5               plugin.xml,\ 
     6               ant_tasks/ 

  • trunk/descent.core/plugin.xml

    r297 r328  
    22<?eclipse version="3.2"?> 
    33<plugin> 
     4   <extension 
     5         point="org.eclipse.ant.core.antTasks"> 
     6      <antTask 
     7            class="descent.ant.tasks.BinToD" 
     8            library="ant_tasks/descent-ant.jar" 
     9            name="descent.ant.tasks.BinToD"/> 
     10      <antTask 
     11            class="descent.ant.tasks.D" 
     12            library="ant_tasks/descent-ant.jar" 
     13            name="descent.ant.tasks.D"/> 
     14      <antTask 
     15            class="descent.ant.tasks.DModuleBuildNumber" 
     16            library="ant_tasks/descent-ant.jar" 
     17            name="descent.ant.tasks.DModuleBuildNumber"/> 
     18   </extension> 
     19   <extension 
     20         point="org.eclipse.ant.core.extraClasspathEntries"> 
     21      <extraClasspathEntry library="ant_tasks/descent-ant.jar"/> 
     22   </extension> 
    423 
    524   <extension 

  • trunk/descent.core/src/descent/core/compiler/ReconcileContext.java

    r199 r328  
    9090    if (this.operation.astLevel != AST.LATEST || !this.operation.resolveBindings) { 
    9191        // create AST (optionally resolving bindings) 
    92         ASTParser parser = ASTParser.newParser(AST.D1); 
     92        ASTParser parser = ASTParser.newParser(AST.D2); 
    9393        parser.setCompilerOptions(workingCopy.getJavaProject().getOptions(true)); 
    9494        if (JavaProject.hasJavaNature(workingCopy.getJavaProject().getProject())) 

  • trunk/descent.core/src/descent/internal/core/ReconcileWorkingCopyOperation.java

    r180 r328  
    2929import descent.core.compiler.IProblem; 
    3030import descent.core.compiler.ReconcileContext; 
     31import descent.core.dom.AST; 
    3132import descent.core.dom.ASTParser; 
    3233import descent.internal.core.util.Messages; 
    …… 
    154155                } 
    155156                 
    156                 ASTParser parser = ASTParser.newParser(this.astLevel); 
     157                // TODO JDT verify this 
     158                ASTParser parser = ASTParser.newParser(this.astLevel == ICompilationUnit.NO_AST ? AST.D2 : this.astLevel); 
    157159                parser.setKind(ASTParser.K_COMPILATION_UNIT); 
    158160                parser.setSource(workingCopy.getContents()); 

  • trunk/descent.core/src/descent/internal/core/builder/DAntBuilder.java

    r316 r328  
    66import java.util.Map; 
    77 
    8  
    98import org.apache.tools.ant.Project; 
     9import org.eclipse.ant.core.AntRunner; 
    1010import org.eclipse.core.resources.IFile; 
    1111import org.eclipse.core.resources.IProject; 
    …… 
    1515import org.eclipse.core.runtime.CoreException; 
    1616import org.eclipse.core.runtime.IPath; 
    17 import org.eclipse.core.runtime.IProgressMonitor; 
    18  
    19 import descent.internal.core.util.Util; 
    20 import org.eclipse.ui.*; 
    21 import org.eclipse.ui.console.*; 
    22 import org.eclipse.ant.core.AntRunner; 
    2317import org.eclipse.core.runtime.IProgressMonitor; 
    2418public class DAntBuilder extends IncrementalProjectBuilder { 
    …… 
    179173    antText += "<project name=\"" + project.getName() 
    180174        + "\" default=\"compileProject\" basedir=\".\">\n"; 
    181     antText += "<taskdef classname=\"anttasks.D\" name=\"D\" />\n\n"; 
    182     antText += "<taskdef classname=\"anttasks.DModuleBuildNumber\" name=\"DBldNum\" />\n"; 
    183     antText += "<taskdef classname=\"anttasks.DModuleBuildNumber\" name=\"foreach\" />\n\n"; 
     175    antText += "<taskdef classname=\"descent.ant.tasks.D\" name=\"D\" />\n\n"; 
     176    antText += "<taskdef classname=\"descent.ant.tasks.DModuleBuildNumber\" name=\"DBldNum\" />\n"; 
     177    antText += "<taskdef classname=\"descent.ant.tasks.DModuleBuildNumber\" name=\"foreach\" />\n\n"; 
    184178    antText += "<property name=\"compiler.dir\" value=\"C:\\\" />\n"; 
    185179    antText += "<property name=\"compiler.type\" value=\"" 
    …… 
    246240        } 
    247241    macrodef += "</mainmodules>\n"; 
     242    // TODO charles, the following two lines gives an error saying that this tag is not allowed here, 
     243    // please check it 
    248244    macrodef += "\n\n<!-- Any packages you want to exclude -->"; 
    249245    macrodef += "<excludePackage value=\"phobos\" />\n\n\n";   

  • trunk/descent.launching/src/descent/internal/launching/model/DescentDebugTarget.java

    r325 r328  
    156156 
    157157    public boolean canSuspend() { 
    158         return !isTerminated() && !isSuspended(); 
     158        return false; 
    159159    } 
    160160 

  • trunk/descent.launching/src/descent/internal/launching/model/DescentThread.java

    r315 r328  
    132132 
    133133    public boolean canSuspend() { 
    134         return !isTerminated() && !isSuspended(); 
     134        return getDebugTarget().canSuspend(); 
    135135    } 
    136136 

  • trunk/descent.launching/src/descent/launching/model/ddbg/ConsultingVariables.java

    r325 r328  
    1212    private DdbgVariable fVariable; 
    1313    private final DdbgCli fCli; 
    14     private final boolean fColapseBaseMembers;   
    1514     
    16     public ConsultingVariables(DdbgCli cli, boolean colapseBaseMembers) { 
     15    public ConsultingVariables(DdbgCli cli) { 
    1716        this.fCli = cli; 
    18         this.fColapseBaseMembers = colapseBaseMembers; 
    1917    } 
    2018 

  • trunk/descent.launching/src/descent/launching/model/ddbg/DdbgCli.java

    r325 r328  
    226226 
    227227        try { 
    228             setState(new ConsultingVariables(this, fshowBaseMembersInSameLevel)); 
     228            setState(new ConsultingVariables(this)); 
    229229             
    230230            beforeWaitStateReturn(); 
    …… 
    266266 
    267267        try { 
    268             setState(new EvaluatingExpression(this, expression, fshowBaseMembersInSameLevel)); 
     268            setState(new EvaluatingExpression(this, expression)); 
    269269             
    270270            beforeWaitStateReturn(); 

  • trunk/descent.launching/src/descent/launching/model/ddbg/EvaluatingExpression.java

    r325 r328  
    1010    private final String fExpression; 
    1111    private final DdbgCli fCli; 
    12     private final boolean fColapseBaseMembers;   
    1312     
    14     public EvaluatingExpression(DdbgCli cli, String expression, boolean colapseBaseMembers) { 
     13    public EvaluatingExpression(DdbgCli cli, String expression) { 
    1514        this.fCli = cli; 
    1615        this.fExpression = expression; 
    17         this.fColapseBaseMembers = colapseBaseMembers; 
    1816    } 
    1917