Commit 18069a03 authored by Guus der Kinderen's avatar Guus der Kinderen

OF-981: Remove Jive-specific build modifications.

parent 0d9378d5
...@@ -142,9 +142,6 @@ ...@@ -142,9 +142,6 @@
<taskdef name="propertymerge" classname="org.jugbb.ant.propertymerge.PropertyMergeTask"> <taskdef name="propertymerge" classname="org.jugbb.ant.propertymerge.PropertyMergeTask">
<classpath refid="ant.dependencies" /> <classpath refid="ant.dependencies" />
</taskdef> </taskdef>
<typedef name="srcinc" classname="com.jivesoftware.tools.selector.IncludeSourceSelector" >
<classpath refid="ant.dependencies" />
</typedef>
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<!-- PATHs / PATTERNSETs / FILTERSETs --> <!-- PATHs / PATTERNSETs / FILTERSETs -->
...@@ -914,7 +911,6 @@ ...@@ -914,7 +911,6 @@
<copy todir="${release.src.out.dir}/src"> <copy todir="${release.src.out.dir}/src">
<fileset dir="${src.dir}"> <fileset dir="${src.dir}">
<include name="**/*.java" /> <include name="**/*.java" />
<srcinc />
</fileset> </fileset>
<filterset> <filterset>
<filter token="DATE" value="${builddate}"/> <filter token="DATE" value="${builddate}"/>
...@@ -1320,11 +1316,7 @@ ...@@ -1320,11 +1316,7 @@
<!-- copy the source we want to compile --> <!-- copy the source we want to compile -->
<copy todir="@{pluginlib}/source"> <copy todir="@{pluginlib}/source">
<fileset dir="@{pluginsrc}/@{plugin}/src/java" includes="**/*.java" > <fileset dir="@{pluginsrc}/@{plugin}/src/java" includes="**/*.java" />
<not>
<srcinc />
</not>
</fileset>
<filterset> <filterset>
<filter token="DATE" value="${buildJavaDate}"/> <filter token="DATE" value="${buildJavaDate}"/>
</filterset> </filterset>
...@@ -1357,7 +1349,6 @@ ...@@ -1357,7 +1349,6 @@
</fileset> </fileset>
</jar> </jar>
<!-- Clean-up our source files for the "srcinc" files -->
<delete dir="@{pluginlib}/classes" /> <delete dir="@{pluginlib}/classes" />
<delete dir="@{pluginlib}/source" /> <delete dir="@{pluginlib}/source" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment