[pkg-java] r9268 - trunk/jmock/debian/patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Tue Jul 14 02:08:34 UTC 2009
Author: ludovicc-guest
Date: 2009-07-14 02:08:34 +0000 (Tue, 14 Jul 2009)
New Revision: 9268
Added:
trunk/jmock/debian/patches/code.patch
Modified:
trunk/jmock/debian/patches/build.patch
trunk/jmock/debian/patches/series
Log:
* Patch code to fix the build using only Debian jars
Modified: trunk/jmock/debian/patches/build.patch
===================================================================
--- trunk/jmock/debian/patches/build.patch 2009-07-14 01:30:12 UTC (rev 9267)
+++ trunk/jmock/debian/patches/build.patch 2009-07-14 02:08:34 UTC (rev 9268)
@@ -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>
-
Added: trunk/jmock/debian/patches/code.patch
===================================================================
--- trunk/jmock/debian/patches/code.patch (rev 0)
+++ trunk/jmock/debian/patches/code.patch 2009-07-14 02:08:34 UTC (rev 9268)
@@ -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 = "";
Modified: trunk/jmock/debian/patches/series
===================================================================
--- trunk/jmock/debian/patches/series 2009-07-14 01:30:12 UTC (rev 9267)
+++ trunk/jmock/debian/patches/series 2009-07-14 02:08:34 UTC (rev 9268)
@@ -1 +1,2 @@
build.patch
+code.patch
More information about the pkg-java-commits
mailing list