You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ad...@apache.org on 2002/11/25 22:36:21 UTC

cvs commit: jakarta-commons-sandbox/vfs build.xml

adammurdoch    2002/11/25 13:36:21

  Modified:    vfs      build.xml
  Log:
  Removed absolute paths from build file.
  
  Revision  Changes    Path
  1.8       +74 -74    jakarta-commons-sandbox/vfs/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/vfs/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml	21 Nov 2002 05:01:00 -0000	1.7
  +++ build.xml	25 Nov 2002 21:36:21 -0000	1.8
  @@ -1,25 +1,25 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
   <project default="jar" name="commons-vfs" basedir=".">
  -  
  -  <property name="defaulttargetdir" value="target"></property> 
  +
  +  <property name="defaulttargetdir" value="target"></property>
     <property name="classesdir" value="target/classes"></property>
     <property name="testclassesdir" value="target/test-classes"></property>
     <property name="testreportdir" value="target/test-reports"></property>
  -  
  -  
  -  
  -  
  -  	
  -		
  -  
  -  
  -  <property name="resourcedir" value="C:\user\vfs\jakarta-commons-sandbox\vfs/src/java"></property>
  -  
  +
  +
  +
  +
  +
  +
  +
  +
  +  <property name="resourcedir" value="src/java"></property>
  +
     <property name="distdir" value="dist"></property>
     <property name="javadocdir" value="target/docs/apidocs"></property>
     <property name="final.name" value="commons-vfs-1.0-dev"></property>
  -  
  +
     <target name="init" description="o Initializes some properties">
       <mkdir dir="lib"></mkdir>
       <condition property="noget">
  @@ -28,7 +28,7 @@
     </target>
   
     <target name="compile" description="o Compile the code" depends="get-deps">
  -    
  +
       <mkdir dir="${classesdir}"></mkdir>
   
       <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
  @@ -41,35 +41,35 @@
           </fileset>
         </classpath>
       </javac>
  -    
  -    
  - 
  -    
  - 
  +
  +
  +
  +
  +
       <copy todir="${classesdir}">
  -      
  +
         <fileset dir="${resourcedir}">
  -      
  -      
  +
  +
           <include name="**/*.properties"></include>
  -      
  -      
  +
  +
         </fileset>
       </copy>
  - 
  -    
   
  -    
  -		
  +
  +
  +
  +
   
     </target>
  -    
  +
     <target name="jar" description="o Create the jar" depends="compile,test">
   
       <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
   
     </target>
  -  
  +
     <target name="clean" description="o Clean up the generated directories">
       <delete dir="${defaulttargetdir}"></delete>
       <delete dir="${distdir}"></delete>
  @@ -81,16 +81,16 @@
         <fileset dir="${defaulttargetdir}"></fileset>
       </copy>
     </target>
  - 
  +
     <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
       <fail message="There were test failures."></fail>
     </target>
     <target name="internal-test" depends="compile-tests">
  -    
  +
         <mkdir dir="${testreportdir}"></mkdir>
         <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
  -        
  -        <sysproperty key="basedir" value="C:\user\vfs\jakarta-commons-sandbox\vfs"></sysproperty>
  +
  +        <sysproperty key="basedir" value="${basedir}"></sysproperty>
           <formatter type="xml"></formatter>
           <formatter usefile="true" type="plain"></formatter>
           <classpath>
  @@ -102,28 +102,28 @@
           </classpath>
           <batchtest todir="${testreportdir}">
             <fileset dir="src/test">
  -            
  +
                 <include name="**/test/*TestCase.java"></include>
  -            
  -            
  +
  +
                 <exclude name="**/test/Abstract*TestCase.java"></exclude>
  -            
  -            
  -            
  -            
  -              
  -              
  +
  +
  +
  +
  +
  +
                   <exclude name="**/*.java"></exclude>
  -              
  -            
  +
  +
             </fileset>
           </batchtest>
         </junit>
  -    
  +
     </target>
   
     <target name="compile-tests" depends="compile">
  -    
  +
         <mkdir dir="${testclassesdir}"></mkdir>
         <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
           <src>
  @@ -137,26 +137,26 @@
           </classpath>
         </javac>
   
  -      
  -   
  -      
  -    
  +
  +
  +
  +
     </target>
   
     <target name="javadoc" description="o Generate javadoc" depends="jar">
  - 
  - 
  +
  +
       <mkdir dir="${javadocdir}"></mkdir>
  - 
  -    
  +
  +
       <tstamp>
         <format pattern="2002-yyyy" property="year"></format>
       </tstamp>
  - 
  +
       <property name="copyright" value="Copyright &amp;copy;  Apache Jakarta Project. All Rights Reserved."></property>
  - 
  +
       <property name="title" value="commons-vfs 1.0-dev API"></property>
  - 
  +
       <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.vfs.*">
         <classpath>
           <fileset dir="lib">
  @@ -165,40 +165,40 @@
           <pathelement location="target/${final.name}.jar"></pathelement>
         </classpath>
       </javadoc>
  - 
  +
     </target>
   
     <target name="get-deps" unless="noget" depends="init">
  -  
  -    
  +
  +
       <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get>
  +    <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get>
       <get dest="lib/commons-net-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-net/jars/commons-net-SNAPSHOT.jar"></get>
       <get dest="lib/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar"></get>
       <get dest="lib/jcifs-0.7.0b5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.7.0b5.jar"></get>
  -    
  +
       <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get>
       <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get>
       <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get>
     </target>
   
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  -  
  +
  +
  +
  +
  +
  +
  +
  +
   
     <target name="install-maven">
   
  -    
  +
   
       <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"></get>
  -    
  +
       <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
  -    
  +
     </target>
   
   </project>
  -    
  \ No newline at end of file
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: cvs commit: jakarta-commons-sandbox/vfs build.xml

Posted by Adam Murdoch <ad...@apache.org>.
On Tue, 26 Nov 2002 02:09 pm, dion@multitask.com.au wrote:
> With the following change to vfs/build.properties
>
> maven.jarResources.basedir=${basedir}/src/java
> to
> maven.jarResources.basedir=src/java
>
> It looks ok on my end.
>
> Mind If I commit it?

Not at all.  Thanks for sorting it out.

-- 
Adam

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: cvs commit: jakarta-commons-sandbox/vfs build.xml

Posted by di...@multitask.com.au.
With the following change to vfs/build.properties

maven.jarResources.basedir=${basedir}/src/java
to
maven.jarResources.basedir=src/java

It looks ok on my end.

Mind If I commit it?
--
dIon Gillard, Multitask Consulting
Blog:      http://www.freeroller.net/page/dion/Weblog
Work:      http://www.multitask.com.au


Adam Murdoch <ad...@apache.org> wrote on 26/11/2002 02:02:45 PM:

> On Tue, 26 Nov 2002 01:07 pm, dion@multitask.com.au wrote:
> > What did you do to get them to turn up?
> 
> maven ant
> 
> Using maven built maybe a week ago, and another one bootstrapped a few 
hours 
> ago.
> 
> -- 
> Adam
> 
> --
> To unsubscribe, e-mail: 
<ma...@jakarta.apache.org>
> For additional commands, e-mail: 
<ma...@jakarta.apache.org>
> 

> ForwardSourceID:NT00092646 

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: cvs commit: jakarta-commons-sandbox/vfs build.xml

Posted by Adam Murdoch <ad...@apache.org>.
On Tue, 26 Nov 2002 01:07 pm, dion@multitask.com.au wrote:
> What did you do to get them to turn up?

maven ant

Using maven built maybe a week ago, and another one bootstrapped a few hours 
ago.

-- 
Adam

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: cvs commit: jakarta-commons-sandbox/vfs build.xml

Posted by di...@multitask.com.au.
What did you do to get them to turn up?
--
dIon Gillard, Multitask Consulting
Blog:      http://www.freeroller.net/page/dion/Weblog
Work:      http://www.multitask.com.au


Adam Murdoch <ad...@apache.org> wrote on 26/11/2002 11:15:36 AM:

> On Tue, 26 Nov 2002 10:15 am, dion@multitask.com.au wrote:
> > Adam,
> >
> > were these paths generated by Maven's descriptor-generation?
> 
> Yep.
> 
> -- 
> Adam
> 
> --
> To unsubscribe, e-mail: 
<ma...@jakarta.apache.org>
> For additional commands, e-mail: 
<ma...@jakarta.apache.org>
> 

> ForwardSourceID:NT0009258A 

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: cvs commit: jakarta-commons-sandbox/vfs build.xml

Posted by Adam Murdoch <ad...@apache.org>.
On Tue, 26 Nov 2002 10:15 am, dion@multitask.com.au wrote:
> Adam,
>
> were these paths generated by Maven's descriptor-generation?

Yep.

-- 
Adam

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: cvs commit: jakarta-commons-sandbox/vfs build.xml

Posted by di...@multitask.com.au.
Adam,

were these paths generated by Maven's descriptor-generation?
--
dIon Gillard, Multitask Consulting
Blog:      http://www.freeroller.net/page/dion/Weblog
Work:      http://www.multitask.com.au


adammurdoch@apache.org wrote on 26/11/2002 08:36:21 AM:

> adammurdoch    2002/11/25 13:36:21
> 
>   Modified:    vfs      build.xml
>   Log:
>   Removed absolute paths from build file.
> 
>   Revision  Changes    Path
>   1.8       +74 -74    jakarta-commons-sandbox/vfs/build.xml
> 
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/jakarta-commons-sandbox/vfs/build.xml,v
>   retrieving revision 1.7
>   retrieving revision 1.8
>   diff -u -r1.7 -r1.8
>   --- build.xml   21 Nov 2002 05:01:00 -0000   1.7
>   +++ build.xml   25 Nov 2002 21:36:21 -0000   1.8
>   @@ -1,25 +1,25 @@
>    <?xml version="1.0" encoding="UTF-8"?>
> 
>    <project default="jar" name="commons-vfs" basedir=".">
>   - 
>   -  <property name="defaulttargetdir" value="target"></property> 
>   +
>   +  <property name="defaulttargetdir" value="target"></property>
>      <property name="classesdir" value="target/classes"></property>
>      <property name="testclassesdir" 
value="target/test-classes"></property>
>      <property name="testreportdir" 
value="target/test-reports"></property>
>   - 
>   - 
>   - 
>   - 
>   - 
>   - 
>   - 
>   - 
>   -  <property name="resourcedir" value="C:\user\vfs\jakarta-
> commons-sandbox\vfs/src/java"></property>
>   - 
>   +
>   +
>   +
>   +
>   +
>   +
>   +
>   +
>   +  <property name="resourcedir" value="src/java"></property>
>   +
>      <property name="distdir" value="dist"></property>
>      <property name="javadocdir" value="target/docs/apidocs"></property>
>      <property name="final.name" value="commons-vfs-1.0-dev"></property>
>   - 
>   +
>      <target name="init" description="o Initializes some properties">
>        <mkdir dir="lib"></mkdir>
>        <condition property="noget">
>   @@ -28,7 +28,7 @@
>      </target>
> 
>      <target name="compile" description="o Compile the code" 
> depends="get-deps">
>   - 
>   +
>        <mkdir dir="${classesdir}"></mkdir>
> 
>        <javac destdir="${classesdir}" deprecation="true" 
> debug="true" optimize="false" excludes="**/package.html">
>   @@ -41,35 +41,35 @@
>            </fileset>
>          </classpath>
>        </javac>
>   - 
>   - 
>   - 
>   - 
>   - 
>   +
>   +
>   +
>   +
>   +
>        <copy todir="${classesdir}">
>   - 
>   +
>          <fileset dir="${resourcedir}">
>   - 
>   - 
>   +
>   +
>            <include name="**/*.properties"></include>
>   - 
>   - 
>   +
>   +
>          </fileset>
>        </copy>
>   - 
>   - 
> 
>   - 
>   - 
>   +
>   +
>   +
>   +
> 
>      </target>
>   - 
>   +
>      <target name="jar" description="o Create the jar" 
depends="compile,test">
> 
>        <jar jarfile="target/${final.name}.jar" excludes="**/package.
> html" basedir="${classesdir}"></jar>
> 
>      </target>
>   - 
>   +
>      <target name="clean" description="o Clean up the generated 
directories">
>        <delete dir="${defaulttargetdir}"></delete>
>        <delete dir="${distdir}"></delete>
>   @@ -81,16 +81,16 @@
>          <fileset dir="${defaulttargetdir}"></fileset>
>        </copy>
>      </target>
>   - 
>   +
>      <target name="test" description="o Run the test cases" 
> if="test.failure" depends="internal-test">
>        <fail message="There were test failures."></fail>
>      </target>
>      <target name="internal-test" depends="compile-tests">
>   - 
>   +
>          <mkdir dir="${testreportdir}"></mkdir>
>          <junit dir="./" failureproperty="test.failure" 
> printSummary="yes" fork="true" haltonerror="true">
>   - 
>   -        <sysproperty key="basedir" value="C:\user\vfs\jakarta-
> commons-sandbox\vfs"></sysproperty>
>   +
>   +        <sysproperty key="basedir" value="${basedir}"></sysproperty>
>            <formatter type="xml"></formatter>
>            <formatter usefile="true" type="plain"></formatter>
>            <classpath>
>   @@ -102,28 +102,28 @@
>            </classpath>
>            <batchtest todir="${testreportdir}">
>              <fileset dir="src/test">
>   - 
>   +
>                  <include name="**/test/*TestCase.java"></include>
>   - 
>   - 
>   +
>   +
>                  <exclude 
name="**/test/Abstract*TestCase.java"></exclude>
>   - 
>   - 
>   - 
>   - 
>   - 
>   - 
>   +
>   +
>   +
>   +
>   +
>   +
>                    <exclude name="**/*.java"></exclude>
>   - 
>   - 
>   +
>   +
>              </fileset>
>            </batchtest>
>          </junit>
>   - 
>   +
>      </target>
> 
>      <target name="compile-tests" depends="compile">
>   - 
>   +
>          <mkdir dir="${testclassesdir}"></mkdir>
>          <javac destdir="${testclassesdir}" deprecation="true" 
> debug="true" optimize="false" excludes="**/package.html">
>            <src>
>   @@ -137,26 +137,26 @@
>            </classpath>
>          </javac>
> 
>   - 
>   - 
>   - 
>   - 
>   +
>   +
>   +
>   +
>      </target>
> 
>      <target name="javadoc" description="o Generate javadoc" 
depends="jar">
>   - 
>   - 
>   +
>   +
>        <mkdir dir="${javadocdir}"></mkdir>
>   - 
>   - 
>   +
>   +
>        <tstamp>
>          <format pattern="2002-yyyy" property="year"></format>
>        </tstamp>
>   - 
>   +
>        <property name="copyright" value="Copyright &amp;copy; 
> Apache Jakarta Project. All Rights Reserved."></property>
>   - 
>   +
>        <property name="title" value="commons-vfs 1.0-dev 
API"></property>
>   - 
>   +
>        <javadoc use="true" private="true" destdir="${javadocdir}" 
> author="true" version="true" sourcepath="src/java" 
> packagenames="org.apache.commons.vfs.*">
>          <classpath>
>            <fileset dir="lib">
>   @@ -165,40 +165,40 @@
>            <pathelement 
location="target/${final.name}.jar"></pathelement>
>          </classpath>
>        </javadoc>
>   - 
>   +
>      </target>
> 
>      <target name="get-deps" unless="noget" depends="init">
>   - 
>   - 
>   +
>   +
>        <get dest="lib/ant-1.5.jar" usetimestamp="true" 
> ignoreerrors="true" 
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar
> "></get>
>   +    <get dest="lib/junit-3.8.1.jar" usetimestamp="true" 
> ignoreerrors="true" src="http://www.ibiblio.
> org/maven/junit/jars/junit-3.8.1.jar"></get>
>        <get dest="lib/commons-net-SNAPSHOT.jar" usetimestamp="true" 
> ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-
> net/jars/commons-net-SNAPSHOT.jar"></get>
>        <get dest="lib/commons-logging-1.0.jar" usetimestamp="true" 
> ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-
> logging/jars/commons-logging-1.0.jar"></get>
>        <get dest="lib/jcifs-0.7.0b5.jar" usetimestamp="true" 
> ignoreerrors="true" src="http://www.ibiblio.
> org/maven/jcifs/jars/jcifs-0.7.0b5.jar"></get>
>   - 
>   +
>        <get dest="lib/junit-3.8.1.jar" usetimestamp="true" 
> ignoreerrors="true" src="http://www.ibiblio.
> org/maven/junit/jars/junit-3.8.1.jar"></get>
>        <get dest="lib/ant-1.5.jar" usetimestamp="true" 
> ignoreerrors="true" 
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar
> "></get>
>        <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" 
> ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-
> optional-1.5.jar"></get>
>      </target>
> 
>   - 
>   - 
>   - 
>   - 
>   - 
>   - 
>   - 
>   - 
>   +
>   +
>   +
>   +
>   +
>   +
>   +
>   +
> 
>      <target name="install-maven">
> 
>   - 
>   +
> 
>        <get dest="${user.home}/maven-install-latest.jar" 
> usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-
> latest.jar"></get>
>   - 
>   +
>        <unjar dest="${maven.home}" src="${user.home}/maven-install-
> latest.jar"></unjar>
>   - 
>   +
>      </target>
> 
>    </project>
>   - 
>   \ No newline at end of file
> 
> 
> 
> 
> --
> To unsubscribe, e-mail: 
<ma...@jakarta.apache.org>
> For additional commands, e-mail: 
<ma...@jakarta.apache.org>
> 

> ForwardSourceID:NT000924A2 

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>