[jmock] 14/48: * Patch code to fix the build using only Debian jars

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jmock.

commit 920d1c296b218e950dc760d3cc20fafb7ca0bcc1
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Tue Jul 14 02:08:34 2009 +0000

    * Patch code to fix the build using only Debian jars
---
 debian/patches/build.patch | 17 +++++++++--------
 debian/patches/code.patch  | 29 +++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 2710a5a..9aa0178 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -1,8 +1,9 @@
 --- a/build.xml
 +++ b/build.xml
 @@ -1,5 +1,16 @@
- <project default="jars">
+-<project default="jars">
 -    <property file="build.properties"/>
++<project default="jars">
 +    <property name="build.javadoc.subdir" value="javadoc"/>
 +
 +    <target name="debian-clean" depends="clean">
@@ -13,12 +14,12 @@
 +
 +    <target name="debian-install" depends="core.jar,javadoc">
 +    </target>
-+ 
-+   <property file="build.properties"/>
++
++    <property file="build.properties"/>
  
      <property name="lib.dir" value="lib"/>
      <property name="examples.dir" value="examples"/>
-@@ -80,14 +91,14 @@
+@@ -80,7 +91,7 @@
      <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}"/>
@@ -27,12 +28,12 @@
              <classpath>
                  <fileset dir="${lib.dir}"/>
                  <pathelement path="${core.build.dir}"/>
+@@ -102,7 +113,7 @@
              </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*,**/DefaultResultStubTest.java,**/ThrowStubTest.java"/>
+             <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"/>
              </batchtest>
          </junit>
      </target>
-
diff --git a/debian/patches/code.patch b/debian/patches/code.patch
new file mode 100644
index 0000000..efbb0cb
--- /dev/null
+++ b/debian/patches/code.patch
@@ -0,0 +1,29 @@
+--- a/core/src/test/jmock/core/testsupport/MethodFactory.java
++++ b/core/src/test/jmock/core/testsupport/MethodFactory.java
+@@ -27,12 +27,12 @@
+         {
+             protected Class findClass( String interfaceName ) {
+                 ClassWriter writer = new ClassWriter(true);
+-
++
+                 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,
+--- 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 = "";
diff --git a/debian/patches/series b/debian/patches/series
index 5879227..b555bb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 build.patch
+code.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jmock.git