Re: [LyX/master] Update layouts (run layout2layout.py)
On Mon, Oct 25, 2021 at 06:48:18PM +0100, José Abílio Matos wrote: > On Monday, 25 October 2021 17.14.36 WEST Scott Kostyshak wrote: > > Update layouts (run layout2layout.py) > > > > There is nothing in the diff besides the format number changing from > > 93 to 95. From what I understand, this is as expected since 93 -> 94 > > and 94 -> 95 just add new layout tags. > > > > Updating the layouts makes it easier to test master. Otherwise, in > > some use cases layout2layout can be run hundreds of times which can > > make some things slow (e.g., opening documents or even opening the > > advanced find pane). > > FWIW maybe it could help if this was part of the standard process of layout > format updates. > > If problems occur that is the reason why we have git for. :-) > > Not only that but the person that commits the change is the one that has the > best idea of how the update is supposed to go on. > > What do you think? That would be nice. I think that we could probably make the current code more efficient (I think we rerun layout2layout in some places where probably we can cache the result). But the main benefit is the one you mention that the dev who updates the format knows best what the diff should look like. I think we recommend something similar for updating the LyX file format (e.g., Development.lyx, Section 2.2). Scott signature.asc Description: PGP signature -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Update layouts (run layout2layout.py)
On Monday, 25 October 2021 17.14.36 WEST Scott Kostyshak wrote: > Update layouts (run layout2layout.py) > > There is nothing in the diff besides the format number changing from > 93 to 95. From what I understand, this is as expected since 93 -> 94 > and 94 -> 95 just add new layout tags. > > Updating the layouts makes it easier to test master. Otherwise, in > some use cases layout2layout can be run hundreds of times which can > make some things slow (e.g., opening documents or even opening the > advanced find pane). FWIW maybe it could help if this was part of the standard process of layout format updates. If problems occur that is the reason why we have git for. :-) Not only that but the person that commits the change is the one that has the best idea of how the update is supposed to go on. What do you think? -- José Abílio -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am 25.10.2021 um 17:19 schrieb Kornel Benko :
>
> Am Mon, 25 Oct 2021 16:52:32 +0200
> schrieb Stephan Witt :
> ...
>>> Does removing line src/tex2lyx/test/CMakeLists.txt:91 help?
>>> DEPENDS ${_tex2lyx} ${_lyx}
>>>
>>> If that is the case we have to figure out how to allow this dependency.
>>
>> Ummhh…
>>
>> $ time cmake ...
>> real 6m31.442s
>> user 1m24.341s
>> sys 0m21.489s
>>
>> This is a real fast system. But it’s horrible slow.
>
> You are configuring with '-DLYX_ENABLE_EXPORT_TESTS:BOOL=ON' probably. The
> creating of
> 7000 export tests makes it slow.
>
>> The change to cure the error above is to delete (or comment) lines 94 and 95:
>>
>> updatetex2lyxtests DEPENDS Tex2lyxFilesUpdated
>>
>> But the build fails with the errors in attached log.
>>
>> Stephan
>>
>> [xcode-cmake-build.log application/octet-stream (42288 Bytes)]
>
> Could you check the difference in the clang-command line (automake vs cmake
> created
> commands)?
> Maybe difference in include paths. How else can be explained for instance
>
>
> In file included
> from /Users/lyx/Development/lyx/src/frontends/WorkAreaManager.cpp:16:
> In file
> included
> from /Users/lyx/Development/lyx/src/frontends/Application.h:17:
> /Users/lyx/Development/lyx/src/support/strfwd.h:56:28:
> error: reference to 'char_traits' is ambiguous typedef
> basic_string char_traits, allocator > string;
> ^ /Users/lyx/Development/lyx/src/support/strfwd.h:49:32: note:
> candidate found by
> name lookup is 'std::char_traits' template struct
> char_traits;
working:
c++ -stdlib=libc++ -DHAVE_CONFIG_H -I.
-I/Users/lyx/Development/lyx/src/frontends -I../.. -Wall -Wextra
-I/Users/lyx/Development/lyx/src/frontends/..
-I/Users/lyx/Development/lyx/3rdparty/boost
-I/Users/lyx/Development/lyx/3rdparty/nod -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk
-arch arm64 -mmacosx-version-min=10.14 -fPIC -Os -std=c++17
-Wno-deprecated-register -std=c++17 -std=c++17 -MT WorkAreaManager.o -MD -MP
-MF $depbase.Tpo -c -o WorkAreaManager.o
/Users/lyx/Development/lyx/src/frontends/WorkAreaManager.cpp
vs. broken:
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
-x c++ -target x86_64-apple-macos11.1 -fmessage-length\=0
-fdiagnostics-show-note-include-stack -fmacro-backtrace-limit\=0 -Wno-trigraphs
-fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes
-Wno-return-type -Wno-non-virtual-dtor -Wno-overloaded-virtual
-Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch
-Wno-unused-function -Wno-unused-label -Wno-unused-parameter
-Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized
-Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion
-Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion
-Wno-enum-conversion -Wno-float-conversion -Wno-non-literal-null-conversion
-Wno-objc-literal-conversion -Wno-shorten-64-to-32 -Wno-newline-eof
-Wno-c++11-extensions -DCMAKE_INTDIR\=\"Debug\"
-DBOOST_USER_CONFIG\=\ -isysroot
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk
-fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -g
-Wno-sign-conversion -Wno-infinite-recursion -Wno-move -Wno-comma
-Wno-block-capture-autoreleasing -Wno-strict-prototypes
-Wno-range-loop-analysis -Wno-semicolon-before-method-body
-I/Users/lyx/Development/lyx-build/cmake/2.4.0dev/lib/Debug/include
-I/Users/lyx/Development/lyx-build/cmake/2.4.0dev
-I/Users/lyx/Development/lyx/src -I/Users/Shared/LyX/utilities/include
-I/Users/lyx/Development/lyx/3rdparty/boost
-I/Users/lyx/Development/lyx/3rdparty/nod
-I/Users/lyx/Development/lyx/src/frontends
-I/Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/frontends/LyX.build/Debug/frontends.build/DerivedSources-normal/x86_64
-I/Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/frontends/LyX.build/Debug/frontends.build/DerivedSources/x86_64
-I/Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/frontends/LyX.build/Debug/frontends.build/DerivedSources
-F/Users/lyx/Development/lyx-build/cmake/2.4.0dev/lib/Debug -Wall -Wextra
--std\=c++17 -Wno-deprecated-register -DENABLE_ASSERTIONS\=1
-fno-strict-aliasing -D_DEBUG -std\=c++17 -MMD -MT dependencies -MF
/Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/frontends/LyX.build/Debug/frontends.build/Objects-normal/x86_64/WorkAreaManager.d
--serialize-diagnostics
/Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/frontends/LyX.build/Debug/frontends.build/Objects-normal/x86_64/WorkAreaManager.dia
-c /Users/lyx/Development/lyx/src/frontends/WorkAreaManager.cpp -o
/Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/frontends/LyX.build/Debug/frontends.build/Objects-normal/x86_64/WorkAreaManager.o
$ c++ -v
Apple clang version 12.0.0 (clang-1200.0.32.29)
Target:
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am Mon, 25 Oct 2021 16:52:32 +0200
schrieb Stephan Witt :
...
> > Does removing line src/tex2lyx/test/CMakeLists.txt:91 help?
> > DEPENDS ${_tex2lyx} ${_lyx}
> >
> > If that is the case we have to figure out how to allow this dependency.
>
> Ummhh…
>
> $ time cmake ...
> real 6m31.442s
> user 1m24.341s
> sys 0m21.489s
>
> This is a real fast system. But it’s horrible slow.
You are configuring with '-DLYX_ENABLE_EXPORT_TESTS:BOOL=ON' probably. The
creating of
7000 export tests makes it slow.
> The change to cure the error above is to delete (or comment) lines 94 and 95:
>
> updatetex2lyxtests DEPENDS Tex2lyxFilesUpdated
>
> But the build fails with the errors in attached log.
>
> Stephan
>
> [xcode-cmake-build.log application/octet-stream (42288 Bytes)]
Could you check the difference in the clang-command line (automake vs cmake
created
commands)?
Maybe difference in include paths. How else can be explained for instance
In file included
from /Users/lyx/Development/lyx/src/frontends/WorkAreaManager.cpp:16:
In file
included
from /Users/lyx/Development/lyx/src/frontends/Application.h:17:
/Users/lyx/Development/lyx/src/support/strfwd.h:56:28:
error: reference to 'char_traits' is ambiguous typedef
basic_string, allocator > string;
^ /Users/lyx/Development/lyx/src/support/strfwd.h:49:32: note:
candidate found by
name lookup is 'std::char_traits' template struct
char_traits;
?
Kornel
pgpscJYimyLIw.pgp
Description: Digitale Signatur von OpenPGP
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am 25.10.2021 um 13:04 schrieb Kornel Benko :
>
> Am Mon, 25 Oct 2021 12:13:49 +0200
> schrieb Stephan Witt :
>
>> Am 25.10.2021 um 11:23 schrieb Kornel Benko :
>>>
>>> Am Mon, 25 Oct 2021 10:34:00 +0200
>>> schrieb Stephan Witt :
>>>
Am 25.10.2021 um 10:30 schrieb Kornel Benko :
>
> Am Sun, 24 Oct 2021 21:19:37 +0200 (CEST)
> schrieb Stephan Witt :
>
>> commit aabe9e8b11b73d57d22893f5889ebee9dd97efe5
>> Author: Stephan Witt
>> Date: Sun Oct 24 21:41:11 2021 +0200
>>
>> Improved Qt framework configuration detection on macOS, add support for
>> Qt6
>
> Nothing needed for cmake?
I’ll check. That’s not my priority - I don’t know how to build a package
for LyX with
cmake.
BR, Stephan
>>>
>>> It should work with
>>> $ cmake -DLYX_CPACK:BOOL=ON ...
>>> There should be created a new target 'package'.
>>>
>>> For example under debian-linux one could use
>>> $ cmake -DLYX_CPACK:BOOL=ON -DCPACK_BINARY_DEB:BOOL=ON
>>> $ make package
>>
>> Yes, that’s the theory.
>>
>> In practice it never worked on Mac. I’m using cmake to generate a Xcode
>> project to
>> debug the LyX code.
>>
>> ATM it doesn’t work on the new Mac server I’m using. The error message is as
>> follows:
>> ===
>> CMake Error in src/tex2lyx/CMakeLists.txt:
>> The custom command generating
>>
>>
>> /Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/tex2lyx/test/Tex2lyxFilesUpdated
>>
>> is attached to multiple targets:
>>
>>cleanupdatetex2lyxtests
>>updatetex2lyxtests
>>
>> but none of these is a common dependency of the other(s). This is not
>> allowed by the Xcode "new build system“.
>> ===
>>
>> This error message is presented for every CMakeLists.txt file in LyX’s tree.
>>
>> Stephan
>
> Does removing line src/tex2lyx/test/CMakeLists.txt:91 help?
> DEPENDS ${_tex2lyx} ${_lyx}
>
> If that is the case we have to figure out how to allow this dependency.
Ummhh…
$ time cmake ...
real6m31.442s
user1m24.341s
sys 0m21.489s
This is a real fast system. But it’s horrible slow.
The change to cure the error above is to delete (or comment) lines 94 and 95:
updatetex2lyxtests DEPENDS Tex2lyxFilesUpdated
But the build fails with the errors in attached log.
Stephan
xcode-cmake-build.log
Description: Binary data
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am Mon, 25 Oct 2021 12:13:49 +0200
schrieb Stephan Witt :
> Am 25.10.2021 um 11:23 schrieb Kornel Benko :
> >
> > Am Mon, 25 Oct 2021 10:34:00 +0200
> > schrieb Stephan Witt :
> >
> >> Am 25.10.2021 um 10:30 schrieb Kornel Benko :
> >>>
> >>> Am Sun, 24 Oct 2021 21:19:37 +0200 (CEST)
> >>> schrieb Stephan Witt :
> >>>
> commit aabe9e8b11b73d57d22893f5889ebee9dd97efe5
> Author: Stephan Witt
> Date: Sun Oct 24 21:41:11 2021 +0200
>
> Improved Qt framework configuration detection on macOS, add support
> for Qt6
> >>>
> >>> Nothing needed for cmake?
> >>
> >> I’ll check. That’s not my priority - I don’t know how to build a package
> >> for LyX with
> >> cmake.
> >>
> >> BR, Stephan
> >
> > It should work with
> > $ cmake -DLYX_CPACK:BOOL=ON ...
> > There should be created a new target 'package'.
> >
> > For example under debian-linux one could use
> > $ cmake -DLYX_CPACK:BOOL=ON -DCPACK_BINARY_DEB:BOOL=ON
> > $ make package
>
> Yes, that’s the theory.
>
> In practice it never worked on Mac. I’m using cmake to generate a Xcode
> project to
> debug the LyX code.
>
> ATM it doesn’t work on the new Mac server I’m using. The error message is as
> follows:
> ===
> CMake Error in src/tex2lyx/CMakeLists.txt:
> The custom command generating
>
>
> /Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/tex2lyx/test/Tex2lyxFilesUpdated
>
> is attached to multiple targets:
>
> cleanupdatetex2lyxtests
> updatetex2lyxtests
>
> but none of these is a common dependency of the other(s). This is not
> allowed by the Xcode "new build system“.
> ===
>
> This error message is presented for every CMakeLists.txt file in LyX’s tree.
>
> Stephan
Does removing line src/tex2lyx/test/CMakeLists.txt:91 help?
DEPENDS ${_tex2lyx} ${_lyx}
If that is the case we have to figure out how to allow this dependency.
Kornel
pgp6z2cIpmXJd.pgp
Description: Digitale Signatur von OpenPGP
--
lyx-devel mailing list
lyx-devel@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am 25.10.2021 um 11:23 schrieb Kornel Benko : > > Am Mon, 25 Oct 2021 10:34:00 +0200 > schrieb Stephan Witt : > >> Am 25.10.2021 um 10:30 schrieb Kornel Benko : >>> >>> Am Sun, 24 Oct 2021 21:19:37 +0200 (CEST) >>> schrieb Stephan Witt : >>> commit aabe9e8b11b73d57d22893f5889ebee9dd97efe5 Author: Stephan Witt Date: Sun Oct 24 21:41:11 2021 +0200 Improved Qt framework configuration detection on macOS, add support for Qt6 >>> >>> Nothing needed for cmake? >> >> I’ll check. That’s not my priority - I don’t know how to build a package for >> LyX with >> cmake. >> >> BR, Stephan > > It should work with > $ cmake -DLYX_CPACK:BOOL=ON ... > There should be created a new target 'package'. > > For example under debian-linux one could use > $ cmake -DLYX_CPACK:BOOL=ON -DCPACK_BINARY_DEB:BOOL=ON > $ make package Yes, that’s the theory. In practice it never worked on Mac. I’m using cmake to generate a Xcode project to debug the LyX code. ATM it doesn’t work on the new Mac server I’m using. The error message is as follows: === CMake Error in src/tex2lyx/CMakeLists.txt: The custom command generating /Users/lyx/Development/lyx-build/cmake/2.4.0dev/src/tex2lyx/test/Tex2lyxFilesUpdated is attached to multiple targets: cleanupdatetex2lyxtests updatetex2lyxtests but none of these is a common dependency of the other(s). This is not allowed by the Xcode "new build system“. === This error message is presented for every CMakeLists.txt file in LyX’s tree. Stephan -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am Mon, 25 Oct 2021 10:34:00 +0200 schrieb Stephan Witt : > Am 25.10.2021 um 10:30 schrieb Kornel Benko : > > > > Am Sun, 24 Oct 2021 21:19:37 +0200 (CEST) > > schrieb Stephan Witt : > > > >> commit aabe9e8b11b73d57d22893f5889ebee9dd97efe5 > >> Author: Stephan Witt > >> Date: Sun Oct 24 21:41:11 2021 +0200 > >> > >>Improved Qt framework configuration detection on macOS, add support for > >> Qt6 > > > > Nothing needed for cmake? > > I’ll check. That’s not my priority - I don’t know how to build a package for > LyX with > cmake. > > BR, Stephan It should work with $ cmake -DLYX_CPACK:BOOL=ON ... There should be created a new target 'package'. For example under debian-linux one could use $ cmake -DLYX_CPACK:BOOL=ON -DCPACK_BINARY_DEB:BOOL=ON $ make package Kornel pgp_g2FR2lDZV.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am 25.10.2021 um 10:30 schrieb Kornel Benko : > > Am Sun, 24 Oct 2021 21:19:37 +0200 (CEST) > schrieb Stephan Witt : > >> commit aabe9e8b11b73d57d22893f5889ebee9dd97efe5 >> Author: Stephan Witt >> Date: Sun Oct 24 21:41:11 2021 +0200 >> >>Improved Qt framework configuration detection on macOS, add support for >> Qt6 > > Nothing needed for cmake? I’ll check. That’s not my priority - I don’t know how to build a package for LyX with cmake. BR, Stephan -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
Re: [LyX/master] Improved Qt framework configuration detection on macOS, add support for Qt6
Am Sun, 24 Oct 2021 21:19:37 +0200 (CEST) schrieb Stephan Witt : > commit aabe9e8b11b73d57d22893f5889ebee9dd97efe5 > Author: Stephan Witt > Date: Sun Oct 24 21:41:11 2021 +0200 > > Improved Qt framework configuration detection on macOS, add support for > Qt6 Nothing needed for cmake? Kornel pgpVMcqEvPRA0.pgp Description: Digitale Signatur von OpenPGP -- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
