From: "cron2 (Code Review)" Date: Wed, 17 Jan 2024 14:02:45 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., heiko@...515..., openvpn-devel@lists.sourceforge.net, frank@...2641..., lstipakov@...277... Message-ID: <1e73ec5867b36565edac68efff68a77b346beb20-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="TUIyYMsThwY="; charset=UTF-8 Subject: [Openvpn-devel] [M] Change in openvpn[master]: cmake: symlink whole build dir not just .json file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: d12fk , plaisthos , flichtenheld , stipa Cc: openvpn-devel --TUIyYMsThwY= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable cron2 has uploaded a new patch set (#2) to the change originally created by= d12fk. ( http://gerrit.openvpn.net/c/openvpn/+/501?usp=3Demail ) The following approvals got outdated and were removed: Code-Review+1 by stipa, Code-Review+2 by cron2 Change subject: cmake: symlink whole build dir not just .json file ...................................................................... cmake: symlink whole build dir not just .json file It turned out that symlinking compile_commands.json from the top level source dir has some issues: * file is not created on Windows and symlinking may cause an error * some IDEs create their own json and error out b/c a file exists Since clangd also looks for the json in build/ directories by default, we now symlink the whole build directory instead, not just the json file. This approach requires for the existing build/ dir in the repo to vanish. Luckily it only contains one automake include file, which is moved to the top level source dir. Lastly, make this an opt-in feature, so that the default configuration of the buildsystem never causes a build failure because of this. Change-Id: Ib1a5c788269949d8de95d1da2cb0c32a65bf13f2 Signed-off-by: Heiko Hund Acked-by: Gert Doering Message-Id: <20240117134929.5317-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28= 061.html Signed-off-by: Gert Doering --- M .gitignore M CMakeLists.txt M Makefile.am M README.cmake.md D build/Makefile.am M configure.ac R ltrc.inc M src/openvpn/Makefile.am M src/openvpnmsica/Makefile.am M src/openvpnserv/Makefile.am M src/tapctl/Makefile.am 11 files changed, 32 insertions(+), 25 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/01/501/2 diff --git a/.gitignore b/.gitignore index 4153a3e..92d65bf 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,7 @@ m4/ltversion.m4 m4/lt~obsolete.m4 -compile_commands.json +build doc/openvpn-examples.5 doc/openvpn-examples.5.html doc/openvpn.8 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a1895a..5e07d50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,9 +43,17 @@ set(PLUGIN_DIR /usr/local/lib/openvpn/plugins CACHE FILEPATH "Location of = the plugin directory") # Create machine readable compile commands -set(CMAKE_EXPORT_COMPILE_COMMANDS 1) -file(CREATE_LINK ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json - ${CMAKE_CURRENT_SOURCE_DIR}/compile_commands.json SYMBOLI= C) +option(ENABLE_COMPILE_COMMANDS "Generate compile_commands.json and a symli= nk for clangd to find it" OFF) +if (ENABLE_COMPILE_COMMANDS) + if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/build AND NOT IS_SYMLINK ${CMAK= E_CURRENT_SOURCE_DIR}/build) + message(FATAL_ERROR "The top level source directory contains a 'bu= ild' file or directory. Please remove or rename it. CMake creates a symlink= with that name during build.") + endif() + set(CMAKE_EXPORT_COMPILE_COMMANDS 1) + add_custom_target( + symlink-build-dir ALL + ${CMAKE_COMMAND} -E create_symlink ${CMAKE_CURRENT_BINARY_DIR} ${C= MAKE_CURRENT_SOURCE_DIR}/build + ) +endif () # AddressSanitize - use CXX=3Dclang++ CC=3Dclang cmake -DCMAKE_BUILD_TYPE= =3Dasan to build with ASAN set(CMAKE_C_FLAGS_ASAN diff --git a/Makefile.am b/Makefile.am index 2305ab4..792588a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,7 @@ EXTRA_DIST =3D \ contrib \ debug \ + ltrc.inc \ CMakeLists.txt \ CMakePresets.json \ config.h.cmake.in @@ -53,7 +54,7 @@ config-version.h endif -SUBDIRS =3D build distro include src sample doc tests +SUBDIRS =3D distro include src sample doc tests dist_doc_DATA =3D \ README \ diff --git a/README.cmake.md b/README.cmake.md index d181b64..4f41c70 100644 --- a/README.cmake.md +++ b/README.cmake.md @@ -135,3 +135,17 @@ The `unix-native` CMake preset is available for these builds. This preset = does not require VCPKG and instead assumes all build-dependencies are provided = by the system natively. + +Generating compile_commands.json +-------------------------------- + +To have the CMake buildsystem generate compile_commands.json you can speci= fy +`-DENABLE_COMPILE_COMMANDS=3DON` on the command line or enable the CMake o= ption +another way you like. For supported generators the file will then be creat= ed. +Additionally, the buildsystem will create a symlink `build/` to the --pres= et +build directory that contains the generated JSON file. This is done so that +clangd is able to find it. + +Enabling this option may cause an error on Windows, since creating a symli= nk +is a privileged operation there. If you enable Developer Mode for the syst= em, +symlinks can be created by regular users. diff --git a/build/Makefile.am b/build/Makefile.am deleted file mode 100644 index e7cc4d8..0000000 --- a/build/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -# -# OpenVPN -- An application to securely tunnel IP networks -# over a single UDP port, with support for SSL/TLS-based -# session authentication and key exchange, -# packet encryption, packet authentication, and -# packet compression. -# -# Copyright (C) 2002-2023 OpenVPN Inc -# - -MAINTAINERCLEANFILES =3D \ - $(srcdir)/Makefile.in - -EXTRA_DIST =3D \ - ltrc.inc diff --git a/configure.ac b/configure.ac index 3ad9f14..14f5be4 100644 --- a/configure.ac +++ b/configure.ac @@ -1536,7 +1536,6 @@ AC_CONFIG_FILES([ Makefile - build/Makefile distro/Makefile distro/systemd/Makefile doc/Makefile diff --git a/build/ltrc.inc b/ltrc.inc similarity index 100% rename from build/ltrc.inc rename to ltrc.inc diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index b953961..1dc1dda 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -9,7 +9,7 @@ # Copyright (C) 2006-2012 Alon Bar-Lev # -include $(top_srcdir)/build/ltrc.inc +include $(top_srcdir)/ltrc.inc MAINTAINERCLEANFILES =3D \ $(srcdir)/Makefile.in diff --git a/src/openvpnmsica/Makefile.am b/src/openvpnmsica/Makefile.am index dc53f75..b10ce82 100644 --- a/src/openvpnmsica/Makefile.am +++ b/src/openvpnmsica/Makefile.am @@ -18,7 +18,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -include $(top_srcdir)/build/ltrc.inc +include $(top_srcdir)/ltrc.inc MAINTAINERCLEANFILES =3D $(srcdir)/Makefile.in diff --git a/src/openvpnserv/Makefile.am b/src/openvpnserv/Makefile.am index d8ba4eb..0c64cce 100644 --- a/src/openvpnserv/Makefile.am +++ b/src/openvpnserv/Makefile.am @@ -9,7 +9,7 @@ # Copyright (C) 2006-2012 Alon Bar-Lev # -include $(top_srcdir)/build/ltrc.inc +include $(top_srcdir)/ltrc.inc MAINTAINERCLEANFILES =3D $(srcdir)/Makefile.in diff --git a/src/tapctl/Makefile.am b/src/tapctl/Makefile.am index 69ea161..4c2958b 100644 --- a/src/tapctl/Makefile.am +++ b/src/tapctl/Makefile.am @@ -18,7 +18,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -include $(top_srcdir)/build/ltrc.inc +include $(top_srcdir)/ltrc.inc MAINTAINERCLEANFILES =3D $(srcdir)/Makefile.in -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/501?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Ib1a5c788269949d8de95d1da2cb0c32a65bf13f2 Gerrit-Change-Number: 501 Gerrit-PatchSet: 2 Gerrit-Owner: d12fk Gerrit-Reviewer: cron2 Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-Reviewer: stipa Gerrit-CC: openvpn-devel Gerrit-MessageType: newpatchset --TUIyYMsThwY= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 uploaded patch set #2 to the change originally cr= eated by d12fk.

View Change

The following approvals got outdated and= were removed: Code-Review+1 by stipa, Code-Review+2 by cron2

cmake: symlink whole build d=
ir not just .json file

It turned out that symlinking compile_command= s.json from the top level
source dir has some issues:
* file is not= created on Windows and symlinking may cause an error
* some IDEs crea= te their own json and error out b/c a file exists

Since clangd also = looks for the json in build/ directories by default,
we now symlink the = whole build directory instead, not just the json file.

This approach= requires for the existing build/ dir in the repo to
vanish. Luckily it = only contains one automake include file, which is
moved to the top level= source dir.

Lastly, make this an opt-in feature, so that the defaul= t configuration
of the buildsystem never causes a build failure because = of this.

Change-Id: Ib1a5c788269949d8de95d1da2cb0c32a65bf13f2
Sig= ned-off-by: Heiko Hund <heiko@...2662...>
Acked-by: Gert Doering &= lt;gert@...1296...>
Message-Id: <20240117134929.5317-1-gert@...1826...= 6...>
URL: https://www.mail-archive.com/openvpn-devel@...1768...= ge.net/msg28061.html
Signed-off-by: Gert Doering <gert@...1296...>=
---
M .gitignore
M CMakeLists.txt
M Makefile.am
M README.cm= ake.md
D build/Makefile.am
M configure.ac
R ltrc.inc
M src/open= vpn/Makefile.am
M src/openvpnmsica/Makefile.am
M src/openvpnserv/Make= file.am
M src/tapctl/Makefile.am
11 files changed, 32 insertions(+), = 25 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn r=
efs/changes/01/501/2
diff --git a/.gitignore b/.gitignoreindex 4153a3e..92d65bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,7 @@
m4/ltversion.m4

m4/lt~obsolete.m4

-compile_commands.json
+build
= doc/openvpn-examples.5
doc/openvpn-examples.5.html=
doc/openvpn.8
diff --git a/CMakeLists.txt b/CMak= eLists.txt
index 6a1895a..5e07d50 100644
--= - a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ = -43,9 +43,17 @@
set(PLUGIN_DIR /usr/local/lib/openvpn/plug= ins CACHE FILEPATH "Location of the plugin directory")
=
# Create machine readable compile commands<= br>-set(CMAKE_EXPORT_COMPILE_COMM= ANDS 1)
-file(CREATE_LI= NK ${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json
- ${CMAKE_CURRENT_SOURCE_DIR= }/compile_commands.json SYMBOLIC)
+option(ENABLE_COMPILE_COMMANDS "Generate compile_command= s.json and a symlink for clangd to find it" OFF)
+if (ENABLE_COMPILE_COMMANDS)
+ if (EXISTS ${CMAKE_CURRENT_S= OURCE_DIR}/build AND NOT IS_SYMLINK ${CMAKE_CURRENT_SOURCE_DIR}/build)
+ message(FATAL_ER= ROR "The top level source directory contains a 'build' file or= directory. Please remove or rename it. CMake creates a symlink with that n= ame during build.")
+ endif()
+ = set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
+ add_custom_target(
+ symlink-build-dir ALL
+ ${CMAKE_COMMAND} -E create_symlink $= {CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/build
+ )

+endif ()

= # AddressSanitize - use CXX=3Dclang++ CC=3Dclang cmake -DCMAKE_BUILD_TYPE= =3Dasan to build with ASAN
set(CMAKE_C_FLAGS_ASANdiff --git a/Makefile.am b/Makefile.am
index 2305ab= 4..792588a 100644
--- a/Makefile.am
+++ b/M= akefile.am
@@ -42,6 +42,7 @@
EXTRA_DIST = =3D \
contrib \
debug \
+ ltrc.inc \

CMake= Lists.txt \
CMakePresets.json \
config.= h.cmake.in
@@ -53,7 +54,7 @@
config-versi= on.h
endif

-SUBDIRS =3D build distro include src sample doc tes= ts
+SUBDIRS =3D distr= o include src sample doc tests

dist_doc_= DATA =3D \
README \
diff --git a/README.c= make.md b/README.cmake.md
index d181b64..4f41c70 100644
--- a/README.cmake.md
+++ b/README.cmake.md
@@ -135,3 +135,17 @@
The `unix-native` CMake= preset is available for these builds. This preset does
no= t require VCPKG and instead assumes all build-dependencies are provided by<= /span>
the system natively.
+
+G= enerating compile_commands.json
+--------------------------------
+
+To have the CMake buildsystem generate compile_commands.json you can = specify
+`-DENABLE_CO= MPILE_COMMANDS=3DON` on the command line or enable the CMake option<= br>+another way you like. For s= upported generators the file will then be created.
+Additionally, the buildsystem will create a = symlink `build/` to the --preset
+build directory that contains the generated JSON file. This is= done so that
+clangd= is able to find it.
= +
+Enabling this opti= on may cause an error on Windows, since creating a symlink
+is a privileged operation there. If = you enable Developer Mode for the system,
+symlinks can be created by regular users.
<= span>diff --git a/build/Makefile.am b/build/Makefile.am

del= eted file mode 100644
index e7cc4d8..0000000
--- a/build/Makefile.am

+++ /dev/null
@@ = -1,15 +0,0 @@
-#=
-# OpenVPN -- An application= to securely tunnel IP networks
-# over a single UDP port, with support for SSL/TLS-ba= sed
-# sess= ion authentication and key exchange,
-# packet encryption, packet authentication, and<= /span>
-# packet c= ompression.
-#-# Copyright (C) 2002-2023 Ope= nVPN Inc <sales@...515...>
-#
--MAINTAINERCLEANFILES =3D \
- $(srcdir)/Makefile.in
-
-EXTRA_DIST =3D \
- ltrc.inc
diff --git a/configure= .ac b/configure.ac
index 3ad9f14..14f5be4 100644
= --- a/configure.ac
+++ b/configure.ac
@@ -1536,7 +1536,6 @@


AC_CONFIG_FILES([=
Makefile
- build/Makefile
distro/Makefile
d= istro/systemd/Makefile
doc/Makefile
diff = --git a/build/ltrc.inc b/ltrc.inc
similarity index 100%
rename from build/ltrc.inc
rename to ltrc.inc<= /span>
diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile= .am
index b953961..1dc1dda 100644
--- a/src= /openvpn/Makefile.am
+++ b/src/openvpn/Makefile.am@@ -9,7 +9,7 @@
# Copyright (C) 2006-2012 Alon Ba= r-Lev <alon.barlev@...277...>
#

-include $(top_srcdir)/bu= ild/ltrc.inc
+include= $(top_srcdir)/ltrc.inc

MAINTAINERCLEANF= ILES =3D \
$(srcdir)/Makefile.in
diff --g= it a/src/openvpnmsica/Makefile.am b/src/openvpnmsica/Makefile.am
= index dc53f75..b10ce82 100644
--- a/src/openvpnmsica/= Makefile.am
+++ b/src/openvpnmsica/Makefile.am
@@ -18,7 +18,7 @@

# 51 Franklin Street, Fifth Floor, = Boston, MA 02110-1301 USA.
#

<= span style=3D"color: hsl(0, 100%, 40%);">-include $(top_srcdir)/build/ltrc.= inc

+include $(top_sr= cdir)/ltrc.inc

MAINTAINERCLEANFILES =3D = $(srcdir)/Makefile.in

diff --git a/src/op= envpnserv/Makefile.am b/src/openvpnserv/Makefile.am
index d= 8ba4eb..0c64cce 100644
--- a/src/openvpnserv/Makefile.am
+++ b/src/openvpnserv/Makefile.am
@@ -9,7 +9,= 7 @@
# Copyright (C) 2006-2012 Alon Bar-Lev <alon.barl= ev@...277...>
#

-include $(top_srcdir)/build/ltrc.inc=
+include $(top_srcdir)/ltrc= .inc

MAINTAINERCLEANFILES =3D $(srcdir)/= Makefile.in

diff --git a/src/tapctl/Makef= ile.am b/src/tapctl/Makefile.am
index 69ea161..4c2958b 1006= 44
--- a/src/tapctl/Makefile.am
+++ b/src/t= apctl/Makefile.am
@@ -18,7 +18,7 @@
# 51 = Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#=

-inc= lude $(top_srcdir)/build/ltrc.inc
+include $(top_srcdir)/ltrc.inc

MAINTAINERCLEANFILES =3D $(srcdir)/Makefile.in



To view, visit change 501. To unsubscribe, or for= help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib1a5c788269949d8de95d1da2cb= 0c32a65bf13f2
Gerrit-Change-Number: 501
Gerrit-PatchSet: 2
Gerrit-Owner: d12fk <heiko@...515...>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-Reviewer: stipa <lstipakov@...277...= >
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-MessageType: newpatchset
--TUIyYMsThwY=--