Commit Graph

3687 Commits

Author SHA1 Message Date
Kornel Benko
d537d55b69 Cmake config: Respect the patch-level while creating package from tar/zip-source
Rename some variables to match the ones used by automake
Slightly modified patch from Eugene Chornyi <technikmagma@gmail.com>
2020-01-18 10:40:31 +01:00
Kornel Benko
a99dc05e18 Cmake tests: Make foreach() command robust
Cmake's foreach command includes forms
  foreach(<loop_var> IN LISTS <lists>)
  foreach(<loop_var> IN ITEMS <items>)
  foreach(<loop_var> RANGE ...)
We get the lines to be parsed by
  file(STRINGS "${filepath}" lines)
If in the parsed lyx-file there is a line
containing only the single word 'IN',  or 'RANGE', then
the command
  foreach(_l ${lines})
can create a syntax error (at least with cmake1.16)

In fact, in file pl_Additional.lyx:12913 happens to have
such a beast.

(cherry picked from commit 7b44280da4)
2019-12-31 11:35:54 +01:00
Kornel Benko
87672a1d07 Cmake build: Install executables as programms
Patch from Patrick (pdvisschere@edpnet.be)

(cherry picked from commit 58ed976dd3)
2019-11-27 15:11:23 +01:00
Uwe Stöhr
54acc050f6 Win installer: fix registry issue
- when installing LyX 2.3.x over a previous 2.3.x installation a registry key was not deleted
- also fix some hardcoded occurrences of "lyx"
2019-10-20 23:06:21 +02:00
Uwe Stöhr
cbaf5e70f8 development/Makefile.am: fix compilation error
see also my message on the list
2019-10-20 21:20:55 +02:00
Juergen Spitzmueller
ee1a4855ac Updated Dutch installer l7n by Niko. 2019-07-06 15:25:19 +02:00
Richard Kimberly Heck
c614d81e8d Add blank status file for easier resets. 2019-06-18 18:14:58 -04:00
Richard Kimberly Heck
64539c8e71 Notes. 2019-06-18 17:51:09 -04:00
Richard Kimberly Heck
446769203f Use data from src/lyxwinres.rc to generate lyx.coff for the Windows
build.

Ideally, this would be done by cmake itself (as it is now done by
autotools). But I do not know how to do that.
2019-06-18 17:50:19 -04:00
Kornel Benko
ac72404309 Add missing test-tool-files to the list of provided data
With this, an interested user which compiles in cmake environment,
is able to run some export tests.
2019-06-12 08:55:17 +02:00
Kornel Benko
80b3adc42a Cmake build: Removed some cmake warnings 2019-03-26 10:00:35 +01:00
Richard Kimberly Heck
7f0b0e3347 This has not been updated in my build yet.
(cherry picked from commit 95c665e607)
2019-03-25 23:00:16 -04:00
Uwe Stöhr
e5c7084a9c Win installer: fix bug on init
- also remove unused code and some updates
2019-03-26 02:34:54 +01:00
Uwe Stöhr
a96bf1ae89 installer: re-sync with master
backport all recent fixes from master
2019-03-22 01:19:48 +01:00
Kornel Benko
44c8315a7d Cmake export tests: Use pre-compiled regular expressions
Essentially ammend db5fb78c, consisting of cherry-pick 597dcbb5
(and c9e62dec, but this is not important here)
2019-02-26 11:26:20 +01:00
Stephan Witt
7dd5d6371f Add license info for inkscape start script
(cherry picked from commit a4d409b194)

Add status log for 2.3.x
2019-01-07 00:18:52 +01:00
Stephan Witt
432986e8f2 Correct converter configuration for inkscape on Mac
On Mac the inkscape binary is started by a wrapper script. This script changes the
working directory internally and fails to process files with relative path names.
The previous attempt to solve it was to pass the file names with absolute names
by prepending them with the $$p variable (representing the directory name of the files).
This broke the on screen conversion (used for SVGZ to PNG e.g. in the users guide)
because here the $$p variable is undefined.

Now the wrapper script of LyX which is used to locate the Inkscape.app bundle converts
the relative path names into absolute names and the $$p variable is removed from the
converter definitions for inkscape again.

(cherry picked from commit caa1dd2aee)
2019-01-07 00:18:52 +01:00
Kornel Benko
db5fb78cfd Cmake lyx2lyx tests: Correct use of value for \use_non_tex_fonts
Amend eec3d1eb,7568571a
We are trying to check if the resulting file after lyx2lyx
is compilable, we have to ensure that copying the original file
to the test directory does not mangle use_non_tex_fonts-entry.

(cherry picked from commit c9e62dec53)
2019-01-05 09:03:23 +01:00
Kornel Benko
410054ba5e lyx2lyx tests: Use the temp-dir also for converted lyx files
Important if including data previously copied there.
Fixes test "export/doc/Additional_lyx22"

(cherry picked from commit 7568571a24)
2019-01-04 05:26:48 +01:00
Kornel Benko
36aa0526e0 lyx2lyx tests: Copy also original lyx files to temp dir
Necessary only if the lyx-file includes some data from
a relative path, nonetheless it happens in some of our tests.
2019-01-03 08:56:29 +01:00
Kornel Benko
af7dba023b Amend 7e1ecb65, add Bibliography.lyx to the set of not tested subdocuments 2019-01-02 16:35:18 +01:00
Juergen Spitzmueller
4eab21b2bc Slightly lighter icons
All that's changed here is just the file size due to some file optimization.

Fixes: #10626
(cherry picked from commit 186597b546)
2018-12-29 09:11:15 +01:00
Richard Kimberly Heck
91078439df Fix spacing. 2018-12-15 12:45:47 -05:00
Richard Kimberly Heck
044ef5550d Need to include these in the tarball. 2018-12-10 23:36:01 -05:00
Richard Kimberly Heck
7745e8471e Remove lyx-bundle.nsi. 2018-12-10 23:36:01 -05:00
Richard Kimberly Heck
14871b8d89 File starting to document the Windows dependencies. 2018-12-09 16:11:51 -05:00
Richard Kimberly Heck
8838f7cba7 Remove unnecessary file. 2018-12-09 16:08:44 -05:00
Richard Kimberly Heck
0abdb0b192 Build 2.3.2 for Windows. 2018-12-09 15:50:19 -05:00
Richard Kimberly Heck
c528f47f2d Fix mingw build script so as not to use version number for exectuables.
(cherry picked from commit 72367d94ad)
2018-09-30 13:47:59 -04:00
Richard Kimberly Heck
2e4e32872f Update LyX packaging script. 2018-09-28 22:17:15 -04:00
Richard Kimberly Heck
0cbde8a834 Windows packaging updates.
The main change here is that we need to delete LyX2.3.exe and
tex2lyx2.3.exe from the install directory, so they are not left
there (from previous, versioned installs).
2018-09-28 21:54:11 -04:00
Richard Kimberly Heck
79c695806c No suffixes for binaries now. 2018-09-27 14:56:41 -04:00
Richard Kimberly Heck
98cfd22fb7 Fix build script for Windows: No suffixes. 2018-09-27 14:56:11 -04:00
Stephan Witt
1b55d4017b Check exit state of install_name_tool calls.
(cherry picked from commit 28b84f5ddc)
2018-09-22 20:33:55 +02:00
Richard Kimberly Heck
8a4a613222 typo 2018-09-10 19:21:14 -04:00
Richard Kimberly Heck
34929373bc Do not update MiKTeX database prior to configuration.
The user can do this kind of thing if they wish, but we should not
do it on their behalf. (These commands were also run whether MiKTeX
or TeXLive was installed.)
2018-09-09 12:33:09 -04:00
Richard Kimberly Heck
8c32a1a7b9 Kill off the bundled installer. 2018-09-08 19:10:17 -04:00
Richard Kimberly Heck
6f285ca28d Debugging, etc, for build script. 2018-09-08 14:24:49 -04:00
Richard Kimberly Heck
d2b442fb81 New version of Windows installer. 2018-09-06 13:35:43 -04:00
Richard Kimberly Heck
ca0055dbb9 Remove MiKTeX update warning and update version etc. 2018-08-30 16:08:11 -04:00
Richard Kimberly Heck
65bc3149ab Updates to cmake scripts needed to build with mingw on Fedora.
These are not really right. Things are hardcoded that probably should
not be. These are marked (hopefully) with "# RKH" comments. Possibly
what's needed is another flag? Anyway, help welcome.
2018-08-30 15:28:13 -04:00
Richard Kimberly Heck
dbbb7fbb78 Resource icons for Windows. 2018-08-30 15:17:27 -04:00
Richard Kimberly Heck
d73d467457 Packaging updates from 2.3.0. 2018-08-30 15:14:06 -04:00
Richard Kimberly Heck
0272ae778d Updates to build script. 2018-08-30 15:08:47 -04:00
Richard Kimberly Heck
01c23b3864 Fixes for the build script. 2018-08-28 15:18:53 -04:00
Richard Kimberly Heck
53bf5beae0 Prepare for 2.3.1. 2018-08-27 14:07:29 -04:00
Enrico Forestieri
e1fa3cb248 Update the server_monitor example client to Qt5
(cherry picked from commit ab72f94595)
2018-08-08 13:12:33 +02:00
Kornel Benko
889d10cda3 Cmake build: Adapt to compile with qt5.11
Since qt5_use_modules() is removed from QT5 (as spotted
by Jürgen Spitzmüller), we had to create own version
of this macro.

According to this page:
http://doc.qt.io/qt-5/cmake-manual.html
the way to replace use of qt5_use_modules() for module "_mod" and target "_target"
is to use
  1.) cmake_minimum_required(VERSION 3.1.0)
  2.) find_package(Qt5${_mod} CONFIG REQUIRED)
  3.) target_link_libraries(${_target} Qt5::${_mod})
The last one sets all reguired libraries, compile flags and needed includes for the ${_target}

Disable possible warn about not known policy

Extend Clang compiler detection to cover Apple CLang

(cherry picked from commit d6b21e20e2)
(cherry picked from commit 72a2f92239)
(cherry picked from commit 6343452a73)
(cherry picked from commit cb08d4a879)
(cherry picked from commit 1bf4d7b0fc)
2018-06-20 00:09:19 +02:00
Pavel Sanda
0eccf87797 lyx-build: check sig in case one really uses download instead of local tarball. 2018-06-19 23:58:19 +02:00
Richard Heck
bcb002039b Merge branch '2.3.2-staging' into 2.3.x 2018-04-14 23:52:31 -04:00