ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dun...@locus.apache.org
Subject cvs commit: jakarta-ant/proposal/anteater/lib crimson.jar jaxp.jar
Date Wed, 06 Dec 2000 09:58:49 GMT
duncan      00/12/06 01:58:48

  Modified:    proposal/anteater/bootstrap Bootstrap.java
  Removed:     proposal/anteater/lib crimson.jar jaxp.jar
  Log:
  Remove .jar dependancies.. Now AntEater builds off xml-crimson as its parser
  and handles things on its own. Only takes an extra 10 seconds on the bootstrap
  and will tend to keep the crimson guys honest. :)
  
  Revision  Changes    Path
  1.2       +16 -6     jakarta-ant/proposal/anteater/bootstrap/Bootstrap.java
  
  Index: Bootstrap.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/anteater/bootstrap/Bootstrap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Bootstrap.java	2000/12/06 08:08:29	1.1
  +++ Bootstrap.java	2000/12/06 09:58:43	1.2
  @@ -21,6 +21,7 @@
   public class Bootstrap {
      
       private static String base = "../";
  +    private static String crimsonSources = "../../../xml-crimson/src"; // relative to base
       private static String[] modules = new String[]{"copy", "echo", "jar", "javac"};
   
       /**
  @@ -45,6 +46,7 @@
           // ------------------------------------------------------------
   
           mkdir(base + "bootstrap/temp");
  +        mkdir(base + "bootstrap/temp/crimson");
           mkdir(base + "bootstrap/temp/main");
           mkdir(base + "bootstrap/temp/tasks");
           mkdir(base + "bootstrap/temp/taskjars");
  @@ -52,13 +54,21 @@
           for (int i = 0; i < modules.length; i++) {
               mkdir(base + "bootstrap/temp/tasks/" + modules[i]);
           }
  +      
  +        // ------------------------------------------------------------
  +        // build crimson
  +        // ------------------------------------------------------------       
  +        
  +        System.out.println("CRIMSON: " + base + crimsonSources);
  +        Vector v1 = getSources(base + crimsonSources);
  +        doCompile(base + "bootstrap/temp/crimson", v1);
           
           // ------------------------------------------------------------
           // build the main thing
           // ------------------------------------------------------------        
           
  -        Vector v = getSources(base + "source/main");
  -        doCompile(base + "bootstrap/temp/main", v);
  +        Vector v2 = getSources(base + "source/main");
  +        doCompile(base + "bootstrap/temp/main", v2);
           
           // ------------------------------------------------------------
           // now build each of the needed peices into their
  @@ -83,8 +93,8 @@
           String[] cmdarray = new String[9];
           cmdarray[0] = "java";
           cmdarray[1] = "-cp";
  -        cmdarray[2] = base + "bootstrap/temp/main:" + base + "lib/jaxp.jar:" +
  -                      base + "lib/crimson.jar";
  +        cmdarray[2] = base + "bootstrap/temp/main:" +
  +                      base + "bootstrap/temp/crimson";
           cmdarray[3] = "org.apache.ant.cli.Main";
           cmdarray[4] = "-taskpath";
           cmdarray[5] = base + "bootstrap/temp/taskjars";
  @@ -255,8 +265,8 @@
                                                                    "javac");        
           String[] args = new String[sources.size() + 4];
           args[0] = "-classpath";
  -        args[1] = base + "bootstrap/temp/main:" + base + "lib/jaxp.jar:" + 
  -                  base + "lib/crimson.jar";
  +        args[1] = base + "bootstrap/temp/main:" + 
  +                  base + "bootstrap/temp/crimson";
           args[2] = "-d";
           args[3] = dest;
           for (int i = 0; i < sources.size(); i++) {
  
  
  

Mime
View raw message