Recent

Author Topic: 3.0.x merge activity  (Read 3782 times)

marcov

  • Global Moderator
  • Hero Member
  • *****
  • Posts: 7434
3.0.x merge activity
« on: June 18, 2015, 09:53:59 am »
Over the last 2-3 days, the 3.0.x branch has been synchronized with trunk. Specially database, amiga related and webdevelopment were merged to a high degree.

If you notice anything different after updating 3.0.x, don't hesitate to report it.

I hope it doesn't need extra mentioning that NOW would be an excellent time to test the 3.0 branch to see if your code behaves as you expect.

zeljko

  • Hero Member
  • *****
  • Posts: 1054
    • http://wiki.lazarus.freepascal.org/User:Zeljan
Re: 3.0.x merge activity
« Reply #1 on: June 18, 2015, 02:09:27 pm »
Have you finished bulk merging ?

marcov

  • Global Moderator
  • Hero Member
  • *****
  • Posts: 7434
Re: 3.0.x merge activity
« Reply #2 on: June 18, 2015, 02:47:00 pm »
Have you finished bulk merging ?

Yes, the really big numbers are done. I have a certain rest set ( http://www.stack.nl/~marcov/mergelogs26/restset.html ) that I will invite the other core members to have a look at.

Specially the backtrace, SEH64 and linux startup related fixes. (67 revs there, but I expect maybe 20 to be merged tops)

zeljko

  • Hero Member
  • *****
  • Posts: 1054
    • http://wiki.lazarus.freepascal.org/User:Zeljan
Re: 3.0.x merge activity
« Reply #3 on: June 18, 2015, 03:47:28 pm »
Thanks, I'll build fixes during weekend.

zeljko

  • Hero Member
  • *****
  • Posts: 1054
    • http://wiki.lazarus.freepascal.org/User:Zeljan
Re: 3.0.x merge activity
« Reply #4 on: June 20, 2015, 01:18:28 pm »
Builded 3.0.1 / lazarus trunk and my apps on linux x86_64... + cross linux 32bit,win32,win64 ... everything looks ok.

zeljko

  • Hero Member
  • *****
  • Posts: 1054
    • http://wiki.lazarus.freepascal.org/User:Zeljan
Re: 3.0.x merge activity
« Reply #5 on: June 20, 2015, 04:13:47 pm »
Actually there's error in lazarus: Unable to stream Form1:TForm1. Abstract method called.
I guess it's by recent addons to the TStream, and it's not yet fixed in lazarus.

Cyrax

  • Hero Member
  • *****
  • Posts: 755
Re: 3.0.x merge activity
« Reply #6 on: June 20, 2015, 07:09:10 pm »
Actually there's error in lazarus: Unable to stream Form1:TForm1. Abstract method called.
I guess it's by recent addons to the TStream, and it's not yet fixed in lazarus.

That error should be fixed in Lazarus trunk. I don't know if it is merged back to fixes branch.

marcov

  • Global Moderator
  • Hero Member
  • *****
  • Posts: 7434
Re: 3.0.x merge activity
« Reply #7 on: June 20, 2015, 07:33:38 pm »
There might be a workaround for 3.1.1 that now must be extended to 3.0.x too.

zeljko

  • Hero Member
  • *****
  • Posts: 1054
    • http://wiki.lazarus.freepascal.org/User:Zeljan
Re: 3.0.x merge activity
« Reply #8 on: June 20, 2015, 08:10:32 pm »
Yes, http://bugs.freepascal.org/view.php?id=27754 ... I've fixed it in my trunk copy, so probably I'll commit tomorrow.

zeljko

  • Hero Member
  • *****
  • Posts: 1054
    • http://wiki.lazarus.freepascal.org/User:Zeljan
Re: 3.0.x merge activity
« Reply #9 on: June 20, 2015, 08:12:20 pm »
That error should be fixed in Lazarus trunk. I don't know if it is merged back to fixes branch.

It is fixed but for FPC_FULL_VERSION >= 30101. Should be FPC_FULL_VERSION >= 30001. See above issue link.