From 3b941e7e8c41f9f2e86df676acd267749477c37c Mon Sep 17 00:00:00 2001 From: Guillaume Quintard Date: Sat, 21 Aug 2021 22:52:49 -0700 Subject: [PATCH 1/6] out with autotools, in with cmake --- .gitignore | 20 -- CMakeLists.txt | 39 +++ Makefile.am | 5 - README.rst | 45 ++- autogen.sh | 53 ---- config.h.in | 0 configure.ac | 45 --- m4/ax_pthread.m4 | 485 -------------------------------- rename-vmod-script | 3 - src/Makefile.am | 28 -- {src/tests => tests}/test01.vtc | 0 11 files changed, 56 insertions(+), 667 deletions(-) create mode 100644 CMakeLists.txt delete mode 100644 Makefile.am delete mode 100755 autogen.sh create mode 100644 config.h.in delete mode 100644 configure.ac delete mode 100644 m4/ax_pthread.m4 delete mode 100644 src/Makefile.am rename {src/tests => tests}/test01.vtc (100%) diff --git a/.gitignore b/.gitignore index 3515ebd..e034496 100644 --- a/.gitignore +++ b/.gitignore @@ -9,23 +9,3 @@ Makefile.in *.[1-9] *.log *.trs - -/aclocal.m4 -/autom4te.cache/ -/build-aux/ -/config.h -/config.h.in -/config.log -/config.status -/configure -/libtool -/stamp-h1 -/m4/libtool.m4 -/m4/ltoptions.m4 -/m4/ltsugar.m4 -/m4/ltversion.m4 -/m4/lt~obsolete.m4 - -/src/vcc_*_if.c -/src/vcc_*_if.h -/src/vmod_*rst diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..9d1be84 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,39 @@ +cmake_minimum_required(VERSION 3.10) +set(VMOD_NAME example) +project(vmod_${VMOD_NAME} VERSION 1.0) +enable_testing() + +find_package(PkgConfig REQUIRED) +find_package(Python REQUIRED COMPONENTS Interpreter Development) + +find_program(RST2MAN rst2man) + +pkg_check_modules(VARNISHAPI REQUIRED varnishapi>=6.6) +pkg_get_variable(VARNISHAPI_VMODTOOL varnishapi vmodtool) +pkg_get_variable(VARNISHAPI_VMODDIR varnishapi vmoddir) +include_directories(${VARNISHAPI_INCLUDE_DIRS}) +include_directories(${CMAKE_BINARY_DIR}) +configure_file(config.h.in config.h) + +add_custom_command( + OUTPUT vcc_${VMOD_NAME}_if.c vcc_${VMOD_NAME}_if.h vmod_${VMOD_NAME}.rst vmod_${VMOD_NAME}.man.rst + MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc + COMMAND ${Python_EXECUTABLE} + ARGS ${VARNISHAPI_VMODTOOL} -o vcc_${VMOD_NAME}_if ${CMAKE_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc +) + +add_library(vmod_${VMOD_NAME} MODULE ./src/vmod_${VMOD_NAME}.c vcc_${VMOD_NAME}_if.c vcc_${VMOD_NAME}_if.h) +install(TARGETS vmod_${VMOD_NAME} DESTINATION ${VARNISHAPI_VMODDIR}) + +add_custom_command( + OUTPUT vmod_${VMOD_NAME}.3 + MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.rst + COMMAND ${RST2MAN} ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.rst vmod_${VMOD_NAME}.3 +) +add_custom_target(manpage ALL DEPENDS ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3) +install(FILES ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3 TYPE MAN) + +file(GLOB vtcs ${CMAKE_SOURCE_DIR}/src/tests/*.vtc) +foreach(vtc ${vtcs}) + add_test(NAME ${vtc} COMMAND varnishtest -v "-Dvmod_${VMOD_NAME}=${VMOD_NAME} from \"${CMAKE_BINARY_DIR}/libvmod_${VMOD_NAME}.so\"" ${vtc}) +endforeach() diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 7d37665..0000000 --- a/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 -I ${VARNISHAPI_DATAROOTDIR}/aclocal - -SUBDIRS = src - -dist_doc_DATA = README.rst LICENSE diff --git a/README.rst b/README.rst index 7ad573b..8fcb6c0 100644 --- a/README.rst +++ b/README.rst @@ -42,7 +42,13 @@ Example INSTALLATION ============ -The source tree is based on autotools to configure the building, and +Installation will require: + +- `cmake` +- `make`, `ninja` or another build system +- `clang`, `gcc` or another C compiler + +The source tree is based on `cmake` to configure the building, and does also have the necessary bits in place to do functional unit tests using the ``varnishtest`` tool. @@ -51,42 +57,25 @@ the necessary paths. Usage:: - ./autogen.sh - ./configure + mkdir build + cmake -S . -B build -If you have installed Varnish to a non-standard directory, call -``autogen.sh`` and ``configure`` with ``PKG_CONFIG_PATH`` pointing to -the appropriate path. For instance, when varnishd configure was called -with ``--prefix=$PREFIX``, use +If you have installed Varnish to a non-standard directory, export +``PKG_CONFIG_PATH`` pointing to the appropriate path before calling `cmake`. +For instance, when varnishd configure was called with ``--prefix=$PREFIX``, use :: export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig - export ACLOCAL_PATH=${PREFIX}/share/aclocal - -The module will inherit its prefix from Varnish, unless you specify a -different ``--prefix`` when running the ``configure`` script for this -module. Make targets: -* make - builds the vmod. -* make install - installs your vmod. -* make check - runs the unit tests in ``src/tests/*.vtc``. -* make distcheck - run check and prepare a tarball of the vmod. - -If you build a dist tarball, you don't need any of the autotools or -pkg-config. You can build the module simply by running:: - - ./configure - make - -Installation directories ------------------------- +* `make -C build` - builds the vmod. +* `make -C build install` - installs your vmod. +* `make -C build test` - runs the unit tests in ``tests/*.vtc``. -By default, the vmod ``configure`` script installs the built vmod in the -directory relevant to the prefix. The vmod installation directory can be -overridden by passing the ``vmoddir`` variable to ``make install``. +You can install your vmod under a specific prefix by adding `DESTDIR` to +the `make` command line. USAGE ===== diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 55f7894..0000000 --- a/autogen.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -warn() { - echo "WARNING: $@" 1>&2 -} - -case `uname -s` in -Darwin) - LIBTOOLIZE=glibtoolize - ;; -FreeBSD) - LIBTOOLIZE=libtoolize - ;; -Linux) - LIBTOOLIZE=libtoolize - ;; -SunOS) - LIBTOOLIZE=libtoolize - ;; -*) - warn "unrecognized platform:" `uname -s` - LIBTOOLIZE=libtoolize -esac - -automake_version=`automake --version | tr ' ' '\n' | egrep '^[0-9]\.[0-9a-z.-]+'` -if [ -z "$automake_version" ] ; then - warn "unable to determine automake version" -else - case $automake_version in - 0.*|1.[0-8]|1.[0-8][.-]*) - warn "automake ($automake_version) detected; 1.9 or newer recommended" - ;; - *) - ;; - esac -fi - -# check for varnishapi.m4 in custom paths -dataroot=$(pkg-config --variable=datarootdir varnishapi 2>/dev/null) -if [ -z "$dataroot" ] ; then - cat >&2 <<'EOF' -Package varnishapi was not found in the pkg-config search path. -Perhaps you should add the directory containing `varnishapi.pc' -to the PKG_CONFIG_PATH environment variable -EOF - exit 1 -fi -set -ex -aclocal -I m4 -I ${dataroot}/aclocal -$LIBTOOLIZE --copy --force -autoheader -automake --add-missing --copy --foreign -autoconf diff --git a/config.h.in b/config.h.in new file mode 100644 index 0000000..e69de29 diff --git a/configure.ac b/configure.ac deleted file mode 100644 index ccea81d..0000000 --- a/configure.ac +++ /dev/null @@ -1,45 +0,0 @@ -AC_PREREQ([2.68]) -AC_INIT([libvmod-example], [0.1], [], [vmod-example]) -AC_COPYRIGHT([Public Domain]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_SRCDIR(src/vmod_example.vcc) -AC_CONFIG_HEADER([config.h]) - -AM_INIT_AUTOMAKE([1.12 -Wall -Werror foreign parallel-tests]) -AM_SILENT_RULES([yes]) -AM_PROG_AR - -LT_PREREQ([2.2.6]) -LT_INIT([dlopen disable-static]) - -AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])]) - -LIBS="$PTHREAD_LIBS $LIBS" -CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -CC="$PTHREAD_CC" - -AC_ARG_WITH([rst2man], - AS_HELP_STRING( - [--with-rst2man=PATH], - [Location of rst2man (auto)]), - [RST2MAN="$withval"], - AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])) - -m4_ifndef([VARNISH_PREREQ], AC_MSG_ERROR([Need varnish.m4 -- see README.rst])) - -VARNISH_PREREQ([6.2]) -VARNISH_VMODS([example]) - -VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)" -AC_SUBST(VMOD_TESTS) - -PKG_CHECK_VAR([LIBVARNISHAPI_LIBDIR], [varnishapi], [libdir]) -AC_SUBST([VARNISH_LIBRARY_PATH], - [$LIBVARNISHAPI_LIBDIR:$LIBVARNISHAPI_LIBDIR/varnish]) - -AC_CONFIG_FILES([ - Makefile - src/Makefile -]) -AC_OUTPUT diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 deleted file mode 100644 index 4c4051e..0000000 --- a/m4/ax_pthread.m4 +++ /dev/null @@ -1,485 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also to link with them as well. For example, you might link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threaded programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to -# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# Copyright (c) 2011 Daniel Richard G. -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 23 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_CC]) -AC_REQUIRE([AC_PROG_SED]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on Tru64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then - ax_pthread_save_CC="$CC" - ax_pthread_save_CFLAGS="$CFLAGS" - ax_pthread_save_LIBS="$LIBS" - AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) - AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes]) - AC_MSG_RESULT([$ax_pthread_ok]) - if test "x$ax_pthread_ok" = "xno"; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - CC="$ax_pthread_save_CC" - CFLAGS="$ax_pthread_save_CFLAGS" - LIBS="$ax_pthread_save_LIBS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64 -# (Note: HP C rejects this with "bad form for `-t' option") -# -pthreads: Solaris/gcc (Note: HP C also rejects) -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads and -# -D_REENTRANT too), HP C (must be checked before -lpthread, which -# is present but should not be used directly; and before -mthreads, -# because the compiler interprets this as "-mt" + "-hreads") -# -mthreads: Mingw32/gcc, Lynx/gcc -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case $host_os in - - freebsd*) - - # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) - # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) - - ax_pthread_flags="-kthread lthread $ax_pthread_flags" - ;; - - hpux*) - - # From the cc(1) man page: "[-mt] Sets various -D flags to enable - # multi-threading and also sets -lpthread." - - ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" - ;; - - openedition*) - - # IBM z/OS requires a feature-test macro to be defined in order to - # enable POSIX threads at all, so give the user a hint if this is - # not set. (We don't define these ourselves, as they can affect - # other portions of the system API in unpredictable ways.) - - AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING], - [ -# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) - AX_PTHREAD_ZOS_MISSING -# endif - ], - [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])]) - ;; - - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (N.B.: The stubs are missing - # pthread_cleanup_push, or rather a function called by this macro, - # so we could check for that, but who knows whether they'll stub - # that too in a future libc.) So we'll check first for the - # standard Solaris way of linking pthreads (-mt -lpthread). - - ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" - ;; -esac - -# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) - -AS_IF([test "x$GCC" = "xyes"], - [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"]) - -# The presence of a feature test macro requesting re-entrant function -# definitions is, on some systems, a strong hint that pthreads support is -# correctly enabled - -case $host_os in - darwin* | hpux* | linux* | osf* | solaris*) - ax_pthread_check_macro="_REENTRANT" - ;; - - aix*) - ax_pthread_check_macro="_THREAD_SAFE" - ;; - - *) - ax_pthread_check_macro="--" - ;; -esac -AS_IF([test "x$ax_pthread_check_macro" = "x--"], - [ax_pthread_check_cond=0], - [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"]) - -# Are we compiling with Clang? - -AC_CACHE_CHECK([whether $CC is Clang], - [ax_cv_PTHREAD_CLANG], - [ax_cv_PTHREAD_CLANG=no - # Note that Autoconf sets GCC=yes for Clang as well as GCC - if test "x$GCC" = "xyes"; then - AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], - [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ -# if defined(__clang__) && defined(__llvm__) - AX_PTHREAD_CC_IS_CLANG -# endif - ], - [ax_cv_PTHREAD_CLANG=yes]) - fi - ]) -ax_pthread_clang="$ax_cv_PTHREAD_CLANG" - -ax_pthread_clang_warning=no - -# Clang needs special handling, because older versions handle the -pthread -# option in a rather... idiosyncratic way - -if test "x$ax_pthread_clang" = "xyes"; then - - # Clang takes -pthread; it has never supported any other flag - - # (Note 1: This will need to be revisited if a system that Clang - # supports has POSIX threads in a separate library. This tends not - # to be the way of modern systems, but it's conceivable.) - - # (Note 2: On some systems, notably Darwin, -pthread is not needed - # to get POSIX threads support; the API is always present and - # active. We could reasonably leave PTHREAD_CFLAGS empty. But - # -pthread does define _REENTRANT, and while the Darwin headers - # ignore this macro, third-party headers might not.) - - PTHREAD_CFLAGS="-pthread" - PTHREAD_LIBS= - - ax_pthread_ok=yes - - # However, older versions of Clang make a point of warning the user - # that, in an invocation where only linking and no compilation is - # taking place, the -pthread option has no effect ("argument unused - # during compilation"). They expect -pthread to be passed in only - # when source code is being compiled. - # - # Problem is, this is at odds with the way Automake and most other - # C build frameworks function, which is that the same flags used in - # compilation (CFLAGS) are also used in linking. Many systems - # supported by AX_PTHREAD require exactly this for POSIX threads - # support, and in fact it is often not straightforward to specify a - # flag that is used only in the compilation phase and not in - # linking. Such a scenario is extremely rare in practice. - # - # Even though use of the -pthread flag in linking would only print - # a warning, this can be a nuisance for well-run software projects - # that build with -Werror. So if the active version of Clang has - # this misfeature, we search for an option to squash it. - - AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread], - [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG], - [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown - # Create an alternate version of $ac_link that compiles and - # links in two steps (.c -> .o, .o -> exe) instead of one - # (.c -> exe), because the warning occurs only in the second - # step - ax_pthread_save_ac_link="$ac_link" - ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' - ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` - ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" - ax_pthread_save_CFLAGS="$CFLAGS" - for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do - AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) - CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" - ac_link="$ax_pthread_save_ac_link" - AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], - [ac_link="$ax_pthread_2step_ac_link" - AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], - [break]) - ]) - done - ac_link="$ax_pthread_save_ac_link" - CFLAGS="$ax_pthread_save_CFLAGS" - AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no]) - ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" - ]) - - case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in - no | unknown) ;; - *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; - esac - -fi # $ax_pthread_clang = yes - -if test "x$ax_pthread_ok" = "xno"; then -for ax_pthread_try_flag in $ax_pthread_flags; do - - case $ax_pthread_try_flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -mt,pthread) - AC_MSG_CHECKING([whether pthreads work with -mt -lpthread]) - PTHREAD_CFLAGS="-mt" - PTHREAD_LIBS="-lpthread" - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) - PTHREAD_CFLAGS="$ax_pthread_try_flag" - ;; - - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) - PTHREAD_LIBS="-l$ax_pthread_try_flag" - ;; - esac - - ax_pthread_save_CFLAGS="$CFLAGS" - ax_pthread_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include -# if $ax_pthread_check_cond -# error "$ax_pthread_check_macro must be defined" -# endif - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - CFLAGS="$ax_pthread_save_CFLAGS" - LIBS="$ax_pthread_save_LIBS" - - AC_MSG_RESULT([$ax_pthread_ok]) - AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = "xyes"; then - ax_pthread_save_CFLAGS="$CFLAGS" - ax_pthread_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_CACHE_CHECK([for joinable pthread attribute], - [ax_cv_PTHREAD_JOINABLE_ATTR], - [ax_cv_PTHREAD_JOINABLE_ATTR=unknown - for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], - [int attr = $ax_pthread_attr; return attr /* ; */])], - [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break], - []) - done - ]) - AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ - test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ - test "x$ax_pthread_joinable_attr_defined" != "xyes"], - [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], - [$ax_cv_PTHREAD_JOINABLE_ATTR], - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - ax_pthread_joinable_attr_defined=yes - ]) - - AC_CACHE_CHECK([whether more special flags are required for pthreads], - [ax_cv_PTHREAD_SPECIAL_FLAGS], - [ax_cv_PTHREAD_SPECIAL_FLAGS=no - case $host_os in - solaris*) - ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" - ;; - esac - ]) - AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ - test "x$ax_pthread_special_flags_added" != "xyes"], - [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" - ax_pthread_special_flags_added=yes]) - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - [ax_cv_PTHREAD_PRIO_INHERIT], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], - [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ - test "x$ax_pthread_prio_inherit_defined" != "xyes"], - [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.]) - ax_pthread_prio_inherit_defined=yes - ]) - - CFLAGS="$ax_pthread_save_CFLAGS" - LIBS="$ax_pthread_save_LIBS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != "xyes"; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) -AC_SUBST([PTHREAD_CC]) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test "x$ax_pthread_ok" = "xyes"; then - ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/rename-vmod-script b/rename-vmod-script index a4c46c0..9975701 100755 --- a/rename-vmod-script +++ b/rename-vmod-script @@ -38,9 +38,6 @@ sed -i '/circleci.com\/gh\/varnishcache\/libvmod-example/d' README.rst git rm -f rename-vmod-script -# restore foreign files -git checkout -- m4/ - cat < Date: Thu, 26 Aug 2021 21:36:14 -0700 Subject: [PATCH 2/6] CMAKE_SOURCE_DIR -> CMAKE_CURRENT_SOURCE_DIR --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d1be84..16f0554 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,9 +17,9 @@ configure_file(config.h.in config.h) add_custom_command( OUTPUT vcc_${VMOD_NAME}_if.c vcc_${VMOD_NAME}_if.h vmod_${VMOD_NAME}.rst vmod_${VMOD_NAME}.man.rst - MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc COMMAND ${Python_EXECUTABLE} - ARGS ${VARNISHAPI_VMODTOOL} -o vcc_${VMOD_NAME}_if ${CMAKE_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc + ARGS ${VARNISHAPI_VMODTOOL} -o vcc_${VMOD_NAME}_if ${CMAKE_CURRENT_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc ) add_library(vmod_${VMOD_NAME} MODULE ./src/vmod_${VMOD_NAME}.c vcc_${VMOD_NAME}_if.c vcc_${VMOD_NAME}_if.h) @@ -33,7 +33,7 @@ add_custom_command( add_custom_target(manpage ALL DEPENDS ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3) install(FILES ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3 TYPE MAN) -file(GLOB vtcs ${CMAKE_SOURCE_DIR}/src/tests/*.vtc) +file(GLOB vtcs ${CMAKE_CURRENT_SOURCE_DIR}/src/tests/*.vtc) foreach(vtc ${vtcs}) add_test(NAME ${vtc} COMMAND varnishtest -v "-Dvmod_${VMOD_NAME}=${VMOD_NAME} from \"${CMAKE_BINARY_DIR}/libvmod_${VMOD_NAME}.so\"" ${vtc}) endforeach() From 95cf3b361f215efd374f8c99d1facf8c99bcd378 Mon Sep 17 00:00:00 2001 From: Guillaume Quintard Date: Thu, 26 Aug 2021 21:40:45 -0700 Subject: [PATCH 3/6] tests are in tests/ now --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16f0554..b5194d9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ add_custom_command( add_custom_target(manpage ALL DEPENDS ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3) install(FILES ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3 TYPE MAN) -file(GLOB vtcs ${CMAKE_CURRENT_SOURCE_DIR}/src/tests/*.vtc) +file(GLOB vtcs ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.vtc) foreach(vtc ${vtcs}) add_test(NAME ${vtc} COMMAND varnishtest -v "-Dvmod_${VMOD_NAME}=${VMOD_NAME} from \"${CMAKE_BINARY_DIR}/libvmod_${VMOD_NAME}.so\"" ${vtc}) endforeach() From d664f91a456a9b6390d44893849fb53551323d5f Mon Sep 17 00:00:00 2001 From: Guillaume Quintard Date: Thu, 26 Aug 2021 21:42:46 -0700 Subject: [PATCH 4/6] add VC_VERSION --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5194d9..2c8080f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.10) set(VMOD_NAME example) -project(vmod_${VMOD_NAME} VERSION 1.0) +set(VC_VERSION 6.6.1) +project(vmod_${VMOD_NAME} VERSION 0.0.1) enable_testing() find_package(PkgConfig REQUIRED) From bc709676af86151ea4e8f4519d3bc729fe8a557d Mon Sep 17 00:00:00 2001 From: Guillaume Quintard Date: Thu, 26 Aug 2021 21:43:17 -0700 Subject: [PATCH 5/6] skip tests if they return 77 --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c8080f..56364c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,4 +37,5 @@ install(FILES ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3 TYPE MAN) file(GLOB vtcs ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.vtc) foreach(vtc ${vtcs}) add_test(NAME ${vtc} COMMAND varnishtest -v "-Dvmod_${VMOD_NAME}=${VMOD_NAME} from \"${CMAKE_BINARY_DIR}/libvmod_${VMOD_NAME}.so\"" ${vtc}) + set_tests_properties(${vtc} PROPERTIES SKIP_RETURN_CODE 77) endforeach() From 40e68d509f97a962f4ecae9deb0ea8f1ca823107 Mon Sep 17 00:00:00 2001 From: Guillaume Quintard Date: Sat, 28 Aug 2021 14:50:48 -0700 Subject: [PATCH 6/6] try to use functions --- CMakeLists.txt | 39 ++++----------------------------------- vmod.cmake | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 35 deletions(-) create mode 100644 vmod.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 56364c8..7db71b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,41 +1,10 @@ cmake_minimum_required(VERSION 3.10) set(VMOD_NAME example) -set(VC_VERSION 6.6.1) project(vmod_${VMOD_NAME} VERSION 0.0.1) -enable_testing() -find_package(PkgConfig REQUIRED) -find_package(Python REQUIRED COMPONENTS Interpreter Development) +include(vmod.cmake) -find_program(RST2MAN rst2man) +vmod(${VMOD_NAME} 6.6 src/vmod_${VMOD_NAME}.c) -pkg_check_modules(VARNISHAPI REQUIRED varnishapi>=6.6) -pkg_get_variable(VARNISHAPI_VMODTOOL varnishapi vmodtool) -pkg_get_variable(VARNISHAPI_VMODDIR varnishapi vmoddir) -include_directories(${VARNISHAPI_INCLUDE_DIRS}) -include_directories(${CMAKE_BINARY_DIR}) -configure_file(config.h.in config.h) - -add_custom_command( - OUTPUT vcc_${VMOD_NAME}_if.c vcc_${VMOD_NAME}_if.h vmod_${VMOD_NAME}.rst vmod_${VMOD_NAME}.man.rst - MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc - COMMAND ${Python_EXECUTABLE} - ARGS ${VARNISHAPI_VMODTOOL} -o vcc_${VMOD_NAME}_if ${CMAKE_CURRENT_SOURCE_DIR}/src/vmod_${VMOD_NAME}.vcc -) - -add_library(vmod_${VMOD_NAME} MODULE ./src/vmod_${VMOD_NAME}.c vcc_${VMOD_NAME}_if.c vcc_${VMOD_NAME}_if.h) -install(TARGETS vmod_${VMOD_NAME} DESTINATION ${VARNISHAPI_VMODDIR}) - -add_custom_command( - OUTPUT vmod_${VMOD_NAME}.3 - MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.rst - COMMAND ${RST2MAN} ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.rst vmod_${VMOD_NAME}.3 -) -add_custom_target(manpage ALL DEPENDS ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3) -install(FILES ${CMAKE_BINARY_DIR}/vmod_${VMOD_NAME}.3 TYPE MAN) - -file(GLOB vtcs ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.vtc) -foreach(vtc ${vtcs}) - add_test(NAME ${vtc} COMMAND varnishtest -v "-Dvmod_${VMOD_NAME}=${VMOD_NAME} from \"${CMAKE_BINARY_DIR}/libvmod_${VMOD_NAME}.so\"" ${vtc}) - set_tests_properties(${vtc} PROPERTIES SKIP_RETURN_CODE 77) -endforeach() +file(GLOB vtc_paths ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.vtc) +vtc(${VMOD_NAME} "${vtc_paths}") diff --git a/vmod.cmake b/vmod.cmake new file mode 100644 index 0000000..294ffd6 --- /dev/null +++ b/vmod.cmake @@ -0,0 +1,39 @@ +function (vtc vmod_name vtc_paths) + enable_testing() + foreach(vtc_path ${vtc_paths}) + add_test(NAME ${vtc_path} COMMAND varnishtest -v "-Dvmod_${vmod_name}=${vmod_name} from \"${CMAKE_BINARY_DIR}/libvmod_${vmod_name}.so\"" ${vtc_path}) + set_tests_properties(${vtc_path} PROPERTIES SKIP_RETURN_CODE 77) + endforeach() +endfunction() + +function (vmod vmod_name vc_api_req src_files) + find_package(PkgConfig REQUIRED) + find_package(Python REQUIRED COMPONENTS Interpreter Development) + + find_program(RST2MAN rst2man) + + pkg_check_modules(VARNISHAPI REQUIRED varnishapi>=${vc_api_req}) + pkg_get_variable(VARNISHAPI_VMODTOOL varnishapi vmodtool) + pkg_get_variable(VARNISHAPI_VMODDIR varnishapi vmoddir) + include_directories(${VARNISHAPI_INCLUDE_DIRS}) + include_directories(${CMAKE_BINARY_DIR}) + configure_file(config.h.in config.h) + + add_custom_command( + OUTPUT vcc_${vmod_name}_if.c vcc_${vmod_name}_if.h vmod_${vmod_name}.rst vmod_${vmod_name}.man.rst + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/src/vmod_${vmod_name}.vcc + COMMAND ${Python_EXECUTABLE} + ARGS ${VARNISHAPI_VMODTOOL} -o vcc_${vmod_name}_if ${CMAKE_CURRENT_SOURCE_DIR}/src/vmod_${vmod_name}.vcc + ) + + add_library(vmod_${vmod_name} MODULE ${src_files} vcc_${vmod_name}_if.c vcc_${vmod_name}_if.h) + install(TARGETS vmod_${vmod_name} DESTINATION ${VARNISHAPI_VMODDIR}) + + add_custom_command( + OUTPUT vmod_${vmod_name}.3 + MAIN_DEPENDENCY ${CMAKE_BINARY_DIR}/vmod_${vmod_name}.rst + COMMAND ${RST2MAN} ${CMAKE_BINARY_DIR}/vmod_${vmod_name}.rst vmod_${vmod_name}.3 + ) + add_custom_target(manpage ALL DEPENDS ${CMAKE_BINARY_DIR}/vmod_${vmod_name}.3) + install(FILES ${CMAKE_BINARY_DIR}/vmod_${vmod_name}.3 TYPE MAN) +endfunction()