Re: [Lazarus] SVN update conflicts

2012-03-22 Thread Mattias Gaertner
On Thu, 22 Mar 2012 02:55:05 +0100 Hans-Peter Diettrich drdiettri...@aol.com wrote: Mattias Gaertner schrieb: The Makefile.compiled must match the last compilation on the user machine. It doesn't make sense to use one from a compilation on a different machine. Using something from

Re: [Lazarus] SVN update conflicts

2012-03-22 Thread Hans-Peter Diettrich
Mattias Gaertner schrieb: How do you suppose that something compiled on a 64 bit Linux/gtk2 machine shall be used on a 32 bit Windows machine? Via cross compiling. Please stop kidding :-( How do the contributors to the repository know about *my* machine? Have you looked into a

Re: [Lazarus] SVN update conflicts

2012-03-22 Thread Mattias Gaertner
Hans-Peter Diettrich drdiettri...@aol.com hat am 22. März 2012 um 11:47 geschrieben: Mattias Gaertner schrieb: How do you suppose that something compiled on a 64 bit Linux/gtk2 machine shall be used on a 32 bit Windows machine? Via cross compiling. Please stop kidding :-( Sorry,

Re: [Lazarus] SVN update conflicts

2012-03-22 Thread Hans-Peter Diettrich
Mattias Gaertner schrieb: As you know, the Makefile/Makefile.fpc/Makefile.compiled must be updated in sync and that it requires the newest fpc to update, because only that knows all targets. And that's why the auto update is disabled in all lpk of the Lazarus sources. The Makefiles are

Re: [Lazarus] SVN update conflicts

2012-03-21 Thread Mattias Gaertner
On Wed, 21 Mar 2012 00:52:56 +0100 Hans-Peter Diettrich drdiettri...@aol.com wrote: Mattias Gaertner schrieb: Thanks, that helped. Will I have to do the same in the future, before every update, or was it a glitch? Something changed your makefiles. I don't know what. Hmm, very

Re: [Lazarus] SVN update conflicts

2012-03-21 Thread Hans-Peter Diettrich
Mattias Gaertner schrieb: What's the reason for versioning e.g. Makefile.compiled? The Makefile.compiled is used by make to create the pkgname.compiled files. This way the IDE knows how a package was compiled and knows if it needs to recompile the package. Since everything must be compiled on

Re: [Lazarus] SVN update conflicts

2012-03-21 Thread Mattias Gaertner
On Wed, 21 Mar 2012 11:59:15 +0100 Hans-Peter Diettrich drdiettri...@aol.com wrote: Mattias Gaertner schrieb: What's the reason for versioning e.g. Makefile.compiled? The Makefile.compiled is used by make to create the pkgname.compiled files. This way the IDE knows how a package was

Re: [Lazarus] SVN update conflicts

2012-03-21 Thread Hans-Peter Diettrich
Mattias Gaertner schrieb: The Makefile.compiled must match the last compilation on the user machine. It doesn't make sense to use one from a compilation on a different machine. Using something from another machine is exactly what a binary distribution is about. How do you suppose that

Re: [Lazarus] SVN update conflicts

2012-03-20 Thread Vincent Snijders
Op 20 maart 2012 03:17 heeft Hans-Peter Diettrich drdiettri...@aol.com het volgende geschreven: Updating to rev. 36173 results in a number of conflicts in various Makefile, Makefile.compiled and Makefile.fpc, in components/ and packager/ subdirectories. What's wrong? How to fix that mess?

Re: [Lazarus] SVN update conflicts

2012-03-20 Thread Felipe Monteiro de Carvalho
Another option: 1-Remove all files with conflicts (including those .mine and .r34567 files) 2-svn up -- Felipe Monteiro de Carvalho -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org

Re: [Lazarus] SVN update conflicts

2012-03-20 Thread Hans-Peter Diettrich
Vincent Snijders schrieb: Op 20 maart 2012 03:17 heeft Hans-Peter Diettrich drdiettri...@aol.com het volgende geschreven: Updating to rev. 36173 results in a number of conflicts in various Makefile, Makefile.compiled and Makefile.fpc, in components/ and packager/ subdirectories. What's wrong?

Re: [Lazarus] SVN update conflicts

2012-03-20 Thread Mattias Gaertner
On Tue, 20 Mar 2012 11:37:49 +0100 Hans-Peter Diettrich drdiettri...@aol.com wrote: Vincent Snijders schrieb: Op 20 maart 2012 03:17 heeft Hans-Peter Diettrich drdiettri...@aol.com het volgende geschreven: Updating to rev. 36173 results in a number of conflicts in various Makefile,

Re: [Lazarus] SVN update conflicts

2012-03-20 Thread Hans-Peter Diettrich
Mattias Gaertner schrieb: Thanks, that helped. Will I have to do the same in the future, before every update, or was it a glitch? Something changed your makefiles. I don't know what. Hmm, very obscure. What's the reason for versioning e.g. Makefile.compiled? The Makefile.compiled is

[Lazarus] SVN update conflicts

2012-03-19 Thread Hans-Peter Diettrich
Updating to rev. 36173 results in a number of conflicts in various Makefile, Makefile.compiled and Makefile.fpc, in components/ and packager/ subdirectories. What's wrong? How to fix that mess? (using TortoiseSVN) DoDi -- ___ Lazarus mailing list