Author: antoine Date: Tue Nov 7 05:08:52 2006 New Revision: 472096 URL: http://svn.apache.org/viewvc?view=rev&rev=472096 Log: remove checked in version of the client lib, always build the client lib with the server
Removed: jakarta/slide/trunk/lib/jakarta-slide-webdavlib-2.2pre1.jar Modified: jakarta/slide/trunk/build.xml jakarta/slide/trunk/webdavclient/build.xml Modified: jakarta/slide/trunk/build.xml URL: http://svn.apache.org/viewvc/jakarta/slide/trunk/build.xml?view=diff&rev=472096&r1=472095&r2=472096 ============================================================================== --- jakarta/slide/trunk/build.xml (original) +++ jakarta/slide/trunk/build.xml Tue Nov 7 05:08:52 2006 @@ -53,7 +53,7 @@ <property name="commons-xmlio.jar" value="${lib.dir}/commons-xmlio-0.1pre.jar"/> <property name="commons-transaction.jar" value="${lib.dir}/commons-transaction-1.1.1pre1.jar"/> <property name="commons-codec.jar" value="${lib.dir}/commons-codec-1.3.jar"/> - <property name="jakarta-slide-webdavlib.jar" value="${lib.dir}/jakarta-slide-webdavlib-${version}.jar"/> + <property name="jakarta-slide-webdavlib.jar" location="webdavclient/dist/lib/jakarta-slide-webdavlib-${version}.jar"/> <property name="db-ojb.jar" value="${lib.dir}/db-ojb-1.0.1.jar"/> <property name="xdoclet.jar" value="${lib.dir}/xdoclet-1.2.1.jar"/> <property name="xjavadoc.jar" value="${lib.dir}/xjavadoc-1.0.3.jar"/> @@ -274,11 +274,20 @@ <!-- =================================================================== --> <!-- Build All : Main, Doc and JavaDoc --> <!-- =================================================================== --> - <target name="all" depends="clean,dist" description="Delete previous build and make core components distribution"/> + <target name="all" depends="clean,dist" description="Delete previous build + and make client and core components distribution"/> + <!-- =================================================================== --> + <!-- Build webdavclient --> + <!-- =================================================================== --> + <target name="webdavclient"> + <ant dir="webdavclient" inheritall="false"> + <property name="jakarta-slide-webdavlib.jar" value="${jakarta-slide-webdavlib.jar}"/> + </ant> + </target> <!-- =================================================================== --> <!-- Build Slide --> <!-- =================================================================== --> - <target name="main" description="Builds Slide's Core"> + <target name="main" depends="webdavclient" description="Builds Slide's Core"> <copy todir="${slide.build}/classes"> <fileset dir="."> <include name="LICENSE"/> @@ -769,8 +778,7 @@ <target name="testsuite-dist-prepare"> <mkdir dir="${testsuite.dist}"/> </target> - <target name="testsuite-dist" depends="testsuite-dist-prepare"> - <ant dir="webdavclient" inheritall="false"/> + <target name="testsuite-dist" depends="webdavclient,testsuite-dist-prepare"> <ant dir="testsuite" inheritall="false"/> <copy todir="${testsuite.dist}"> <fileset dir="${basedir}/testsuite" excludes="**/dist/**,**/CVS/**,**/testCasesResults.xml,**/testErrorsReport.txt"/> Modified: jakarta/slide/trunk/webdavclient/build.xml URL: http://svn.apache.org/viewvc/jakarta/slide/trunk/webdavclient/build.xml?view=diff&rev=472096&r1=472095&r2=472096 ============================================================================== --- jakarta/slide/trunk/webdavclient/build.xml (original) +++ jakarta/slide/trunk/webdavclient/build.xml Tue Nov 7 05:08:52 2006 @@ -46,7 +46,11 @@ <property name="clientlib.javadoc.path" value="doc/clientjavadoc"/> <property name="ant.javadoc.path" value="doc/antjavadoc"/> <property name="jca.javadoc.path" value="doc/jcajavadoc"/> - <property name="cmd.javadoc.path" value="doc/commandline"/> + <property name="cmd.javadoc.path" value="doc/commandline"/> + <!-- =================================================================== --> + <!-- full path of the webdavlib, can be overriden from the main build file --> + <!-- =================================================================== --> + <property name="jakarta-slide-webdavlib.jar" location="${clientlib.dist}/lib/${clientlib.final.name}.jar"/> <!-- =================================================================== --> <!-- Dependencies Properties --> <!-- =================================================================== --> @@ -290,7 +294,7 @@ <include name="jdom*.*"/> </fileset> </copy> - <jar jarfile="${clientlib.dist}/lib/${clientlib.final.name}.jar" + <jar jarfile="${jakarta-slide-webdavlib.jar}" basedir="${clientlib.build}/classes" manifest="${slide.dist}/etc/MANIFEST.MF"> <metainf file="./LICENSE"/> @@ -358,7 +362,7 @@ <fileset file="${commons-logging.jar}"/> <fileset file="${jdom.jar}"/> <fileset file="lib/jdom.license"/> - <fileset file="${clientlib.dist}/lib/${clientlib.final.name}.jar"/> + <fileset file="${jakarta-slide-webdavlib.jar}"/> </copy> <copy file="ant/src/java/org/apache/webdav/ant/taskdefs.properties" tofile="${ant.dist}/webdav.taskdefs"/> @@ -384,7 +388,7 @@ </fileset> <fileset file="${commons-httpclient.jar}"/> <fileset file="${commons-logging.jar}"/> - <fileset file="${clientlib.dist}/lib/${clientlib.final.name}.jar"/> + <fileset file="${jakarta-slide-webdavlib.jar}"/> <fileset file="${commons-transaction.jar}"/> <fileset file="${jdom.jar}"/> </copy> @@ -396,7 +400,7 @@ </zipfileset> <zipfileset file="${commons-httpclient.jar}"/> <zipfileset file="${commons-logging.jar}"/> - <zipfileset file="${clientlib.dist}/lib/${clientlib.final.name}.jar"/> + <zipfileset file="${jakarta-slide-webdavlib.jar}"/> <zipfileset file="${commons-transaction.jar}"/> <zipfileset file="${jdom.jar}"/> <zipfileset file="${jca.dist}/${jca.final.name}.jar"/> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]