Re: [Lazarus] SVN update conflicts
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 another machine is exactly what a binary distribution is about. 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. Have you looked into a Makefile.compiled file? Mattias -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 Makefile.compiled file? Yes, and obviously these have been altered by a local make or other operation. E.g. my Makefile.compiled and .fpc contains -dDoDi, so that both SVN and make are fooled when the versioned file contains different information about the compiled files. This became obvious only when SVN could not merge the local and remote versions of some of these auto-generated files. DoDi -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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, but as you know the above case does not exist for the Lazarus binaries, so I thought you were making this up. As you know the Makefile.compiled is independent of widgetset/targetos/targetcpu. How do the contributors to the repository know about *my* machine? Have you looked into a Makefile.compiled file? Yes, and obviously these have been altered by a local make or other operation. E.g. my Makefile.compiled and .fpc contains -dDoDi, so that both SVN and make are fooled when the versioned file contains different information about the compiled files. This became obvious only when SVN could not merge the local and remote versions of some of these auto-generated files. 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 manually updated by the Lazarus developers - of course via the IDE/lazbuild. Maybe some lpk files have a bug and the auto update is enabled. Or maybe you updated them by accident. The Makefiles are updated very seldom, so your update may be a year old. Which lpk was wrong? Mattias -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 manually updated by the Lazarus developers - of course via the IDE/lazbuild. Sorry, I don't know nor understand what you try to say :-( The name Makefile.compiled suggests to me that it tracks the compiler options, used in the last compile. That compile takes place at the user machine. Maybe some lpk files have a bug and the auto update is enabled. Or maybe you updated them by accident. The Makefiles are updated very seldom, so your update may be a year old. Which lpk was wrong? I don't know, I reported the conflicted files initially. In components\projecttemplates\Makefile I found: # Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/03/07] in the working base, while the working copy contains [2012/01/25] instead. The other directory, marked as modified, is components\fpcunit. No other directories flagged by TortoiseSVN, so far. I've reverted the entire components\ directory now, so that I can find out when the next modifications occur. DoDi -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 obscure. 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 the *local* machine, it doesn't make sense to import (from the repo) an Makefile.compiled from a *different* machine. Like it doesn't make sense to import the compiled (binary) files, that match the imported Makefile.compiled. What exactly makes no sense? I'm not sure about Makefile.fpc, which also is auto-created. Mattias -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 the *local* machine, it doesn't make sense to import (from the repo) an Makefile.compiled from a *different* machine. Like it doesn't make sense to import the compiled (binary) files, that match the imported Makefile.compiled. What exactly makes no sense? 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. Following your explanations, currently make is fooled whenever a Makefile.compiled is overwritten (updated) by a version from the repository. DoDi -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 compiled and knows if it needs to recompile the package. Since everything must be compiled on the *local* machine, it doesn't make sense to import (from the repo) an Makefile.compiled from a *different* machine. Like it doesn't make sense to import the compiled (binary) files, that match the imported Makefile.compiled. What exactly makes no sense? 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. And that is the purpose of the Makefile.compiled. Following your explanations, currently make is fooled whenever a Makefile.compiled is overwritten (updated) by a version from the repository. Mattias -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 something compiled on a 64 bit Linux/gtk2 machine shall be used on a 32 bit Windows machine? DoDi -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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? (using TortoiseSVN) Revert. Update. Vincent -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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? How to fix that mess? (using TortoiseSVN) Revert. Update. Thanks, that helped. Will I have to do the same in the future, before every update, or was it a glitch? What's the reason for versioning e.g. Makefile.compiled? DoDi -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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, Makefile.compiled and Makefile.fpc, in components/ and packager/ subdirectories. What's wrong? How to fix that mess? (using TortoiseSVN) Revert. Update. 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. 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. Mattias -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
Re: [Lazarus] SVN update conflicts
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 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 the *local* machine, it doesn't make sense to import (from the repo) an Makefile.compiled from a *different* machine. Like it doesn't make sense to import the compiled (binary) files, that match the imported Makefile.compiled. I'm not sure about Makefile.fpc, which also is auto-created. DoDi -- ___ Lazarus mailing list Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
[Lazarus] SVN update conflicts
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 Lazarus@lists.lazarus.freepascal.org http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
