You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by jo...@apache.org on 2001/03/12 03:38:30 UTC

cvs commit: jakarta-velocity/build build-testcases.xml build-velocity.sh

jon         01/03/11 18:38:30

  Modified:    build    build-testcases.xml build-velocity.sh
  Log:
  make it possible to override the build file and run the build-testcases.xml
  file directly with build-velocity.sh
  
  Revision  Changes    Path
  1.9       +8 -0      jakarta-velocity/build/build-testcases.xml
  
  Index: build-testcases.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/build/build-testcases.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build-testcases.xml	2001/03/12 02:27:59	1.8
  +++ build-testcases.xml	2001/03/12 02:38:29	1.9
  @@ -3,6 +3,7 @@
   <!-- Testcases for Velocity -->
   <project name="main" default="test-all">
   
  +  <property name="build.dir" value="../bin"/>
     <property name="build.dest" value="${build.dir}/classes"/>
     <property name="ant.home" value="."/>
     <property name="test.home" value="../test"/>
  @@ -10,6 +11,13 @@
   
     <!-- JUnit Testbed properties -->
     <property name="velocity.test.runner" value="junit.textui.TestRunner"/>
  +
  +  <!-- Build classpath -->
  +  <path id="classpath">
  +    <fileset dir="./lib">
  +      <include name="**/*.jar"/>
  +    </fileset>
  +  </path>
   
     <!-- =================================================================== -->
     <!-- JUnit Test Cases                                                    -->
  
  
  
  1.14      +5 -3      jakarta-velocity/build/build-velocity.sh
  
  Index: build-velocity.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/build/build-velocity.sh,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build-velocity.sh	2001/03/11 21:49:11	1.13
  +++ build-velocity.sh	2001/03/12 02:38:29	1.14
  @@ -21,7 +21,7 @@
   
   # convert the existing path to unix
   if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
  -   CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  +    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
   fi
   
   CLASSPATH=${CLASSPATH}:./lib/ant-1.3.jar
  @@ -32,10 +32,12 @@
   
   # convert the unix path to windows
   if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
  -   CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
  +    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   fi
   
  -BUILDFILE=build-velocity.xml
  +if [ "$BUILDFILE" = "" ] ; then
  +    BUILDFILE=build-velocity.xml
  +fi
   
   ${JAVA_HOME}/bin/java -classpath ${CLASSPATH} \
                          org.apache.tools.ant.Main \