gholam 01/04/10 04:28:15
Modified: build build-regexp.sh build-regexp.xml run-tests.sh
Log:
added the loop to run-test script to allow for version change on jar name.
Revision Changes Path
1.3 +1 -1 jakarta-regexp/build/build-regexp.sh
Index: build-regexp.sh
===================================================================
RCS file: /home/cvs/jakarta-regexp/build/build-regexp.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build-regexp.sh 2000/11/27 19:47:19 1.2
+++ build-regexp.sh 2001/04/10 11:28:15 1.3
@@ -37,5 +37,5 @@
BUILDFILE=build-regexp.xml
-${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main \
+${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main -emacs \
-buildfile ${BUILDFILE} "$@"
1.8 +14 -14 jakarta-regexp/build/build-regexp.xml
Index: build-regexp.xml
===================================================================
RCS file: /home/cvs/jakarta-regexp/build/build-regexp.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-regexp.xml 2001/02/27 08:37:04 1.7
+++ build-regexp.xml 2001/04/10 11:28:15 1.8
@@ -14,7 +14,7 @@
<property name="year" value="2001"/>
<property name="version" value="1.3-dev"/>
<property name="project" value="jakarta-regexp"/>
- <property name="build.compiler" value="classic"/>
+ <property name="build.compiler" value="jikes"/>
<property name="build.dir" value="../bin"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.dest" value="${build.dir}/classes"/>
@@ -50,7 +50,7 @@
<filter token="version" value="${version}"/>
<filter token="date" value="${TODAY}"/>
- <available classname="org.apache.velocity.anakia.AnakiaTask"
+ <available classname="org.apache.velocity.anakia.AnakiaTask"
property="AnakiaTask.present"/>
<mkdir dir="${build.dir}"/>
@@ -78,7 +78,7 @@
deprecation="${deprecation}"
optimize="${optimize}"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Compiles the source directory and creates a .jar file -->
<!-- =================================================================== -->
@@ -87,7 +87,7 @@
basedir="${build.dest}"
excludes="**/package.html"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Creates the API documentation -->
<!-- =================================================================== -->
@@ -105,15 +105,15 @@
doctitle="${Name} ${version} API"
bottom="Copyright &copy; ${year} Apache Software Foundation. All
Rights Reserved."
>
- </javadoc>
+ </javadoc>
</target>
-
+
<!-- =================================================================== -->
<!-- Package -->
<!-- =================================================================== -->
<target name="package" depends="jar,docs,javadocs">
<mkdir dir="${final.dir}"/>
-
+
<copy todir="${final.dir}/src/java">
<fileset dir="${src.java.dir}"/>
</copy>
@@ -127,13 +127,13 @@
</copy>
<copy todir="${final.dir}/build">
<fileset dir="../build">
- <exclude name="velocity.log"/>
+ <exclude name="velocity.log"/>
</fileset>
</copy>
<copy file="../LICENSE" tofile="${final.dir}/LICENSE"/>
<copy file="${build.dir}/${final.name}.jar"
tofile="${final.dir}/${final.name}.jar"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Packages the distribution with ZIP -->
<!-- =================================================================== -->
@@ -141,7 +141,7 @@
<delete file="../${final.name}.zip" verbose="false"/>
<zip zipfile="../${final.name}.zip" basedir="../${final.name}"
includes="**/**"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Packages the distribution with TAR-GZIP -->
<!-- =================================================================== -->
@@ -151,7 +151,7 @@
<tar tarfile="../${final.name}.tar" basedir="../"
includes="**/${final.name}/**"/>
<gzip zipfile="../${final.name}.tar.gz" src="../${final.name}.tar"/>
</target>
-
+
<!-- =================================================================== -->
<!-- Packages the distribution with ZIP and TAG-GZIP -->
<!-- =================================================================== -->
@@ -170,11 +170,11 @@
<!-- ================================================================== -->
<target depends="prepare" name="prepare-error" unless="AnakiaTask.present">
<echo>
- AnakiaTask is not present! Please check to make sure that
+ AnakiaTask is not present! Please check to make sure that
velocity.jar is in your classpath.
</echo>
</target>
-
+
<target name="docs" depends="prepare-error" if="AnakiaTask.present">
<taskdef name="anakia" classname="org.apache.velocity.anakia.AnakiaTask"/>
<anakia basedir="${docs.src}" destdir="${docs.dest}/"
@@ -200,5 +200,5 @@
</fileset>
</copy>
</target>
-
+
</project>
1.2 +7 -3 jakarta-regexp/build/run-tests.sh
Index: run-tests.sh
===================================================================
RCS file: /home/cvs/jakarta-regexp/build/run-tests.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- run-tests.sh 2001/02/27 08:37:04 1.1
+++ run-tests.sh 2001/04/10 11:28:15 1.2
@@ -25,16 +25,20 @@
CLASSPATH=$CLASSPATH:"$i"
done
# Add in the jakarta-site2 library files
-for i in ../../jakarta-site2/lib/*.jar
-do
+for i in ../../jakarta-site2/lib/*.jar; do
CLASSPATH=$CLASSPATH:"$i"
done
+# Add in the jakarta-site2 library files
+for i in ../bin/jakarta-regexp-*.jar; do
+ CLASSPATH=$CLASSPATH:"$i"
+done
+
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-CLASSPATH=$CLASSPATH:../bin/jakarta-regexp-1.3-dev.jar
+CLASSPATH=$CLASSPATH:
${JAVA_HOME}/bin/java -Xint -classpath ${CLASSPATH} org.apache.regexp.RETest $1 $2
