cvs commit: maven-components/maven-mboot/src/bash maven.functions

[jvanzyl]

jvanzyl     2004/05/30 09:55:19

  Modified:    maven-mboot/src/bash maven.functions
  Added:       maven-mboot project.xml
  Log:
  o adjustment for a project with purely generated source: maven-model
  
  Revision  Changes    Path
  1.1                  maven-components/maven-mboot/project.xml
  
  Index: project.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  
  <project>
    <parent>
      <groupId>maven</groupId>
      <artifactId>maven-component</artifactId>
      <version>2.0-SNAPSHOT</version>
    </parent>
    <name>Maven MBoot</name>
    <groupId>maven</groupId>
    <id>maven-mboot</id>
    <artifactId>maven-mboot</artifactId>
    <version>2.0-SNAPSHOT</version>
    <description>Tool used to bootstrap m2.</description>
    <shortDescription>Tool used to bootstrap m2.</shortDescription>
  </project>
  
  
  
  1.40      +19 -23    maven-components/maven-mboot/src/bash/maven.functions
  
  Index: maven.functions
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-mboot/src/bash/maven.functions,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- maven.functions   27 May 2004 02:34:35 -0000      1.39
  +++ maven.functions   30 May 2004 16:55:19 -0000      1.40
  @@ -112,17 +112,25 @@
     # $1 == classpath
     # $2 == destination for compiled classes
     # $3 == source directory
  -  # $4 == any extra sources
  +  # $4 == generated source directory
     
  -  if [ -d $3 ]
  +  if [ -d $3 ] || [ -d $4 ]
     then
     
       if [ ! -d $2 ]
       then
         mkdir -p $2 
       fi
  -  
  -    SOURCES=`find $3 -name '*.java'`
  +    
  +    if [ ! -z $3 ] && [ -d $3 ] 
  +    then
  +      sources=`find $3 -name '*.java'`
  +    fi
  +
  +    if [ ! -z $4 ] && [ -d $4 ]
  +    then
  +      generatedSources=`find $4 -name '*.java'`
  +    fi
   
       if $cygwin; then
         CP=`cygpath -pw "$1"`
  @@ -130,7 +138,7 @@
         CP=$1
       fi
     
  -    "${JAVAC}" -classpath "$CP" -d $2 ${SOURCES} $4
  +    "${JAVAC}" -classpath "$CP" -d $2 ${sources} ${generatedSources}
     fi
   }
   
  @@ -215,22 +223,12 @@
         fi
         
         projectDependencyClassPath=$bootstrapClasspath:.
  -      
  -      if [ ! -z $sourceDirectory ] && [ -d $sourceDirectory ]
  -      then
  -        
  -        generatedSourceDirectory=target/generated-sources
  -        
  -        if [ -d $generatedSourceDirectory ]
  -        then
  -          generatedSources=`find $generatedSourceDirectory -name '*.java'`
  -        fi
  +
  +      generatedSourceDirectory=target/generated-sources
           
  -        compile "$projectDependencyClassPath" $buildDest $sourceDirectory 
$generatedSources
  +      compile "$projectDependencyClassPath" $buildDest $sourceDirectory 
$generatedSourceDirectory
         
  -        isCommandSuccessful $? "Failed compiling classes!"
  -      
  -      fi
  +      isCommandSuccessful $? "Failed compiling classes!"
         
         echo "Building tests in `pwd`"
           
  @@ -241,14 +239,12 @@
         fi
   
         createMBootClasspath
  -      
  +
         if [ ! -z $unitTestSourceDirectory ] && [ -d $unitTestSourceDirectory ]
  -      then
  -        
  +      then                    
           compile "$buildDest:$projectDependencyClassPath:${MBOOT_CP}" $buildTestDest 
$unitTestSourceDirectory
           
           isCommandSuccessful $? "Failed compiling test classes!"
  -      
         fi
         
         copyResources bootstrap.resources target/classes
  
  
  

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