harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Alexey Petrenko" <alexey.a.petre...@gmail.com>
Subject Re: [vote] HARMONY-1363 - DRLVM fixes and additions
Date Thu, 07 Sep 2006 05:38:24 GMT
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 <alexey.v.varlamov@gmail.com>:
> +1
>
> 2006/9/7, Geir Magnusson Jr. <geir@pobox.com>:
> > +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: harmony-dev-unsubscribe@incubator.apache.org
> > > For additional commands, e-mail: harmony-dev-help@incubator.apache.org
> > >
> >
> > ---------------------------------------------------------------------
> > Terms of use : http://incubator.apache.org/harmony/mailing.html
> > To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> > For additional commands, e-mail: harmony-dev-help@incubator.apache.org
> >
> >
>
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>
>


-- 
Alexey A. Petrenko
Intel Middleware Products Division

---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org


Mime
View raw message