bodewig     2004/04/06 07:16:44

  Modified:    project  jakarta-jmeter.xml
  Log:
  Try whether noclasspath works now, remove some tabs
  
  Revision  Changes    Path
  1.96      +40 -40    gump/project/jakarta-jmeter.xml
  
  Index: jakarta-jmeter.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/jakarta-jmeter.xml,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- jakarta-jmeter.xml        1 Apr 2004 13:35:07 -0000       1.95
  +++ jakarta-jmeter.xml        6 Apr 2004 14:16:44 -0000       1.96
  @@ -23,8 +23,8 @@
   
     <cvs repository="jakarta" />
     
  -     <project name="jakarta-jmeter">
  -     <!-- Compile from latest versions of dependencies -->
  +  <project name="jakarta-jmeter">
  +        <!-- Compile from latest versions of dependencies -->
       <package>org.apache.jmeter</package>
   
       <ant target="gump-compile">
  @@ -35,9 +35,9 @@
         <property name="date.projectfile" value="$Date$"/>
         
         <!--
  -             These properties are passed to the build process, so the names need to 
agree with
  -             the ones used in build.xml. However, at present the properties are 
only used for
  -             creating the list of jars to be exported.
  +        These properties are passed to the build process, so the names need to 
agree with
  +        the ones used in build.xml. However, at present the properties are only 
used for
  +        creating the list of jars to be exported.
         -->
         <depend property="avalon-framework.jar" project="avalon-framework" 
id="combined"/>
         <depend property="jakarta-oro.jar" project="jakarta-oro"/>
  @@ -52,17 +52,17 @@
         <depend property="js.jar" project="rhino"/>
         <depend property="soap.jar" project="ws-soap"/>
   
  -             <!-- Ensure work directories don't get dropped from classpath -->
  -             <mkdir dir="build/core"/>
  -             <mkdir dir="build/htmlparser"/>
  -             <mkdir dir="build/jorphan"/>
  -             
  -             <!-- Allow http to build: -->
  -             <mkdir dir="build/components"/>
  -     
  -             <!-- Allow Monitor to build -->
  -             <mkdir dir="build/protocol/http"/>
  -             <mkdir dir="build/monitor/model"/>
  +      <!-- Ensure work directories don't get dropped from classpath -->
  +      <mkdir dir="build/core"/>
  +      <mkdir dir="build/htmlparser"/>
  +      <mkdir dir="build/jorphan"/>
  +                
  +      <!-- Allow http to build: -->
  +      <mkdir dir="build/components"/>
  +      
  +      <!-- Allow Monitor to build -->
  +      <mkdir dir="build/protocol/http"/>
  +      <mkdir dir="build/monitor/model"/>
   
       </ant>
   
  @@ -103,7 +103,7 @@
     </project>
   
     <project name="jakarta-jmeter-cvs">
  -     <!-- Build JMeter from CVS versions of dependencies -->
  +        <!-- Build JMeter from CVS versions of dependencies -->
       <package>org.apache.jmeter</package>
   
       <ant target="gump-build">
  @@ -113,17 +113,17 @@
         <property name="version.projectfile" value="$Revision$"/>
         <property name="date.projectfile" value="$Date$"/>
   
  -             <!-- Ensure work directories don't get dropped from classpath -->
  -             <mkdir dir="build/core"/>
  -             <mkdir dir="build/htmlparser"/>
  -             <mkdir dir="build/jorphan"/>
  -             
  -             <!-- Allow http to build: -->
  -             <mkdir dir="build/components"/>
  -     
  -             <!-- Allow Monitor to build -->
  -             <mkdir dir="build/protocol/http"/>
  -             <mkdir dir="build/monitor/model"/>
  +      <!-- Ensure work directories don't get dropped from classpath -->
  +      <mkdir dir="build/core"/>
  +      <mkdir dir="build/htmlparser"/>
  +      <mkdir dir="build/jorphan"/>
  +                
  +      <!-- Allow http to build: -->
  +      <mkdir dir="build/components"/>
  +        
  +      <!-- Allow Monitor to build -->
  +      <mkdir dir="build/protocol/http"/>
  +      <mkdir dir="build/monitor/model"/>
       </ant>
   
       <depend project="ant" />
  @@ -136,7 +136,7 @@
   
       <!-- Try to ensure that cvs builds after jmeter -->
       <option project="jakarta-jmeter">
  -     <noclasspath/>
  +        <noclasspath/>
       </option>
       
       <work nested="build/core"/>
  @@ -206,8 +206,8 @@
   
       <depend project="ant" />
   
  -    <depend project="jakarta-jmeter-cvs" ids="none">
  -     <noclasspath/>
  +    <depend project="jakarta-jmeter-cvs">
  +        <noclasspath/>
       </depend>
   
   <!-- Add jars that would otherwise come from jmeter-cvs -->
  
  
  

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

Reply via email to