On Wed, 19 Oct 2005, Philip Martin wrote:
> Mark Phippard <markp@softlanding.com> writes:
>
> > David Anderson <david.anderson@calixo.net> wrote on 10/19/2005 12:15:43
> > PM:
> >
> >> The one which remains now, is the support of the ASP_DOT_NET_HACK in the
> >> JavaHL bindings. It seems that I can't find a JavaHL developer to do
> >> this so that we can go ahead and cut the RC.
> >>
> > Other than that the code is written in C++ I do not think there is
> > anything overly difficult about maintaining the JavaHL bindings. I
> > imagine that most Subversion developers could handle making small changes.
> > I do not even really know C and I have been able to make small changes.
> > In this case, the function has to be called at initialization and looking
> > at the code it is not completely obvious to me where you would do this. So
> > I did not attempt it.
>
> I don't do Java at all. However JNIUtil::JNIInit(JNIEnv *env) appears
> to be the only place that calls apr_initialize, so here's a completely
> untested patch (I haven't even compiled it):
>
> Index: java/javahl/native/JNIUtil.cpp
> ===================================================================
> --- java/javahl/native/JNIUtil.cpp (revision 16820)
> +++ java/javahl/native/JNIUtil.cpp (working copy)
> @@ -28,6 +28,7 @@
>
> #include "svn_pools.h"
> #include "svn_config.h"
> +#include "svn_wc.h"
> #include "svn_path.h"
> #include <apr_file_info.h>
> #include "svn_private_config.h"
> @@ -177,6 +178,20 @@
> unsigned int inwords, outbytes, outlength;
>
> apr_pool_create (&pool, 0);
> + if (getenv ("SVN_ASP_DOT_NET_HACK"))
> + {
> + svn_error_t *err = svn_wc_set_adm_dir ("_svn", pool);
> + if (err)
> + {
> + svn_error_clear(err);
> + if (stderr)
> + fprintf(stderr,
> + "%s: error: SVN_ASP_DOT_NET_HACK failed\n",
> + "svnjavahl");
> + return FALSE;
> + }
> + }
> +
> /* get dll name - our locale info will be in '../share/locale' */
> inwords = sizeof (ucs2_path) / sizeof(ucs2_path[0]);
> HINSTANCE moduleHandle = GetModuleHandle("libsvnjavahl-1");
Invocatin of this code is gated by a ENABLE_NLS macro (which isn't what we
want). I'm working on this.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 19 19:57:02 2005