You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2008/01/26 00:14:33 UTC
svn commit: r615391 - /incubator/abdera/java/trunk/build/build.xml
Author: jmsnell
Date: Fri Jan 25 15:14:32 2008
New Revision: 615391
URL: http://svn.apache.org/viewvc?rev=615391&view=rev
Log:
fix build bug
Modified:
incubator/abdera/java/trunk/build/build.xml
Modified: incubator/abdera/java/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/build/build.xml?rev=615391&r1=615390&r2=615391&view=diff
==============================================================================
--- incubator/abdera/java/trunk/build/build.xml (original)
+++ incubator/abdera/java/trunk/build/build.xml Fri Jan 25 15:14:32 2008
@@ -417,6 +417,7 @@
</target>
<target name="clean">
+<!--
<delete dir="${work}" />
<delete dir="${test}" />
<delete dir="${dist}" />
@@ -427,6 +428,7 @@
<fileset dir="${basedir}" includes="*.zip" />
<fileset dir="${basedir}" includes="*.md5" />
</delete>
+-->
</target>
<target name="dist" depends="clean,build,test,docs">
@@ -692,6 +694,10 @@
</antcall>
<antcall target="compile.extension">
+ <param name="ext" value="html" />
+ </antcall>
+
+ <antcall target="compile.extension">
<param name="ext" value="json" />
</antcall>
@@ -715,10 +721,6 @@
<param name="ext" value="oauth" />
</antcall>
- <antcall target="compile.extension">
- <param name="ext" value="html" />
- </antcall>
-
</target>
<target name="compile.extension.ask">
@@ -732,7 +734,7 @@
<echo>Compiling extension ${ext}...</echo>
<mkdir dir="${extensions.work}/${ext}" />
<mkdir dir="${extensions.work}/${ext}/META-INF" />
- <javac srcdir="${extensions}/${ext}/src/main/java" destdir="${extensions.work}/${ext}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${client.work};${protocol.work};${extensions.work}/main" debug="${debug}" />
+ <javac srcdir="${extensions}/${ext}/src/main/java" destdir="${extensions.work}/${ext}" classpathref="jar.dependencies" classpath="${core.work};${parser.work};${client.work};${protocol.work};${extensions.work}/main;${extensions.work}/html" debug="${debug}" />
<available file="${extensions}/${ext}/src/test/java" property="is.available.${ext}.test" />
@@ -775,6 +777,10 @@
</antcall>
<antcall target="dist.extension">
+ <param name="ext" value="html" />
+ </antcall>
+
+ <antcall target="dist.extension">
<param name="ext" value="json" />
</antcall>
@@ -798,10 +804,6 @@
<param name="ext" value="oauth" />
</antcall>
- <antcall target="dist.extension">
- <param name="ext" value="html" />
- </antcall>
-
</target>
<target name="dist.extension">
@@ -833,6 +835,11 @@
</antcall>
<antcall target="test.extension">
+ <param name="ext" value="html" />
+ </antcall>
+
+
+ <antcall target="test.extension">
<param name="ext" value="json" />
</antcall>
@@ -855,11 +862,7 @@
<antcall target="test.extension">
<param name="ext" value="oauth" />
</antcall>
-
- <antcall target="test.extension">
- <param name="ext" value="html" />
- </antcall>
-
+
</target>
<target name="test.extension">
Re: svn commit: r615391 - /incubator/abdera/java/trunk/build/build.xml
Posted by James M Snell <ja...@gmail.com>.
Grr. #$#@$!@^%$@@#$$$@@#$#*^&%&#$!!!!!
Garrett Rooney wrote:
> On Jan 25, 2008 6:14 PM, <jm...@apache.org> wrote:
>
>> <target name="clean">
>> +<!--
>> <delete dir="${work}" />
>> <delete dir="${test}" />
>> <delete dir="${dist}" />
>> @@ -427,6 +428,7 @@
>> <fileset dir="${basedir}" includes="*.zip" />
>> <fileset dir="${basedir}" includes="*.md5" />
>> </delete>
>> +-->
>> </target>
>
> This looks like a familiar mistake...
>
> ;-)
>
> -garrett
>
Re: svn commit: r615391 - /incubator/abdera/java/trunk/build/build.xml
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On Jan 25, 2008 6:14 PM, <jm...@apache.org> wrote:
> <target name="clean">
> +<!--
> <delete dir="${work}" />
> <delete dir="${test}" />
> <delete dir="${dist}" />
> @@ -427,6 +428,7 @@
> <fileset dir="${basedir}" includes="*.zip" />
> <fileset dir="${basedir}" includes="*.md5" />
> </delete>
> +-->
> </target>
This looks like a familiar mistake...
;-)
-garrett