|
 |
7e2ae8 |
--- build.xml.orig 2014-12-31 16:43:56.000000000 +0000
|
|
|
7e2ae8 |
+++ build.xml 2015-06-22 09:20:12.859059775 +0100
|
|
|
7e2ae8 |
@@ -81,6 +81,7 @@
|
|
|
7e2ae8 |
<target name="compile" depends="clean, prepare">
|
|
|
7e2ae8 |
<javac srcdir="src" destdir="${src.classes.dir}" source="1.5" target="1.5" debug="true" deprecation="true" nowarn="true">
|
|
|
7e2ae8 |
<classpath refid="compile.classpath" />
|
|
|
7e2ae8 |
+ <compilerarg value="-Xlint:none" />
|
|
|
7e2ae8 |
</javac>
|
|
|
7e2ae8 |
</target>
|
|
|
7e2ae8 |
|
|
|
7e2ae8 |
@@ -207,18 +208,14 @@
|
|
|
7e2ae8 |
<delete file="${target.dir}/${jar.core.osgified}" />
|
|
|
7e2ae8 |
</target>
|
|
|
7e2ae8 |
|
|
|
7e2ae8 |
- <target name="jar" depends="jar.all">
|
|
|
7e2ae8 |
- <jarjar jarfile="${target.dir}/${jar.core}">
|
|
|
7e2ae8 |
+ <target name="jar" depends="compile">
|
|
|
7e2ae8 |
+ <jar jarfile="${target.dir}/${jar.core}">
|
|
|
7e2ae8 |
<manifest>
|
|
|
7e2ae8 |
<attribute name="Built-By" value="${user.name}"/>
|
|
|
7e2ae8 |
<attribute name="Implementation-Version" value="${version}"/>
|
|
|
7e2ae8 |
</manifest>
|
|
|
7e2ae8 |
- <fileset dir="${lib.dir.repackaged}" includes="*.txt" />
|
|
|
7e2ae8 |
- <fileset dir="." file="LICENSE" />
|
|
|
7e2ae8 |
- <fileset dir="." file="NOTICE" />
|
|
|
7e2ae8 |
<fileset dir="${src.classes.dir}" />
|
|
|
7e2ae8 |
- <zipfileset src="${lib.dir.repackaged}/cglib-and-asm-1.0.jar"/>
|
|
|
7e2ae8 |
- </jarjar>
|
|
|
7e2ae8 |
+ </jar>
|
|
|
7e2ae8 |
</target>
|
|
|
7e2ae8 |
|
|
|
7e2ae8 |
<target name="sources" >
|
|
|
7e2ae8 |
@@ -319,53 +316,10 @@
|
|
|
7e2ae8 |
|
|
|
7e2ae8 |
]]>
|
|
|
7e2ae8 |
</doctitle>
|
|
|
7e2ae8 |
- <header>
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
- <script type="text/javascript">
|
|
|
7e2ae8 |
- var shBaseURL = '{@docRoot}/js/sh-2.1.382/';
|
|
|
7e2ae8 |
- </script>
|
|
|
7e2ae8 |
- <script type="text/javascript" src="{@docRoot}/js/jquery-1.7.min.js"></script>
|
|
|
7e2ae8 |
- <script type="text/javascript" src="{@docRoot}/js/jquery.beautyOfCode-min.js"></script>
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
- <script type="text/javascript">
|
|
|
7e2ae8 |
- /* Apply beautification of code */
|
|
|
7e2ae8 |
- var usingOldIE = false;
|
|
|
7e2ae8 |
- if($.browser.msie && parseInt($.browser.version) < 9) usingOldIE = true;
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
- if(!usingOldIE) {
|
|
|
7e2ae8 |
- $.beautyOfCode.init({
|
|
|
7e2ae8 |
- theme : 'Eclipse',
|
|
|
7e2ae8 |
- brushes: ['Java']
|
|
|
7e2ae8 |
- });
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
- var version = ${version};
|
|
|
7e2ae8 |
-
|
|
|
7e2ae8 |
- /* Add name & version to header */
|
|
|
7e2ae8 |
- $(function() {
|
|
|
7e2ae8 |
- $('td.NavBarCell1[colspan=2]').each(function(index, element) {
|
|
|
7e2ae8 |
- var jqueryTD = $(element);
|
|
|
7e2ae8 |
- jqueryTD.after(
|
|
|
7e2ae8 |
- $('Mockito ${version} API').attr('class','NavBarCell1').attr('id','mockito-version-header')
|
|
|
7e2ae8 |
- );
|
|
|
7e2ae8 |
- jqueryTD.removeAttr('colspan');
|
|
|
7e2ae8 |
- })
|
|
|
7e2ae8 |
- })
|
|
|
7e2ae8 |
- }
|
|
|
7e2ae8 |
- </script>
|
|
|
7e2ae8 |
- ]]>
|
|
|
7e2ae8 |
- </header>
|
|
|
7e2ae8 |
<group title="Main package" packages="org.mockito"/>
|
|
|
7e2ae8 |
<classpath refid="compile.classpath" />
|
|
|
7e2ae8 |
</javadoc>
|
|
|
7e2ae8 |
- <copy todir="${javadoc.dir}/org/mockito" file="javadoc/img/logo.jpg" />
|
|
|
7e2ae8 |
- <copy todir="${javadoc.dir}/js" file="javadoc/js/jquery-1.7.min.js" />
|
|
|
7e2ae8 |
- <copy todir="${javadoc.dir}/js" file="javadoc/js/jquery.beautyOfCode-min.js" />
|
|
|
7e2ae8 |
- <copy todir="${javadoc.dir}/js/sh-2.1.382">
|
|
|
7e2ae8 |
- <fileset dir="javadoc/js/sh-2.1.382"/>
|
|
|
7e2ae8 |
- </copy>
|
|
|
7e2ae8 |
+ <copy todir="${javadoc.dir}/org/mockito" file="javadoc/org/mockito/logo.jpg" />
|
|
|
7e2ae8 |
</target>
|
|
|
7e2ae8 |
|
|
|
7e2ae8 |
<target name="repackage-tests" depends="compile.test">
|