Commit Graph

12 Commits (d491bb431a2c74dade6c2895f3b23106e66d74b1)

Author SHA1 Message Date
ArkadiuszMichalski 46ce9c31df [MinGW] Restore the original Scintilla makefile
For the sake of maintenance of Scintilla (future update), we try to not modify Scintilla project, or at least minimize its modification.
Hence the compiling boost part is shifted to Notepad++ project.

Fix #11014, close #11485
2022-04-09 17:39:21 +02:00
ArkadiuszMichalski 44bcf1cff6 [MinGW] Place the Scintilla build intermediate files separate from the source files
1. Scintilla and Lexilla intermediate files are created in the same folder as NPP build file (`bin.i686.build` or `bin.x86_64.build`), but in subfolder `_lexilla.build` and `_scintilla.build`. I added `_` char at the beginning so these folders are always at the beginning. If you prefer a different name or location it can be change.
2. Stop build and dispaly error message when someone run "outside build" (use `-f` option) and source path has any spaces. It won't work anyway, so it's worth stopping the process and give a clear message.
3. Add new phony target `sciclean` and `lexclean` for deleting Scintilla or Lexilla intermediate files separately.
4. Change `_` to `|` for temporary replacement of space characters when detect proper shell. Char `_` is allowed in paths and should not be used for that purpose.
5. Add one more condition for `MAKELEVEL` variable to prevent unnecessary second calls to Scintilla and Lexilla makefile.
6. Update also `nppSpecifics_mingw.mak` file to works with above change.

Now we don't have to remember to clean up the previous files when we switch to different compiler (32-bit or 64-bit) or when we generate a debug version.

Fix 10991, close #11450
2022-04-06 01:16:11 +02:00
Christian Grasser a61b03ea88 Update Scintilla from v4.4.6 to v5.2.1 and add Lexilla v5.1.5
Update with https://www.scintilla.org/scintilla521.zip
            https://www.scintilla.org/lexilla515.zip

- fix setting to bring Scintilla::PositionCR from ScintillaStructures.h inline with Sci_Position.h Sci_PositionCR
- add workaround to enable lexer for searchResult
commented out SCI_SETILEXER call on searchResult to get one result which is correctly handled by the lexer,
added comment about the current problem with property @MarkingsStruct which seems to disappear after call to SCI_SETILEXER or CreateLexer
- corrected usage of ObjC lexer
- removed unnecessary filter stuff
- use own sections for scintilla and lexilla build targets and allow parallel builds
- as libscilex is no longer existing, changed to libscintilla
- adapt makefiles and cmake
- use VS2019
- started simple changes for createlexer adaptations, nullpointercheck missing on return of lexer name from deprecated LexerNameFromID -> undefined behaviour
- movement from id -> lexer name, mostly done via LexerNameFromID + switching off corresponding compiler warning
- changed to SCI_SETILEXER from SCI_SETLEXER, SCI_SETLEXERLANGUAGE needs to be corrected, see Scintilla5Migration.html
- just commented out: SCI_LOADLEXERLIBRARY

Fix #10504, close #11419
2022-03-27 17:12:53 +02:00
Christian Grasser 556fe39cb6 Update boost regexp from v1.76 to v1.78
Update boost regexp to version 1.78.0 from:
https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.7z

Close #10912
2021-12-15 10:57:45 +01:00
Ivan Ustûžanin d11d2c7f23 gcc: fix warnings during Scintilla build
Fixed warnings generated during Scintilla build in `boostregex/BoostRegExSearch.cxx`
(`-Wall -Wpedantic` are the default for Scintilla).

Close #10596
2021-09-27 19:31:51 +02:00
Don Ho 6844df039d Fix boost REGEX performance issue
This commit revert 86c66bba90 due to the boost REGEX performance issue.

Fix #10398, fix #10296, fix #10260, close #10403
2021-08-19 23:40:10 +02:00
mere-human 2794c927b3 Fix the warnings issue during Scintilla's compiling
Remove std::iterator from Boost Regex search code:
std::iterator was deprecated in C++17.
Remove it to fix the warnings and avoid other issues.

Fix #10035, close #10036
2021-07-07 14:44:34 +02:00
Don Ho 7d65bb9503 Use toolkits v141 still for a while 2021-06-25 15:56:08 +02:00
Christian Grasser 2e0d358cdc Adapt for VS2019 builds with toolkit v142
Fix #9922, close #9942
2021-06-25 15:26:27 +02:00
Christian Grasser 5b86023d3a Fix auto-completion performance issue introduced with switch to static linkage of libSciLexer
The performance issue, which appears after switching to static linkage of libSciLexer, is due to th commit "Improve character case handling in RegEx" (#9707).
Removing "locale" call from "BoostRegexSearch::FindText()" solves auto-completion performance issue.

Fix #9975, close #10010
2021-06-15 13:28:42 +02:00
Christian Grasser fd81dab21a Update Build.md
- update with official release of boost 1.76
- changed BUILD.md for the new scilexer build via VS solution

Close #9778
2021-04-21 01:19:58 +02:00
Christian Grasser ab58c8ee3e One button to compile them all
1. Build Notepad++ with Scintilla static lib (libscintilla.lib) and Boost (v1.76) RegExpr.
2. ARM64 build is available.

Fix #5158, close #9594
2021-04-17 05:55:10 +02:00