Sign in Join

Live chat for Free Pascal, Lazarus, Delphi and every Pascal programmer.

Mailing lists / lazarus / 2010-09

Build Profiles revisited

2 messages · 2 people ·

Reply by email Subscribe to this list Your subscription

Read-only archive. Use j and k to move between messages.

Juha Manninen gmail

Hi

there was a mention of my old (last year December) patch for Lazarus Configure Build dialog. The Mantis issue was:
#15336: "Build Profiles for Configure "Build Lazarus" dialog"

I have now "rebased" it to apply to latest trunk. The process was rather difficult. I first applied it to the original revision but even that created conflicts. I don't know exactly why. After solving the conflicts I tried to "rebase" against the trunk HEAD and got a lot more conflicts. I solved them, preserving changes made in trunk including the new UpdateRevisionInc feature.

I used git. I will not create new SVN format patches now, it seems to be prone to error when there are many modified and added files. Instead I can create git format patches (pity they are not compatible). I also published the "buildprofiles" branch under my GitHub repository, forked from Graeme's mirror repository. Graeme used the master branch in a "wrong" way and thus buildprofiles seems to have many commits although it only has few of them.

To test it:
$ git clone git://github.com/JuhaManninen/lazarus.git lazarus_gitmirror
$ cd lazarus_gitmirror
$ git checkout buildprofiles
$ make all

Later I will rebase the branch often to keep it in sync with trunk HEAD. Git makes that very easy.

Juha

Reply by email

Graeme Geldenhuys
to Juha Manninen gmail
Juha Manninen wrote
from Graeme's mirror repository. Graeme used the master branch in a "wrong" way and thus buildprofiles seems to have many commits although it only has few

I think I figured out how to fix the master branch in Lazarus GitHub mirror. I'll do that on Monday when I'm as a extra note, the FPC git mirror doesn't have this problem, only the Lazarus mirror.

Regards, ? - Graeme - _______________________________________________ fpGUI - a cross-platform Free Pascal GUI toolkit http://opensoft.homeip.net/fpgui/

Reply by email