I've talked about a small patch for this exact issue of course.
SY, Alexey
2006/9/7, Alexey Varlamov <[EMAIL PROTECTED]>:
Alexey,
This conflict is trivial enough and was caused by recent Geir's
changes, see the parallel thread about launcher.
I don't think we need to redone the whole patch for this issue -
either commiter will resolve it by hand or minor patch for this
particular change can be made anew.
--
Regards,
Alexey
2006/9/7, Alexey Petrenko <[EMAIL PROTECTED]>:
> Guys,
>
> I've tried a patch.
> Patch failed in ./vm/em/src/DrlEMImpl.cpp. On Linux and Windows.
> Here is a rej file:
> === cut ===
> ***************
> *** 151,165 ****
> //_____________________________________________________________________
> // Reading and parsing configuration
>
>
> - std::string buildDefaultLibPath(const std::string& dll_name) {
> - std::string library_path =
vm_get_property_value("vm.boot.library.path");
> #ifdef PLATFORM_NT
> - std::string fullPath = library_path + "\\"+ dll_name+".dll";
> - #else
> - std::string fullPath = library_path + "/lib" + dll_name + ".so";
> #endif
> - return fullPath;
> }
>
> static std::string getParam(const std::string& config, const
> std::string& name) {
> --- 167,198 ----
> //_____________________________________________________________________
> // Reading and parsing configuration
>
> + static bool endsWith(const std::string& str, const std::string& suffix) {
> + if (str.length() < suffix.length()) {
> + return false;
> + }
> + return std::equal(suffix.rbegin(), suffix.rend(), str.rbegin());
> + }
>
> + std::string prepareLibPath(const std::string& origPath) {
> #ifdef PLATFORM_NT
> + std::string separator("\\"), libPrefix(""), libSuffix(".dll");
> + #else
> + std::string separator("/"), libPrefix("lib"), libSuffix(".so");
> #endif
> +
> + std::string path = origPath;
> + if (path.find('/') == path.npos && path.find('\\') == path.npos ) {
> + std::string dir = vm_get_property_value("vm.boot.library.path");
> + if (libPrefix.length() > 0 && !startsWith(path, libPrefix)) {
> + path = libPrefix + path;
> + }
> + path = dir + separator + path;
> + }
> + if (!endsWith(path, libSuffix)) {
> + path+=libSuffix;
> + }
> + return path;
> }
>
> static std::string getParam(const std::string& config, const
> std::string& name) {
> === cut ===
>
> As a result build fails.
>
> Salikh, it seems that you need to provide additional patch.
>
> SY, Alexey
>
> 2006/9/7, Alexey Varlamov <[EMAIL PROTECTED]>:
> > +1
> >
> > 2006/9/7, Geir Magnusson Jr. <[EMAIL PROTECTED]>:
> > > +1
> > >
> > > Geir Magnusson Jr. wrote:
> > > > All is in order and in SVN for Harmony-1225 wrt BCC and ACQ. I think
> > > > that this an important patch so we can get better 1.5 support et al.
> > > >
> > > > Please vote to accept or reject this set of patches and fixes into the
> > > > Apache Harmony class library :
> > > >
> > > > [ ] + 1 Accept
> > > > [ ] -1 Reject (provide reason below)
> > > >
> > > > Lets let this run a minimum of 3 days unless a) someone states they need
> > > > more time or b) we get all committer votes before then.
> > > >
> > > > geir
> > > >
> > > >
> > > >
> > > >
> > > > ---------------------------------------------------------------------
> > > > Terms of use : http://incubator.apache.org/harmony/mailing.html
> > > > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > > > For additional commands, e-mail: [EMAIL PROTECTED]
> > > >
> > >
> > > ---------------------------------------------------------------------
> > > Terms of use : http://incubator.apache.org/harmony/mailing.html
> > > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > > For additional commands, e-mail: [EMAIL PROTECTED]
> > >
> > >
> >
> > ---------------------------------------------------------------------
> > Terms of use : http://incubator.apache.org/harmony/mailing.html
> > To unsubscribe, e-mail: [EMAIL PROTECTED]
> > For additional commands, e-mail: [EMAIL PROTECTED]
> >
> >
>
>
> --
> Alexey A. Petrenko
> Intel Middleware Products Division
>
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: [EMAIL PROTECTED]
> For additional commands, e-mail: [EMAIL PROTECTED]
>
>
---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
--
Alexey A. Petrenko
Intel Middleware Products Division
---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
