On 15/11/08 17:50, Markus Heidelberg wrote:
> Richard Hartmann, 15.11.2008:
>>> Note that if you use any unofficial patches, you ought to set the
>>> "modified by" line accordingly. On Linux, this can be done by setting
>>> the following (in bash) or similar:
>>>
>>> export CONF_ARGS='--with-modified-by="Bill McCarthy (float)"'
>> [...]
>>
>> PS: Is it possible to make git accept the fact that a changed
>> line in five branches should be put below each other in random
>> order. That way, all patches could concat CONF_ARGS for
>> all patch branches seperately and the end result would be a
>> complete patch list. Markus, can such a thing be done?
>
> I don't think so, I think there is no way to avoid a conflict. However
> if you solve it once, it doesn't occur the next time you merge from
> these branches, only when you merge a new branch.
>
> The master branch has already set --with-modified-by to "Vim extended",
> but there is also a #define MODIFIED_BY in feature.h. What is the
> difference between these two? Is this for configurations not using
> configure and should be set, too?
>
> But I don't plan on adding modified-by for each patch branch. I don't
> want people using the git repository be plagued by avoidable merge
> conflicts which keeps them off using it.
>
> Markus
--with-modified-by (in configure) sets a #define MODIFIED_BY in
src/auto/config.h. However, even though on Unix-like systems it is
recommended to use configure, it is possible to do it all by hand and
compile Vim without it. You would then uncomment the line in feature.h.
Also, on Windows (when not generating Vim "for use only with Cygwin")
neither configure nor the top-level Makefile are used. Instead, there
are a number of makefiles in the src/ directory, one for each compiler
(including Make_cyg.mak when compiling for "native Windows" using Cygwin
gcc). These makefiles can set some options (such as featureset or which
interpreter interfaces to include) but you will probably have to set
MODIFIED_BY (if you want to use it) in feature.h in this case.
Anyway, the inclusion of patches does not free you from having to
"configure" your build: it's yours to decide whether you want a Tiny,
Small, ..., Big or Huge build, with or without which of MzScheme, Perl,
Python, Ruby and TCL, and so on. You should also set the "compiled-by"
line -- you can just as well set the "modified-by" at the same time.
Best regards,
Tony.
--
History has the relation to truth that theology has to religion --
i.e., none to speak of.
-- Lazarus Long
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_use" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---
