Thanks Jon, committed to CVS HEAD.
- Dan
Jon Scott Stevens <[EMAIL PROTECTED]> writes:
> Changes the .jar name to be ${final.name}
>
> Fixes things to build 'out of the box', including not building the tests in
> the 'compile' phase as well as doing necessary checks for the required .jar
> files.
>
> Changed the version number to be 1.0rc2-dev
>
> -jon
>
>
> Index: build.properties
> ===================================================================
> RCS file: /home/cvs/xml-rpc/build.properties,v
> retrieving revision 1.4
> diff -u -r1.4 build.properties
> --- build.properties 18 Feb 2002 21:46:18 -0000 1.4
> +++ build.properties 18 Feb 2002 23:46:02 -0000
> @@ -7,7 +7,7 @@
> # -------------------------------------------------------------------
>
> name = XmlRpc
> -version = 1.0rc1
> +version = 1.0rc2-dev
> project = xmlrpc
> build.dir = ./bin
> build.test.dest = ${build.dir}/test
> @@ -20,7 +20,7 @@
> docs.src = ./xdocs
> docs.dest = ./docs
> lib.repo = ./lib
> -year = 1999-2001
> +year = 1999-2002
> debug = off
> optimize = on
> deprecation = off
> @@ -34,3 +34,4 @@
> jnet.jar = ${lib.repo}/jnet.jar
> jcert.jar = ${lib.repo}/jcert.jar
> servlet.jar = ${lib.repo}/servlet.jar
> +junit.jar = ${lib.repo}/junit-3.7.jar
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/xml-rpc/build.xml,v
> retrieving revision 1.6
> diff -u -r1.6 build.xml
> --- build.xml 18 Feb 2002 21:46:18 -0000 1.6
> +++ build.xml 18 Feb 2002 23:46:02 -0000
> @@ -19,6 +19,7 @@
> <pathelement location="${jnet.jar}"/>
> <pathelement location="${jcert.jar}"/>
> <pathelement location="${servlet.jar}"/>
> + <pathelement location="${junit.jar}"/>
> </path>
>
> <!-- ================================================================== -->
> @@ -31,7 +32,8 @@
> <echo message="jsse.jar = ${jsse.jar}"/>
> <echo message="jnet.jar = ${jnet.jar}"/>
> <echo message="jcert.jar = ${jcert.jar}"/>
> - <echo message=""/>
> + <echo message="servlet.jar = ${servlet.jar}"/>
> + <echo message="junit.jar = ${junit.jar}"/>
> </target>
>
> <!-- ================================================================== -->
> @@ -46,7 +48,7 @@
> <!-- I N I T -->
> <!-- ================================================================== -->
>
> - <target name="init">
> + <target name="init" depends="env">
> <available
> classname="com.sun.net.ssl.SSLContext"
> property="jsse.present"
> @@ -65,6 +67,12 @@
> classpathref="classpath"
> />
>
> + <available
> + classname="junit.framework.TestCase"
> + property="junit.present"
> + classpathref="classpath"
> + />
> +
> </target>
>
> <!-- ================================================================== -->
> @@ -83,6 +91,13 @@
> </antcall>
> </target>
>
> + <target name="check.junit" unless="junit.present">
> + <antcall target="property-warning">
> + <param name="name" value="junit.jar"/>
> + <param name="value" value="${junit.jar}"/>
> + </antcall>
> + </target>
> +
> <target name="property-warning">
> <echo>
> +----------------------------------------------------------------+
> @@ -122,9 +137,10 @@
> <exclude name="**/fesi/**"/>
> <exclude name="**/secure/**" unless="jsse.present"/>
> <exclude name="**/XmlRpcProxyServlet.java" unless="servlet.present"/>
> + <exclude name="**/test/**"/>
> </fileset>
> </copy>
> -
> +
> </target>
>
> <!-- ================================================================== -->
> @@ -150,10 +166,10 @@
> <target name="jar" depends="compile"
> description="Builds the two JAR files from source">
>
> - <jar jarfile="${build.dir}/${project}.jar">
> + <jar jarfile="${build.dir}/${final.name}.jar">
> <fileset dir="${build.dest}" excludes="**/applet/*"/>
> </jar>
> - <jar jarfile="${build.dir}/${project}-applet.jar">
> + <jar jarfile="${build.dir}/${final.name}-applet.jar">
> <fileset dir="${build.dest}"
> excludes="**/xmlrpc/*,**/fesi/*,**/secure/*"/>
> </jar>
> @@ -197,7 +213,7 @@
> <!-- ================================================================== -->
>
> <target name="compile-tests"
> - depends="compile"
> + depends="check.junit,compile"
> description="Compiles testing source code">
>
> <mkdir dir="${build.test.dest}"/>
> @@ -329,8 +345,8 @@
>
> <copy todir="${lib.repo}" filtering="no">
> <fileset dir="${build.dir}">
> - <include name="${project}.jar"/>
> - <include name="${project}-applet.jar"/>
> + <include name="${final.name}.jar"/>
> + <include name="${final.name}-applet.jar"/>
> </fileset>
> </copy>
> </target>
