cvs commit: maven-components/maven-mboot/src/main Bootstrapper.java

[evenisse]

evenisse    2004/02/13 01:52:13

  Modified:    maven-mboot/src/main Bootstrapper.java
  Log:
  Fix classpath generation for Windows users
  
  Revision  Changes    Path
  1.16      +14 -3     maven-components/maven-mboot/src/main/Bootstrapper.java
  
  Index: Bootstrapper.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-mboot/src/main/Bootstrapper.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Bootstrapper.java 7 Feb 2004 16:26:51 -0000       1.15
  +++ Bootstrapper.java 13 Feb 2004 09:52:13 -0000      1.16
  @@ -86,13 +86,24 @@
   
           StringBuffer libs = new StringBuffer();
   
  +        String repoLocal = replace(downloader.getMavenRepoLocal().getPath(), "\\", 
"/");
  +        String classpathSeparator;
  +        if (repoLocal.indexOf(":") != -1) //Windows
  +        {
  +            classpathSeparator = ";";
  +        }
  +        else
  +        {
  +            classpathSeparator = ":";
  +        }
  +        
           for ( Iterator i = dependencies.iterator(); i.hasNext(); )
           {
               Dependency d = (Dependency) i.next();
  +            
  +            classPath.append( repoLocal + "/" + getArtifactPath( d, "/" ) + 
classpathSeparator );
   
  -            classPath.append( downloader.getMavenRepoLocal() + "/" + 
getArtifactPath( d, "/" ) + ":" );
  -
  -            libs.append( downloader.getMavenRepoLocal() + "/" + getArtifactPath( d, 
"/" ) + "\n" );
  +            libs.append( repoLocal + "/" + getArtifactPath( d, "/" ) + "\n" );
           }
   
           writeFile( "bootstrap.classpath", classPath.toString() );
  
  
  

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