#9241: cmake lists are missing from the distribution

[Jean-Marc Lasgouttes]

I cannot connect to trac. Can somebody check this out?

JMarc


-------- Message d'origine --------
De : LyX Ticket Tracker <***@lyx.org>
Envoyé: 15 août 2014 18:12:32 UTC+02:00
À : ***@mareimbrium.org, ***@lyx.org
Objet : #9241: cmake lists are missing from the distribution

#9241: cmake lists are missing from the distribution
--------------------+------------------------
Reporter: kuba | Owner: lasgouttes
Type: defect | Status: new
Priority: normal | Milestone: 2.1.x
Component: build | Version: 2.1.1
Severity: normal | Keywords:
--------------------+------------------------
CMakeLists.txt are missing from the distribution archive's root folder,
necessitating a git checkout just to build using cmake :(

[Richard Heck]

I cannot connect to trac. Can somebody check this out?

Seems OK from here. Probably one of those random server freezes.

rh

JMarc
------------------------------------------------------------------------
*Envoyé:* 15 août 2014 18:12:32 UTC+02:00
*Objet :* #9241: cmake lists are missing from the distribution
#9241: cmake lists are missing from the distribution
--------------------+------------------------
Reporter: kuba | Owner: lasgouttes
Type: defect | Status: new
Priority: normal | Milestone: 2.1.x
Component: build | Version: 2.1.1
--------------------+------------------------
CMakeLists.txt are missing from the distribution archive's root folder,
necessitating a git checkout just to build using cmake :(
--
Ticket URL: <http://www.lyx.org/trac/ticket/9241>
The LyX Project <http://www.lyx.org/>
LyX -- The Document Processor
--
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la briÚveté.

[Jean-Marc Lasgouttes]

You mean that tbe tar.gz archive is ok?

JMarc

Post by Richard Heck

I cannot connect to trac. Can somebody check this out?

Seems OK from here. Probably one of those random server freezes.
rh

JMarc

------------------------------------------------------------------------

*Envoyé:* 15 août 2014 18:12:32 UTC+02:00
*Objet :* #9241: cmake lists are missing from the distribution
#9241: cmake lists are missing from the distribution
--------------------+------------------------
Reporter: kuba | Owner: lasgouttes
Type: defect | Status: new
Priority: normal | Milestone: 2.1.x
Component: build | Version: 2.1.1
--------------------+------------------------
CMakeLists.txt are missing from the distribution archive's root

folder,

necessitating a git checkout just to build using cmake :(
--
Ticket URL: <http://www.lyx.org/trac/ticket/9241>
The LyX Project <http://www.lyx.org/>
LyX -- The Document Processor
--
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la briÚveté.

[Kornel Benko]

Post by Jean-Marc Lasgouttes
#9241: cmake lists are missing from the distribution
--------------------+-------------------------
Reporter: kuba | Owner: lasgouttes
Type: defect | Status: new
Priority: normal | Milestone: 2.1.x
Component: build | Version: 2.1.1
Keywords: |
--------------------+-------------------------
* cc: kornel (added)
Is CMake officially supported yet? Either way, we might want to add a note
to INSTALL.cmake.

This patch should add missing cmake files. There are also some files which I thought
are missing in autoconf dist too.

OK to commit to trunk?

Kornel

[Pavel Sanda]

@@ -337,6 +339,7 @@ dist_examples_DATA = \
examples/sweave.lyx \
examples/tufte-book.lyx \
examples/tufte-handout.lyx \
+ examples/xyfigure.lyx \
examples/xyfigure.png \
examples/xypic.lyx
@@ -1630,6 +1633,7 @@ dist_imagesoxygen_DATA = \
images/oxygen/font-emph.png \
images/oxygen/font-noun.png \
images/oxygen/footnote-insert.png \
+ images/oxygen/iconsize.png \
images/oxygen/href-insert.png \
images/oxygen/index-insert.png \
images/oxygen/label-insert.png \
@@ -2133,6 +2137,7 @@ dist_templates_DATA = \
templates/aastex.lyx \
templates/ACM-siggraph.lyx \
templates/ACM-sigplan.lyx \
+ templates/ACM-SIGS.lyx \
templates/AEA.lyx \
templates/AGUTeX.lyx \
templates/APA.lyx \
@@ -2144,6 +2149,7 @@ dist_templates_DATA = \
templates/DocBook_article.lyx \
templates/ectaart.lyx \
templates/elsarticle.lyx \
+ templates/EPS-cropped.lyx \
templates/es_beamer-conference-ornate-20min.lyx \
templates/fr_beamer-conference-ornate-20min.lyx \
templates/frletter.lyx \
@@ -2164,6 +2170,7 @@ dist_templates_DATA = \
templates/koma-letter2.lyx \
templates/letter.lyx \
templates/lettre.lyx \
+ templates/PDF-cropped.lyx \
templates/poster-a0poster-colored.lyx \
templates/poster-a0poster-simple.lyx \
templates/poster-beamerposter.lyx \

Aren't those candidate for branch as well?

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5270ba4..b9dc70f 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -206,6 +206,7 @@ MOCHEADER = \
GuiERT.h \
GuiExternal.h \
GuiGraphics.h \
+ GuiGraphicsUi.h \
GuiHSpace.h \
GuiHyperlink.h \
GuiInclude.h \

Why is this file needed? P

[Kornel Benko]

Post by Pavel Sanda

@@ -337,6 +339,7 @@ dist_examples_DATA = \
examples/sweave.lyx \
examples/tufte-book.lyx \
examples/tufte-handout.lyx \
+ examples/xyfigure.lyx \
examples/xyfigure.png \
examples/xypic.lyx
@@ -1630,6 +1633,7 @@ dist_imagesoxygen_DATA = \
images/oxygen/font-emph.png \
images/oxygen/font-noun.png \
images/oxygen/footnote-insert.png \
+ images/oxygen/iconsize.png \
images/oxygen/href-insert.png \
images/oxygen/index-insert.png \
images/oxygen/label-insert.png \
@@ -2133,6 +2137,7 @@ dist_templates_DATA = \
templates/aastex.lyx \
templates/ACM-siggraph.lyx \
templates/ACM-sigplan.lyx \
+ templates/ACM-SIGS.lyx \
templates/AEA.lyx \
templates/AGUTeX.lyx \
templates/APA.lyx \
@@ -2144,6 +2149,7 @@ dist_templates_DATA = \
templates/DocBook_article.lyx \
templates/ectaart.lyx \
templates/elsarticle.lyx \
+ templates/EPS-cropped.lyx \
templates/es_beamer-conference-ornate-20min.lyx \
templates/fr_beamer-conference-ornate-20min.lyx \
templates/frletter.lyx \
@@ -2164,6 +2170,7 @@ dist_templates_DATA = \
templates/koma-letter2.lyx \
templates/letter.lyx \
templates/lettre.lyx \
+ templates/PDF-cropped.lyx \
templates/poster-a0poster-colored.lyx \
templates/poster-a0poster-simple.lyx \
templates/poster-beamerposter.lyx \

Aren't those candidate for branch as well?

I would say, yes.

Post by Pavel Sanda

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 5270ba4..b9dc70f 100644
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -206,6 +206,7 @@ MOCHEADER = \
GuiERT.h \
GuiExternal.h \
GuiGraphics.h \
+ GuiGraphicsUi.h \
GuiHSpace.h \
GuiHyperlink.h \
GuiInclude.h \

Why is this file needed? P

Sorry for this one. Seems, I did not check closely enough. Removed.

Kornel

[Pavel Sanda]

Post by Kornel Benko

Post by Pavel Sanda

--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -206,6 +206,7 @@ MOCHEADER = \
GuiERT.h \
GuiExternal.h \
GuiGraphics.h \
+ GuiGraphicsUi.h \
GuiHSpace.h \
GuiHyperlink.h \
GuiInclude.h \

Why is this file needed? P

Sorry for this one. Seems, I did not check closely enough. Removed.

Seems like it should be removed from the tree. P

[Jean-Marc Lasgouttes]

Would be good to compare with output of cmake's
# make package_source
with autotools
# make dist
# diff <sorted cmake files list> <sorted autotools files list>
There are some files *not* belonging (but included) to autotools.dist.
They are created while the configure script from autotools was running.
aclocal.m4
boost/Makefile.in
...

THese files are generated by autoconf and automake. They belong to the
dist since, contrary to cmake, autotolls do not require any special
program on the user side.

Others are missing in autotools.dist, like
boost/libs/signals/CMakeLists.txt
boost/libs/signals/signals.vcproj
...
MANY DIFFERENCES ... I fear, that is not done in few minutes.

What is the status now?

JMarc

[Kornel Benko]

Post by Jean-Marc Lasgouttes

Would be good to compare with output of cmake's
# make package_source
with autotools
# make dist
# diff <sorted cmake files list> <sorted autotools files list>
There are some files *not* belonging (but included) to autotools.dist.
They are created while the configure script from autotools was running.
aclocal.m4
boost/Makefile.in
...

THese files are generated by autoconf and automake. They belong to the
dist since, contrary to cmake, autotolls do not require any special
program on the user side.

I thought aclocal.m4 is created with respect to local OS, therefore it would be
different for solaris or hpux.

Post by Jean-Marc Lasgouttes

Others are missing in autotools.dist, like
boost/libs/signals/CMakeLists.txt
boost/libs/signals/signals.vcproj
...
MANY DIFFERENCES ... I fear, that is not done in few minutes.

What is the status now?

I added all missing CMakeLists.txt and \*.cmake files. Also files used to
create package (like e.g. LyX_license.txt, ...).

Someone has to try it out :(
(Probably me)

Post by Jean-Marc Lasgouttes
JMarc

Kornel

[Jean-Marc Lasgouttes]

Post by Kornel Benko

Post by Jean-Marc Lasgouttes
THese files are generated by autoconf and automake. They belong to the
dist since, contrary to cmake, autotolls do not require any special
program on the user side.

I thought aclocal.m4 is created with respect to local OS, therefore it would be
different for solaris or hpux.

No, they are jus "local" to the program being built.

JMarc

[Kornel Benko]

Post by Jean-Marc Lasgouttes

Post by Kornel Benko

Post by Jean-Marc Lasgouttes
THese files are generated by autoconf and automake. They belong to the
dist since, contrary to cmake, autotolls do not require any special
program on the user side.

I thought aclocal.m4 is created with respect to local OS, therefore it would be
different for solaris or hpux.

No, they are jus "local" to the program being built.
JMarc

OK.
I tried, and now cmake stopps at
CMake Error at development/autotests/xvkbd/CMakeLists.txt:12 (add_executable):
Cannot find source file:

xvkbd.c, findwidget.c, resources.h, XVkbd-common.h, xvkbd.xbm, iconify.xbm, xvkbd_icon.xbm, xvkbd_iconmask.xbm

So not everything is in place.

Next is missing boost sources. Cmake allows -DLYX_EXTERNAL_BOOST=OFF.

boost/libs/regex/src/static_mutex.cpp

It compiles (and creates a package) on linux with the attached patch.

Kornel

[Jean-Marc Lasgouttes]

Post by Kornel Benko
OK.
I tried, and now cmake stopps at
xvkbd.c, findwidget.c, resources.h, XVkbd-common.h, xvkbd.xbm, iconify.xbm, xvkbd_icon.xbm, xvkbd_iconmask.xbm
So not everything is in place.

Indeed.

Post by Kornel Benko
Next is missing boost sources. Cmake allows -DLYX_EXTERNAL_BOOST=OFF.
boost/libs/regex/src/static_mutex.cpp

I compile routinely with this setting, but only from git, I guess :)

Your patch looks good.

JMarc

[Kornel Benko]

Post by Jean-Marc Lasgouttes

Post by Kornel Benko
OK.
I tried, and now cmake stopps at
xvkbd.c, findwidget.c, resources.h, XVkbd-common.h, xvkbd.xbm, iconify.xbm, xvkbd_icon.xbm, xvkbd_iconmask.xbm
So not everything is in place.

Indeed.

Post by Kornel Benko
Next is missing boost sources. Cmake allows -DLYX_EXTERNAL_BOOST=OFF.
boost/libs/regex/src/static_mutex.cpp

I compile routinely with this setting, but only from git, I guess :)

As do I :)

Post by Jean-Marc Lasgouttes
Your patch looks good.

Committed.

Post by Jean-Marc Lasgouttes
JMarc

Kornel

[Pavel Sanda]

Post by Kornel Benko
OK.
I tried, and now cmake stopps at
xvkbd.c, findwidget.c, resources.h, XVkbd-common.h, xvkbd.xbm, iconify.xbm, xvkbd_icon.xbm, xvkbd_iconmask.xbm
So not everything is in place.

Does it mean that make test now tries to build or even run xvkbd stuff or you use different target? P

[Kornel Benko]

Post by Pavel Sanda

Post by Kornel Benko
OK.
I tried, and now cmake stopps at
xvkbd.c, findwidget.c, resources.h, XVkbd-common.h, xvkbd.xbm, iconify.xbm, xvkbd_icon.xbm, xvkbd_iconmask.xbm
So not everything is in place.

Does it mean that make test now tries to build or even run xvkbd stuff or you use different target? P

1.) I don't use target test, instead the command 'ctest' runs all the wanted tests.
2.) xvkbd will be built, but only all needed programs and libraries are found
3.) There are only 2 testfiles included (hello-world + first-time), so there is not much to test.
(It was not me, who included them btw)
4.) No test is automatically called.

The ready tests are mostly one of
a.) tex2lyx/*.tex (roundtrip + cmplyx) (11 + 11)
b.) check_layout/*.layout (112)
c.) url-tests (but only if selected in configuration stage: # cmake ... -DLYX_ENABLE_URLTESTS=ON ...)
d.) support/{convert,filetools,lstrings}

Do you mean, we should disable it?

Kornel

[Pavel Sanda]

Post by Kornel Benko
2.) xvkbd will be built, but only all needed programs and libraries are found
3.) There are only 2 testfiles included (hello-world + first-time), so there is not much to test.
(It was not me, who included them btw)
4.) No test is automatically called.
The ready tests are mostly one of
a.) tex2lyx/*.tex (roundtrip + cmplyx) (11 + 11)
b.) check_layout/*.layout (112)
c.) url-tests (but only if selected in configuration stage: # cmake ... -DLYX_ENABLE_URLTESTS=ON ...)
d.) support/{convert,filetools,lstrings}
Do you mean, we should disable it?

My only concern was that "make test" does not run xvkbd stuff.
But it's fine as a part of developers test target, maybe that's what you call ctest.
Pavel

[Kornel Benko]

Post by Pavel Sanda

Post by Kornel Benko
2.) xvkbd will be built, but only all needed programs and libraries are found
3.) There are only 2 testfiles included (hello-world + first-time), so there is not much to test.
(It was not me, who included them btw)
4.) No test is automatically called.
The ready tests are mostly one of
a.) tex2lyx/*.tex (roundtrip + cmplyx) (11 + 11)
b.) check_layout/*.layout (112)
c.) url-tests (but only if selected in configuration stage: # cmake ... -DLYX_ENABLE_URLTESTS=ON ...)
d.) support/{convert,filetools,lstrings}
Do you mean, we should disable it?

My only concern was that "make test" does not run xvkbd stuff.

Hm... 'make test' starts testing, but fails on all tex2lyx tests.
This is because of wrong lyx-file format, therefore not so surprising.

Post by Pavel Sanda
But it's fine as a part of developers test target, maybe that's what you call ctest.
Pavel

No, ctest is a command coming together with cmake.

Calling 'make test' is the same as calling 'ctest' without parameter.

Kornel