Add tooling/pkgcheck.sh, make cmake install identical to Make install.

Also add tooling/test-cmake.sh and tooling/test-make.sh, use at least the former in .cirrus-ci.yml.
dankegel · May 22, 2020 · 3e356b7 · 3e356b7
1 parent 42ac6d1
commit 3e356b7
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 27 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -2,8 +2,7 @@ check_ubu1804_task:
   container:
     dockerfile: tooling/cirrus/ubu1804/Dockerfile
   test_script:
-    - cc --version
-    - mkdir btmp; cd btmp; cmake -G Ninja .. && ninja && ctest -V
+    - sh tooling/test-cmake.sh && sh tooling/pkgcheck.sh
   always:
     junit_artifacts:
       path: "btmp/*-results.xml"
@@ -14,8 +13,7 @@ check_ubu2004_task:
   container:
     dockerfile: tooling/cirrus/ubu2004/Dockerfile
   test_script:
-    - cc --version
-    - mkdir btmp; cd btmp; cmake -G Ninja .. && ninja && ctest -V
+    - sh tooling/test-cmake.sh && sh tooling/pkgcheck.sh
   always:
     junit_artifacts:
       path: "btmp/*-results.xml"
@@ -28,9 +26,7 @@ check_mac_task:
   install_script:
     - brew install ninja
   test_script:
-    - cc --version
-    - ninja --version
-    - mkdir btmp; cd btmp; cmake -G Ninja .. && cmake --build . && ctest -V
+    - sh tooling/test-cmake.sh && sh tooling/pkgcheck.sh
   always:
     junit_artifacts:
       path: "btmp/*-results.xml"
@@ -43,8 +39,7 @@ check_bsd_task:
   install_script:
     - pkg install -y gcc cmake ninja
   test_script:
-    - cc --version
-    - mkdir btmp; cd btmp; cmake -G Ninja .. && ninja && ctest -V
+    - sh tooling/test-cmake.sh && sh tooling/pkgcheck.sh
   always:
     junit_artifacts:
       path: "btmp/*-results.xml"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,12 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
+# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
+string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
+    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
+MESSAGE("ZLIB_FULL_VERSION=${ZLIB_FULL_VERSION}")
+# FIXME: parse this from ZLIB_FULL_VERSION
 set(VERSION "1.2.11.1")
 
 option(ASM686 "Enable building i686 assembly implementation")
@@ -12,7 +18,7 @@ set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation direc
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
 set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
 set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
-set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+set(INSTALL_PKGCONFIG_DIR "${INSTALL_LIB_DIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
 
 # Set a default build type if none was specified
 set(default_build_type "Release")
@@ -32,6 +38,22 @@ enable_testing()
 check_include_file(sys/types.h HAVE_SYS_TYPES_H)
 check_include_file(stdint.h    HAVE_STDINT_H)
 check_include_file(stddef.h    HAVE_STDDEF_H)
+check_include_file(stdarg.h    HAVE_STDARG_H)
+check_include_file(unistd.h    HAVE_UNISTD_H)
+
+#
+# Match configure's zconf.h exactly
+#
+if (HAVE_STDARG_H)
+  SET(ZCONF_STDARG_LINE "#if 1    /* was set to #if 1 by ./configure */")
+else()
+  SET(ZCONF_STDARG_LINE "#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */")
+endif()
+if (HAVE_UNISTD_H)
+  SET(ZCONF_UNISTD_LINE "#if 1    /* was set to #if 1 by ./configure */")
+else()
+  SET(ZCONF_UNISTD_LINE "#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */")
+endif()
 
 #
 # Check to see if compiler supports __attribute__((visibility ("hidden")))
@@ -77,7 +99,7 @@ endif()
 #
 # Check for unistd.h
 #
-check_include_file(unistd.h Z_HAVE_UNISTD_H)
+check_include_file(unistd.h HAVE_UNISTD_H)
 
 if(MSVC)
     set(CMAKE_DEBUG_POSTFIX "d")
@@ -98,6 +120,19 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
   endif()
 endif()
 
+# Refer to prefix symbolically to ease relocation by end user,
+# and match Makefile-generate .pc file exactly.
+if(INSTALL_INC_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/include")
+  set(PC_INSTALL_INC_DIR "\${prefix}/include")
+else()
+  set(PC_INSTALL_INC_DIR "${INSTALL_INC_DIR}")
+endif()
+if(INSTALL_LIB_DIR STREQUAL "${CMAKE_INSTALL_PREFIX}/lib")
+  set(PC_INSTALL_LIB_DIR "\${exec_prefix}/lib")
+else()
+  set(PC_INSTALL_LIB_DIR "${INSTALL_LIB_DIR}")
+endif()
+
 set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
 		${ZLIB_PC} @ONLY)
@@ -187,11 +222,6 @@ if(MSVC)
 	endif()
 endif()
 
-# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents)
-string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*"
-    "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents})
-
 if(MINGW)
     # This gets us DLL resource information when compiling on MinGW.
     if(NOT CMAKE_RC_COMPILER)

diff --git a/tooling/cirrus/ubu1804/Dockerfile b/tooling/cirrus/ubu1804/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:18.04
 
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y cmake gcc libc6-dev ninja-build && \
+    apt-get install --no-install-recommends -y cmake gcc libc6-dev ninja-build make && \
     apt-get clean
diff --git a/tooling/cirrus/ubu2004/Dockerfile b/tooling/cirrus/ubu2004/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:20.04
 
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y cmake gcc libc6-dev ninja-build && \
+    apt-get install --no-install-recommends -y cmake gcc libc6-dev ninja-build make && \
     apt-get clean
diff --git a/tooling/pkgcheck.sh b/tooling/pkgcheck.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Verify that the various build systems produce identical results
+set -ex
+
+# Original build system
+rm -rf btmp1 pkgtmp1
+mkdir btmp1 pkgtmp1
+export DESTDIR=$(pwd)/pkgtmp1
+cd btmp1
+  ../configure
+  make
+  make install
+cd ..
+
+# New build system
+rm -rf btmp2 pkgtmp2
+mkdir btmp2 pkgtmp2
+export DESTDIR=$(pwd)/pkgtmp2
+cd btmp2
+  cmake -G Ninja ..
+  ninja
+  ninja install
+cd ..
+
+if diff -Nur pkgtmp1 pkgtmp2
+then
+  echo pkgcheck-cmake-bits-identical PASS
+else
+  echo pkgcheck-cmake-bits-identical FAIL
+  exit 1
+fi
diff --git a/tooling/test-cmake.sh b/tooling/test-cmake.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Build and test with CMake
+set -ex
+
+rm -rf btmp
+mkdir btmp
+cd btmp
+  cmake -G Ninja ..
+  ninja
+  ctest -V
+cd ..
diff --git a/tooling/test-make.sh b/tooling/test-make.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Build and test with Make
+set -ex
+
+rm -rf btmp
+mkdir btmp
+cd btmp1
+  ../configure
+  make
+  make test
+cd ..
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
@@ -7,8 +7,6 @@
 
 #ifndef ZCONF_H
 #define ZCONF_H
-#cmakedefine Z_PREFIX
-#cmakedefine Z_HAVE_UNISTD_H
 
 /*
  * If you *really* need a unique prefix for all types and library functions,
@@ -433,11 +431,11 @@ typedef uLong FAR uLongf;
    typedef unsigned long z_crc_t;
 #endif
 
-#ifdef HAVE_UNISTD_H    /* may be set to #if 1 by ./configure */
+@ZCONF_UNISTD_LINE@
 #  define Z_HAVE_UNISTD_H
 #endif
 
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
+@ZCONF_STDARG_LINE@
 #  define Z_HAVE_STDARG_H
 #endif
 

diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein
@@ -1,12 +1,12 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@INSTALL_LIB_DIR@
-sharedlibdir=@INSTALL_LIB_DIR@
-includedir=@INSTALL_INC_DIR@
+exec_prefix=${prefix}
+libdir=@PC_INSTALL_LIB_DIR@
+sharedlibdir=${libdir}
+includedir=@PC_INSTALL_INC_DIR@
 
 Name: zlib
 Description: zlib compression library
-Version: @VERSION@
+Version: @ZLIB_FULL_VERSION@
 
 Requires:
 Libs: -L${libdir} -L${sharedlibdir} -lz