Skip to content

O
Openfire
Commit 984e5e1b authored by Guus der Kinderen's avatar Guus der Kinderen
Browse files
Options

Merge remote-tracking branch 'upstream/master' into OF-930

parents 877c1e87 9c8d8887
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 42 deletions
build/build.xml
View file @ 984e5e1b
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</patternset> </patternset>
<presetdef name="of.javac"> <presetdef name="of.javac">
<javac encoding="utf8" source="${javac.source}" target="${javac.target}"/> <javac encoding="utf8" source="${javac.source}" target="${javac.target}" includeAntRuntime="no" debug="on"/>
</presetdef> </presetdef>
<!-- ======================================================================================= --> <!-- ======================================================================================= -->
<!-- GLOBAL TASKDEFs --> <!-- GLOBAL TASKDEFs -->
...@@ -266,11 +266,7 @@ ...@@ -266,11 +266,7 @@
<!-- compile =============================================================================== --> <!-- compile =============================================================================== -->
<target name="compile" depends="init" description="Compiles Openfire app code"> <target name="compile" depends="init" description="Compiles Openfire app code">
<mkdir dir="${compile.dir}"/> <mkdir dir="${compile.dir}"/>
<of.javac <of.javac destdir="${compile.dir}">
destdir="${compile.dir}"
includeAntRuntime="no"
debug="on"
>
<src path="${src.java.dir}"/> <src path="${src.java.dir}"/>
<patternset refid="compile.sources"/> <patternset refid="compile.sources"/>
<classpath> <classpath>
...@@ -295,11 +291,7 @@ ...@@ -295,11 +291,7 @@
<equals arg1="${overlay.source.found}" arg2="true"/> <equals arg1="${overlay.source.found}" arg2="true"/>
<then> <then>
<mkdir dir="${overlay.compile.dir}"/> <mkdir dir="${overlay.compile.dir}"/>
<of.javac <of.javac destdir="${overlay.compile.dir}">
destdir="${overlay.compile.dir}"
includeAntRuntime="no"
debug="on"
>
<src path="${overlay.src.dir}"/> <src path="${overlay.src.dir}"/>
<patternset refid="compile.sources"/> <patternset refid="compile.sources"/>
<classpath> <classpath>
...@@ -551,12 +543,8 @@ ...@@ -551,12 +543,8 @@
</java> </java>
<!-- Compile java source --> <!-- Compile java source -->
<of.javac <of.javac destdir="${jspc.classes.dest.dir}">
destdir="${jspc.classes.dest.dir}" <include name="org/jivesoftware/openfire/admin/**/*.java"/>
includeAntRuntime="no"
debug="on"
includes="org/jivesoftware/openfire/admin/**/*.java"
>
<src path="${jspc.java.dest.dir}"/> <src path="${jspc.java.dest.dir}"/>
<classpath> <classpath>
<pathelement path="${compile.dir}"/> <pathelement path="${compile.dir}"/>
...@@ -599,11 +587,7 @@ ...@@ -599,11 +587,7 @@
<target name="test" depends="openfire" description="Compiles and runs test cases"> <target name="test" depends="openfire" description="Compiles and runs test cases">
<!-- Compile all test code --> <!-- Compile all test code -->
<mkdir dir="${test.classes.dest.dir}"/> <mkdir dir="${test.classes.dest.dir}"/>
<of.javac <of.javac destdir="${test.classes.dest.dir}">
destdir="${test.classes.dest.dir}"
includeAntRuntime="no"
debug="on"
>
<src path="${src.test.java.dir}"/> <src path="${src.test.java.dir}"/>
<patternset refid="test.sources"/> <patternset refid="test.sources"/>
<classpath> <classpath>
...@@ -1312,11 +1296,7 @@ ...@@ -1312,11 +1296,7 @@
<!-- Compile plugin source code --> <!-- Compile plugin source code -->
<mkdir dir="${plugin.dev.dest.dir}/@{plugin}/target/classes"/> <mkdir dir="${plugin.dev.dest.dir}/@{plugin}/target/classes"/>
<of.javac <of.javac destdir="${plugin.dev.dest.dir}/@{plugin}/target/classes">
destdir="${plugin.dev.dest.dir}/@{plugin}/target/classes"
includeAntRuntime="no"
debug="on"
>
<src path="@{pluginsrc}/@{plugin}/src/java"/> <src path="@{pluginsrc}/@{plugin}/src/java"/>
<classpath> <classpath>
<path refid="plugin.dependencies"/> <path refid="plugin.dependencies"/>
...@@ -1350,12 +1330,7 @@ ...@@ -1350,12 +1330,7 @@
<mapper type="merge" to="@{pluginlib}/@{plugin}-lib.jar"/> <mapper type="merge" to="@{pluginlib}/@{plugin}-lib.jar"/>
</uptodate></not> </uptodate></not>
<then> <then>
<of.javac <of.javac destdir="@{pluginlib}/classes">
destdir="@{pluginlib}/classes"
includeAntRuntime="no"
debug="on"
includes="**/*.java"
>
<src path="@{pluginlib}/source"/> <src path="@{pluginlib}/source"/>
<classpath> <classpath>
<pathelement location="${plugin.dev.dest.dir}/@{plugin}/target/classes"/> <pathelement location="${plugin.dev.dest.dir}/@{plugin}/target/classes"/>
...@@ -1517,11 +1492,7 @@ ...@@ -1517,11 +1492,7 @@
</if> </if>
<!-- Compile java classes --> <!-- Compile java classes -->
<of.javac <of.javac destdir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes">
destdir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes"
includeAntRuntime="no"
debug="on"
>
<src path="${plugin.dev.dest.dir}/@{plugin}/target/jspc/java"/> <src path="${plugin.dev.dest.dir}/@{plugin}/target/jspc/java"/>
<classpath> <classpath>
<path refid="jspc.dependencies"/> <path refid="jspc.dependencies"/>
...@@ -1589,10 +1560,7 @@ ...@@ -1589,10 +1560,7 @@
<mkdir dir="${anttools.target.dir}"/> <mkdir dir="${anttools.target.dir}"/>
<mkdir dir="${anttools.target.dir}/classes"/> <mkdir dir="${anttools.target.dir}/classes"/>
<of.javac <of.javac destdir="${anttools.target.dir}/classes" includeAntRuntime="yes">
destdir="${anttools.target.dir}/classes"
debug="on"
>
<src path="${anttools.src.dir}"/> <src path="${anttools.src.dir}"/>
<patternset refid="compile.sources"/> <patternset refid="compile.sources"/>
<classpath> <classpath>
......
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

Technounit-GROUP 2023