From 2ed6c77dfe5632880733de91ca0907428fdaa789 Mon Sep 17 00:00:00 2001 From: Christian Grasser Date: Sat, 25 May 2024 12:22:38 +0200 Subject: [PATCH] CI enhancement - update CI link from appveyor to GH action - add option to makefile build mingw build also with Clang++ instead of g++ - add option to makefile to enable clang analyzer Close #15189 --- BUILD.md | 4 +++- PowerEditor/gcc/makefile | 11 ++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/BUILD.md b/BUILD.md index e2f087053..da6f78629 100644 --- a/BUILD.md +++ b/BUILD.md @@ -52,7 +52,7 @@ uses features from Boost's `Boost.Regex` library. If you have [MinGW-w64](https://www.mingw-w64.org/) installed, you can compile Notepad++ with GCC. Otherwise MinGW-w64 can be downloaded [here](https://sourceforge.net/projects/mingw-w64/files/). You can also download some collection of tools which supports MinGW-w64, like [MSYS2](https://www.msys2.org/) or [WinLibs](https://winlibs.com/). -Building Notepad++ is regularly tested on a Windows system by using [MSYS2](https://www.msys2.org/) project. Current versions of tools used to building (such as GCC, Make or Bash) can be checked by looking at some logs from the finished building (for example in the [current-build page](https://ci.appveyor.com/project/donho/notepad-plus-plus)). Other versions may also work but are untested. +Building Notepad++ is regularly tested on a Windows system by using [MSYS2](https://www.msys2.org/) project. Current versions of tools used to building (such as GCC, Clang, Make or Bash) can be checked by looking at some logs from the finished building (for example in the [current-build page](https://github.com/notepad-plus-plus/notepad-plus-plus/actions/workflows/CI_build.yml). Other versions may also work but are untested. **Note:** Before building make sure that the system `PATH` environment variable contains `$MinGW-root$\bin` directory. Otherwise you have to set this directory yourself in Windows settings. You can also use a command like `set PATH=$MinGW-root$\bin;%PATH%` each time `cmd` is launched. But beware that if `PATH` contains several versions of MinGW-w64 GCC, only the first one will be usable. @@ -70,3 +70,5 @@ Building Notepad++ is regularly tested on a Windows system by using [MSYS2](http - To see commands being executed add `VERBOSE=1` to the same command. - When a project is built outside of the `PowerEditor/gcc` directory, for example when using `-f` option, then the entire project path must not contain any spaces. Additionally, the path to `makefile` of this project should be listed as first. - When a project is built through MinGW-w64 with multilib support, a specific target can be forced by passing `TARGET_CPU` variable with `x86_64` or `i686` as value. +- To use Clang instead of GCC for compilation provide `CXX` variable with `clang++` as value. +- To use [Clang analyzer](https://clang-analyzer.llvm.org/) together with Clang provide `CLANGANALYZE=1` to the `mingw32-make` invocation. diff --git a/PowerEditor/gcc/makefile b/PowerEditor/gcc/makefile index 31c7104f5..89628cd8f 100644 --- a/PowerEditor/gcc/makefile +++ b/PowerEditor/gcc/makefile @@ -36,7 +36,12 @@ SCINTILLA_TARGET := libscintilla.a LEXILLA_DIRECTORY := ../../lexilla LEXILLA_TARGET := liblexilla.a -CXX := $(CROSS_COMPILE)g++ +ifeq ($(CXX),clang++) + CXX := $(CROSS_COMPILE)clang++ +else + CXX := $(CROSS_COMPILE)g++ +endif + CXXFLAGS := -include $(GCC_DIRECTORY)/gcc-fixes.h -std=c++20 RC := $(CROSS_COMPILE)windres RCFLAGS := @@ -63,6 +68,10 @@ CXXFLAGS += -Og -g -Wpedantic -Wall -Wextra -Wno-cast-function-type -Wno-overloa CPP_DEFINE += DEBUG endif +ifneq "$(filter-out 0,$(CLANGANALYZE))" "" +CXXFLAGS += --analyze -Xanalyzer -analyzer-output=text +endif + # # preparations #