Jean-Marc Lasgouttes wrote:
>>>>>> "Peter" == Peter Kümmel <[EMAIL PROTECTED]> writes:
>
>>> Peter, did you ask me about it? I do not remember.
>
> Peter> Sorry, I didn't know that in the 1.4 branch the commit policy
> Peter> is diffent to trunk.
>
> Yes, I want to control everything that is happening there. I know it
> is a bit annoying, but it is the price to pay for stability.
That's a good idea, a release is not a sandbox.
> Peter> But cmake doesn't touch anything.
>
> This is why I do not ask you to revert it :) Note that, as it is, it
> is not going to be distributed anyway... (until it is added along with
> scons to development/Makefile.am). The same holds in trunk
>
> JMarc
>
>
If it is OK to you I could commit this patch:
Index: status.14x
===================================================================
--- status.14x (revision 15088)
+++ status.14x (working copy)
@@ -157,8 +157,10 @@
- A scons build system is added, for details please see INSTALL.scons.
-- LyX can be compiled with MSVC using qt3 from the Q../Free project and scons.
+- cmake build system added, for details see /development/cmake
+- LyX can be compiled with MSVC using qt3 from the Q../Free project and
scons/cmake.
+
- 'scons install' now produces a cygwin-compatible binary package under cygwin.
* Miscellaneous
Index: development/Makefile.am
===================================================================
--- development/Makefile.am (revision 15088)
+++ development/Makefile.am (working copy)
@@ -3,4 +3,4 @@
EXTRA_DIST = boostworkaround.txt ChangeLog Code_rules FORMAT \
gettext.patch lazy_lyxtext.txt lyx3 lyx.rpm.README \
lyxserver lyx.spec.in lyx.spec MacOSX OS2 Seminar.txt \
- TodoPlan-1.3 tools Win32
+ TodoPlan-1.3 tools Win32 scons cmake
And if you don't wanna ship cmake I could remove it.
I've not tested it on Linux (only the trunk version),
but I do it after sending this mail.
--
Peter Kümmel
