Hi David,
Wolfgang Baer contributed the 2 attached patches in reply to a query on
debian-java.
They allow the current version of Kaffe to build javahl.
Please consider adding them to the next upload of Subversion.
(They also apply to 1.1.4).
I will be forwarding them to [EMAIL PROTECTED] in a few days.
(Need to find time to read HACKING so I get the log message right. :)
FYI Kaffe changed from the kjc compiler to jikes some weeks back. jikes is
unable to compile subversion without patching.
On Wed, 6 Apr 2005 06:26 pm, Wolfgang Baer wrote:
> Attached two patches which fix the jikes build problem. BTW, its not
> jikes fault but wrong coding sytle in the java files. jike is very
> strict to the specification - which javac is not.
>
> Could you please forward the patches to upstream ?
>
> Put the patches in your debian/patches dir and copy the two line change
> in the attached series file to your series file. I successfully built
> the javaHL bindings with these patches in my chroot.
>
> Two comments:
>
> (1) The debian/libsvn-javahl directory gets created and populated with
> the native and java libraries if ENABLE_JAVAHL=yes is set in the rules
> file - however no libsvn-javahl package gets created. But I think this
> is only a minor packaging problem.
>
> (2) According to the java policy the native library parts should be
> installed under /usr/lib/jni directory. I personally would also name the
> package just libsvn-java. libsvn-javahl doesn't say much to a user and
> confuses him in my opinion.
>
> Regards,
>
> Wolfgang
>
> PS: I am eager awaiting the JavaHL bindings so I can use the eclipse svn
> plugin without recompiling subversion from source.
>
> -------------------------------------------------------
--
Thanks
Andrew V.
--- subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java.orig 2004-06-12 13:01:25.000000000 +0000
+++ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Notify.java 2005-04-06 07:28:09.000000000 +0000
@@ -56,7 +56,7 @@
*/
public static final String getActionName(int action)
{
- return actionNames[action];
+ return NotifyAction.actionNames[action];
}
}
@@ -73,7 +73,7 @@
*/
public static final String getStatusName(int status)
{
- return statusNames[status];
+ return NotifyStatus.statusNames[status];
}
}
--- subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Status.java.orig 2004-09-06 05:56:11.000000000 +0000
+++ subversion/bindings/java/javahl/src/org/tigris/subversion/javahl/Status.java 2005-04-06 07:47:48.000000000 +0000
@@ -490,31 +490,31 @@
{
switch (kind)
{
- case none:
+ case StatusKind.none:
return "non-svn";
- case normal:
+ case StatusKind.normal:
return "normal";
- case added:
+ case StatusKind.added:
return "added";
- case missing:
+ case StatusKind.missing:
return "missing";
- case deleted:
+ case StatusKind.deleted:
return "deleted";
- case replaced:
+ case StatusKind.replaced:
return "replaced";
- case modified:
+ case StatusKind.modified:
return "modified";
- case merged:
+ case StatusKind.merged:
return "merged";
- case conflicted:
+ case StatusKind.conflicted:
return "conflicted";
- case ignored:
+ case StatusKind.ignored:
return "ignored";
- case incomplete:
+ case StatusKind.incomplete:
return "incomplete";
- case external:
+ case StatusKind.external:
return "external";
- case unversioned:
+ case StatusKind.unversioned:
default:
return "unversioned";
}
kaffe.patch -p0
kaffe-cast.patch -p0
jikes_compile_1.patch -p0
jikes_compile_2.patch -p0
repos-templates.patch -p0
svnshell.patch -p0
rpath.patch -p0
r11771.patch -p0
swig-version.patch -p0
swig-noruntime.patch -p0
swig-py-lock.patch
