Sign in Join

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

Mailing lists / lazarus / 2011-02

Conflict "Makefile.compiled" in some components packages

10 messages · 4 people · –

Reply by email Subscribe to this list Your subscription

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

Zaher Dirkey
to Mattias Gaertner

2011/2/7 Mattias Gaertner

Show quoted text 16 lines
Zaher Dirkey hat am 7. Februar 2011 um 15:20 geschrieben: I use svn update then it give me the file Makefile.compiled is conflicted. I think Makefile.compiled have to be ignored file. No. It is used. It was outdated. I updated it. Mattias

I revert this files, but when install components package this files changed after.

i do itafter i made "svn update", "Make clean bigide" in command line , then install component in IDE.

Zaher Dirkey -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110207/2f3e966c/attachment.html>

Reply by email

Mattias Gaertner
to Zaher Dirkey

?

Zaher Dirkey hat am 7. Februar 2011 um 16:04 geschrieben:

Show quoted text 33 lines
2011/2/7 Mattias Gaertner < [mailto:] > > > ? > ? > > > Zaher Dirkey < [mailto:] > hat am 7. > Februar 2011 um 15:20 geschrieben: > > > > > > > I use svn update then it give me the file Makefile.compiled is conflicted. > > I think Makefile.compiled have to be ignored file. > > No. It is used. It was outdated. I updated it. > > Mattias > > I revert this files, but when install components package this files changed after. i do itafter i made "svn update", "Make clean bigide" in command line , then install component in IDE.

What Makefile.compiled files are changed?
Maybe I forgot one.

?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110207/f19d8e62/attachment.html>

Reply by email

Zaher Dirkey
to Mattias Gaertner

2011/2/7 Mattias Gaertner

Show quoted text 38 lines
Zaher Dirkey hat am 7. Februar 2011 um 16:04 geschrieben: 2011/2/7 Mattias Gaertner Zaher Dirkey hat am 7. Februar 2011 um 15:20 geschrieben: I use svn update then it give me the file Makefile.compiled is conflicted. I think Makefile.compiled have to be ignored file. No. It is used. It was outdated. I updated it. Mattias I revert this files, but when install components package this files changed after. i do itafter i made "svn update", "Make clean bigide" in command line , then install component in IDE. What Makefile.compiled files are changed? Maybe I forgot one.

The changed file

components/fpcunit/ide/Makefile.compiled
components/memds/Makefile.compiled
components/printers/design/Makefile.compiled
components/printers/Makefile.compiled
components/projecttemplates/Makefile.compiled
components/rtticontrols/Makefile.compiled
components/sdf/Makefile.compiled
components/sqldb/Makefile.compiled
components/tachart/Makefile.compiled
components/tdbf/Makefile.compiled
components/turbopower_ipro/Makefile.compiled

I am not modified the units of this packages.

Zaher Dirkey -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110207/e74e3ebb/attachment-0001.html>

Reply by email

Maxim Ganetsky
to Zaher Dirkey

07.02.2011 23:27, Zaher Dirkey ?????:

Show quoted text 51 lines
2011/2/7 Mattias Gaertner < <mailto:>> Zaher Dirkey < <mailto:>> hat am 7. Februar 2011 um 16:04 geschrieben: > > 2011/2/7 Mattias Gaertner < > <mailto:>> > > > Zaher Dirkey < <mailto:>> > hat am 7. Februar 2011 um 15:20 geschrieben: > > >> I use svn update then it give me the file Makefile.compiled >> is conflicted. >> I think Makefile.compiled have to be ignored file. > > No. It is used. It was outdated. I updated it. > Mattias > > > I revert this files, but when install components package this > files changed after. > > i do itafter i made "svn update", "Make clean bigide" in command > line , then install component in IDE. What Makefile.compiled files are changed? Maybe I forgot one. The changed file components/fpcunit/ide/Makefile.compiled components/memds/Makefile.compiled components/printers/design/Makefile.compiled components/printers/Makefile.compiled components/projecttemplates/Makefile.compiled components/rtticontrols/Makefile.compiled components/sdf/Makefile.compiled components/sqldb/Makefile.compiled components/tachart/Makefile.compiled components/tdbf/Makefile.compiled components/turbopower_ipro/Makefile.compiled I am not modified the units of this packages.

IDE changes slashes in these files. See attachment. I think it happens if Makefile.compiled was generated and committed in Linux/Unix and then Lazarus is recompiled on Windows.

Best regards, Maxim Ganetsky mailto: -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: compiled.diff URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110208/a8beeee1/attachment.ksh>

Reply by email

Mattias Gaertner
to Maxim Ganetsky

?

Maxim Ganetsky hat am 7. Februar 2011 um 22:47 geschrieben:

[...] IDE changes slashes in these files. See attachment. I think it happens if Makefile.compiled was generated and committed in Linux/Unix and then Lazarus is recompiled on Windows.

Fixed in svn.?
Mattias
?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110208/626e380d/attachment.html>

Reply by email

Maxim Ganetsky
to Mattias Gaertner

08.02.2011 2:06, Mattias Gaertner ?????:

Show quoted text 8 lines
Maxim Ganetsky hat am 7. Februar 2011 um 22:47 geschrieben: >[...] > IDE changes slashes in these files. See attachment. I think it happens > if Makefile.compiled was generated and committed in Linux/Unix and then > Lazarus is recompiled on Windows. Fixed in svn.

Already tested. :)
Works ok, thanks.

Best regards, Maxim Ganetsky mailto:

Reply by email

Alexander Klenin
to Mattias Gaertner: ? Zaher Dirkey hat am 7. Februar 2011 um 15:20 geschrieben: No. It is used. It was…

2011/2/8 Mattias Gaertner :

Show quoted text 9 lines
Zaher Dirkey hat am 7. Februar 2011 um 15:20 geschrieben: I use svn update then it give me the file Makefile.compiled is conflicted. I think Makefile.compiled have to be ignored file. No. It is used. It was outdated. I updated it.

Can you elaborate? It is generally wrong to version-control auto-generated files, and I wonder what is the reason.

Alexander S. Klenin

Reply by email

Mattias Gaertner
to Alexander Klenin

?

Alexander Klenin hat am 8. Februar 2011 um 00:44 geschrieben:

Show quoted text 13 lines
2011/2/8 Mattias Gaertner : > > > Zaher Dirkey hat am 7. Februar 2011 um 15:20 > geschrieben: > > I use svn update then it give me the file Makefile.compiled is conflicted. > I think Makefile.compiled have to be ignored file. > > No. It is used. It was outdated. I updated it. Can you elaborate? It is generally wrong to version-control auto-generated files, and I wonder what is the reason.?

The files are generated by the IDE and needed by the Makefiles. The Makefiles can not auto generate them themselves.?
I guess we can disable the auto generating of Makefiles for packages in the lazarus sources. OTOH without the auto the bug would have been spotted much later - maybe too late. A wrong Makefile.compiled will result in unneeded recompiles of the binary installed lazarus.
?
Mattias
?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus.freepascal.org/pipermail/lazarus/attachments/20110208/24dd1ace/attachment.html>

Reply by email