cvs commit: jakarta-gump/java Project.java

[bodewig]

bodewig     2003/02/11 01:12:12

  Modified:    java     Project.java
  Log:
  Ignore jardir for non-redistributable dependencies.
  
  Should fix the bootstrap-ojb PREREQ FAILURE encountered on gump.covalent.net.
  
  Revision  Changes    Path
  1.50      +8 -6      jakarta-gump/java/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/java/Project.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- Project.java      7 Feb 2003 01:09:25 -0000       1.49
  +++ Project.java      11 Feb 2003 09:12:12 -0000      1.50
  @@ -344,8 +344,6 @@
   
           if (redistributable) {
               element.setAttribute("redistributable","true");
  -        } else {
  -            jardir = "";
           }
   
           for (Enumeration e=dependsOn.keys(); e.hasMoreElements(); ) {
  @@ -388,7 +386,7 @@
                   }
               }
   
  -            if (buildable && !jardir.equals("")) {
  +            if (buildable && !jardir.equals("") && target.isRedistributable()) {
                   String module = target.get("module");
                   depend.setAttribute("home", jardir + "/" + module);
                   child=depend.getFirstChild();
  @@ -862,5 +860,9 @@
               nag.appendChild(regexp);
           }
   
  +    }
  +    
  +    public boolean isRedistributable() {
  +        return redistributable;
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]