version update to v1.3.1

.github/workflows/cmake.yml

@@ -1,5 +1,5 @@
 name: CMake
-on: [push, pull_request]
+on: [workflow_dispatch]
 jobs:
   ci-cmake:
     name: ${{ matrix.name }}

.github/workflows/configure.yml

@@ -1,5 +1,5 @@
 name: Configure
-on: [push, pull_request]
+on: [workflow_dispatch]
 jobs:
   ci-configure:
     name: ${{ matrix.name }}

.github/workflows/fuzz.yml

@@ -1,5 +1,5 @@
 name: OSS-Fuzz
-on: [pull_request]
+on: [workflow_dispatch]
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest

.github/workflows/xpbuild.yml

@@ -0,0 +1,30 @@
+name: Build
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "dev" ]
+  workflow_dispatch:
+jobs:
+  linux:
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
+    with:
+      cmake-workflow-preset: Linux
+      runon: ubuntu-latest
+    secrets: inherit
+  linux-arm64:
+    uses: externpro/externpro/.github/workflows/build-linux.yml@25.05.1
+    with:
+      cmake-workflow-preset: Linux
+      runon: ubuntu-24.04-arm
+    secrets: inherit
+  macos:
+    uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1
+    with:
+      cmake-workflow-preset: Darwin
+    secrets: inherit
+  windows:
+    uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1
+    with:
+      cmake-workflow-preset: Windows
+    secrets: inherit

.github/workflows/xprelease.yml

@@ -0,0 +1,20 @@
+name: Release
+on:
+  workflow_dispatch:
+    inputs:
+      workflow_run_url:
+        description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)'
+        required: true
+        type: string
+jobs:
+  # Upload build artifacts as release assets
+  release-from-build:
+    uses: externpro/externpro/.github/workflows/release-from-build.yml@25.05.1
+    with:
+      workflow_run_url: ${{ github.event.inputs.workflow_run_url }}
+      artifact_pattern: "*.tar.xz"
+    permissions:
+      contents: write
+      id-token: write
+      attestations: write
+    secrets: inherit

.gitignore

@@ -34,3 +34,8 @@ contrib/vstudio/vc143/arm64
 contrib/nuget/bin
 contrib/nuget/obj
 *.included
+
+# externpro
+.env
+_bld*/
+docker-compose.override.yml

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".devcontainer"]
+	path = .devcontainer
+	url = https://github.com/externpro/externpro

CMakeLists.txt

@@ -1,17 +1,21 @@
-cmake_minimum_required(VERSION 2.4.4...3.15.0)
+cmake_minimum_required(VERSION 2.4.4...3.31)
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake)
+set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES xproinc)
 
 project(zlib C)
+include(GNUInstallDirs)
+include(xpflags)
 
 set(VERSION "1.3.1")
 
 option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
 
-set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
-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_BIN_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "Installation directory for executables")
+set(INSTALL_LIB_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation directory for libraries")
+set(INSTALL_INC_DIR "${CMAKE_INSTALL_INCLUDEDIR}" CACHE PATH "Installation directory for headers")
+set(INSTALL_MAN_DIR "${CMAKE_INSTALL_DATADIR}/man" CACHE PATH "Installation directory for manual pages")
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_DATADIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
 
 include(CheckTypeSize)
 include(CheckFunctionExists)
@@ -58,8 +62,11 @@ endif()
 #
 check_include_file(unistd.h Z_HAVE_UNISTD_H)
 
-if(MSVC)
+if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
     set(CMAKE_DEBUG_POSTFIX "d")
+endif()
+
+if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
     add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
     include_directories(${CMAKE_CURRENT_SOURCE_DIR})
@@ -152,7 +159,10 @@ endif(MINGW)
 add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
-target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(zlibstatic PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<INSTALL_INTERFACE:${INSTALL_INC_DIR}> #include <zlib/zlib.h>
+  $<INSTALL_INTERFACE:${INSTALL_INC_DIR}/${PROJECT_NAME}> #include <zlib.h>
+  )
 set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
 set_target_properties(zlib PROPERTIES SOVERSION 1)
 
@@ -176,16 +186,34 @@ if(UNIX)
 elseif(BUILD_SHARED_LIBS AND WIN32)
     # Creates zlib1.dll when building shared library version
     set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
+elseif(WIN32)
+    set_target_properties(zlibstatic PROPERTIES OUTPUT_NAME libz)
 endif()
 
+if(NOT SKIP_INSTALL_SHARED_LIBRARIES AND NOT SKIP_INSTALL_ALL)
+    install(TARGETS zlib
+        RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
+        ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
+        LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+endif()
 if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
-    install(TARGETS zlib zlibstatic
+    set(targetsFile ${PROJECT_NAME}-targets)
+    if(DEFINED XP_NAMESPACE)
+        set(XP_NAMESPACE ${XP_NAMESPACE}::)
+        set(nameSpace NAMESPACE ${XP_NAMESPACE})
+    endif()
+    if(NOT DEFINED XP_INSTALL_CMAKEDIR)
+        set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
+    endif()
+    xpPackageDevel(TARGETS_FILE ${targetsFile} LIBRARIES ${XP_NAMESPACE}zlibstatic)
+    install(TARGETS zlibstatic EXPORT ${targetsFile}
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
+    install(EXPORT ${targetsFile} DESTINATION ${XP_INSTALL_CMAKEDIR} ${nameSpace})
 endif()
 if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
-    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}")
+    install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}/${PROJECT_NAME}")
 endif()
 if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
     install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3")

CMakePresets.json

@@ -0,0 +1,8 @@
+{
+  "version": 8,
+  "include": [
+    ".devcontainer/cmake/presets/xpLinuxNinja.json",
+    ".devcontainer/cmake/presets/xpDarwinNinja.json",
+    ".devcontainer/cmake/presets/xpWindowsVs2022.json"
+  ]
+}

CMakePresetsBase.json

@@ -0,0 +1,15 @@
+{
+  "version": 8,
+  "configurePresets": [
+    {
+      "name": "config-base",
+      "hidden": true,
+      "binaryDir": "${sourceDir}/_bld-${presetName}",
+      "cacheVariables": {
+        "XP_NAMESPACE": "xpro",
+        "SKIP_INSTALL_SHARED_LIBRARIES": "ON",
+        "SKIP_INSTALL_FILES": "ON"
+      }
+    }
+  ]
+}

docker-compose.sh

@@ -0,0 +1 @@
+.devcontainer/compose.pro.sh

docker-compose.yml

@@ -0,0 +1 @@
+.devcontainer/compose.bld.yml