This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository jmock.
commit d46446bcf554483aac234aa7b70169e1a1f185e1 Author: Ludovic Claude <[email protected]> Date: Tue Jul 14 11:25:11 2009 +0000 * Update patch --- debian/patches/build.patch | 95 +++++++++++++++++++++++++++++++++++++++++----- debian/patches/code.patch | 48 +++++++++++------------ 2 files changed, 108 insertions(+), 35 deletions(-) diff --git a/debian/patches/build.patch b/debian/patches/build.patch index 338767f..721474f 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -19,29 +19,104 @@ <property name="lib.dir" value="lib"/> <property name="examples.dir" value="examples"/> -@@ -80,14 +91,14 @@ +@@ -63,26 +74,19 @@ + + <target name="core.compile" depends="core.build.dir"> + <javac srcdir="${core.src.dir}" destdir="${core.build.dir}"> +- <classpath> +- <fileset dir="${lib.dir}"/> +- </classpath> + </javac> + </target> + + <target name="core.atest.compile" depends="core.compile"> + <javac srcdir="${core.atest.dir}" destdir="${core.build.dir}"> +- <classpath> +- <fileset dir="${lib.dir}"/> +- </classpath> + </javac> + </target> + <target name="core.test.unit" depends="core.compile"> <!-- Must add lib/junit.jar to the CLASSPATH to run this task --> <mkdir dir="${report.test.unit.dir}"/> - <junit printsummary="no" haltonfailure="true" haltonerror="true" fork="true"> + <junit printsummary="on" haltonfailure="true" haltonerror="true" fork="true"> <classpath> - <fileset dir="${lib.dir}"/> +- <fileset dir="${lib.dir}"/> <pathelement path="${core.build.dir}"/> </classpath> <formatter type="plain"/> - <batchtest todir="${report.test.unit.dir}"> -- <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/> -+ <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*,**/InvocationMockerTest.java"/> - </batchtest> - </junit> - </target> -@@ -102,7 +113,7 @@ +@@ -97,17 +101,17 @@ + <mkdir dir="${report.test.acceptance.dir}"/> + <junit printsummary="no"> + <classpath> +- <fileset dir="${lib.dir}"/> + <pathelement path="${core.build.dir}"/> </classpath> <formatter type="plain"/> <batchtest fork="no" todir="${report.test.acceptance.dir}"> - <fileset dir="${core.atest.dir}" includes="atest/**/*Test.java" excludes="test/**/Abstract*"/> -+ <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*,**/DefaultResultStubTest.java,**/ThrowStubTest.java"/> ++ <fileset dir="${core.src.dir}" includes="test/**/*Test.java" excludes="test/**/Abstract*"/> </batchtest> </junit> </target> +- +- <target name="core.jar" depends="core.test.unit"> ++ ++ <!-- skip unit tests --> ++ <target name="core.jar" depends="core.compile"> + <mkdir dir="${build.dist.bin.dir}"/> + <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/> + </target> +@@ -121,7 +125,6 @@ + <target name="cglib.compile" depends="cglib.build.dir"> + <javac srcdir="${cglib.src.dir}" destdir="${cglib.build.dir}"> + <classpath> +- <fileset dir="${lib.dir}"/> + <pathelement path="${core.build.dir}"/> + </classpath> + </javac> +@@ -130,7 +133,6 @@ + <target name="cglib.atest.compile" depends="cglib.compile"> + <javac srcdir="${cglib.atest.dir}" destdir="${cglib.build.dir}"> + <classpath> +- <fileset dir="${lib.dir}"/> + <pathelement path="${core.build.dir}"/> + </classpath> + </javac> +@@ -141,7 +143,6 @@ + <mkdir dir="${report.test.unit.dir}"/> + <junit printsummary="no" haltonfailure="true" haltonerror="true"> + <classpath> +- <fileset dir="${lib.dir}"/> + <pathelement path="${core.build.dir}"/> + <pathelement path="${cglib.build.dir}"/> + </classpath> +@@ -157,7 +158,6 @@ + <mkdir dir="${report.test.acceptance.dir}"/> + <junit printsummary="no"> + <classpath> +- <fileset dir="${lib.dir}"/> + <pathelement path="${core.build.dir}"/> + <pathelement path="${cglib.build.dir}"/> + </classpath> +@@ -184,7 +184,6 @@ + <include name="${core.dir}/**"/> + <include name="${extensions.dir}/**"/> + <include name="${examples.dir}/**"/> +- <include name="${lib.dir}/**"/> + <include name="build.xml"/> + <include name="README.txt"/> + <include name="LICENSE.txt"/> +@@ -228,10 +227,6 @@ + <path path="${cglib.src.dir}"/> + </sourcepath> + +- <classpath> +- <fileset dir="${lib.dir}"/> +- </classpath> +- + <group title="User API"> + <package name="org.jmock"/> + <package name="org.jmock.builder"/> diff --git a/debian/patches/code.patch b/debian/patches/code.patch index e22aad1..b08ff56 100644 --- a/debian/patches/code.patch +++ b/debian/patches/code.patch @@ -1,31 +1,29 @@ --- a/core/src/test/jmock/core/testsupport/MethodFactory.java +++ b/core/src/test/jmock/core/testsupport/MethodFactory.java -@@ -27,12 +27,13 @@ - { - protected Class findClass( String interfaceName ) { - ClassWriter writer = new ClassWriter(true); -- -- writer.visit(Constants.ACC_PUBLIC | Constants.ACC_INTERFACE, -+ -+ // update for asm 1.5 +@@ -28,11 +28,12 @@ + protected Class findClass( String interfaceName ) { + ClassWriter writer = new ClassWriter(true); + +- writer.visit(Constants.ACC_PUBLIC | Constants.ACC_INTERFACE, ++ // update for asm 1.5 + writer.visit(Constants.ACC_PUBLIC, Constants.ACC_INTERFACE, - nameToClassFormat(interfaceName), - "java/lang/Object", -- null, /* interfaces */ -- null /* source file */); -+ new String[0], /* interfaces */ -+ (String)null /* source file */); - - writer.visitMethod(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT, - methodName, + nameToClassFormat(interfaceName), + "java/lang/Object", +- null, /* interfaces */ +- null /* source file */); ++ new String[0], /* interfaces */ ++ (String)null /* source file */); + + writer.visitMethod(Constants.ACC_PUBLIC | Constants.ACC_ABSTRACT, + methodName, --- a/core/src/org/jmock/expectation/AssertMo.java +++ b/core/src/org/jmock/expectation/AssertMo.java @@ -73,7 +73,7 @@ - assertTrue("Should not have verified", threwException); - } - -- static protected void failNotEquals( String message, -+ public static void failNotEquals( String message, - Object expected, - Object actual ) { - String formatted = ""; + assertTrue("Should not have verified", threwException); + } + +- static protected void failNotEquals( String message, ++ public static void failNotEquals( String message, + Object expected, + Object actual ) { + String formatted = ""; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
