Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -634,9 +634,9 @@ jobs:
(github.event_name == 'workflow_dispatch' && (inputs.job_id == 'all' || inputs.job_id == 'zebrilus')) ||
github.event_name == 'push'
steps:
- name: Setup
run: |
sudo snap install zig --classic --beta
# The zig version from minimum_zig_version in build.zig.zon will be installed.
- name: Install zig
uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1

- name: Checkout
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ src/stamp-h1
/bazel-*
*.bazel.lock

zig-pkg/
zig-out/
zig-cache/
.zig-cache/
Expand Down
3 changes: 2 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ EXTRA_DIST += \
EXTRA_DIST += \
BUILD.bazel \
MODULE.bazel \
build.zig
build.zig \
build.zig.zon

# These are support files for building under VMS

Expand Down
1 change: 1 addition & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,7 @@ The distribution should contain the files listed below.
BUILD.bazel ) files used by the Bazel
MODULE.bazel ) build system
build.zig file used by zig's build system
build.zig.zon file used by zig's package manager

(G) Auxiliary files for building PCRE2 under OpenVMS

Expand Down
19 changes: 19 additions & 0 deletions build.zig.zon
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.{
.name = .pcre2,
.version = "10.48.0-DEV",

// Do NOT change this for new releases.
// DO change this if making a fork of PCRE2 which is used by any Zig clients.
Comment thread
mrdimidium marked this conversation as resolved.
.fingerprint = 0x914b3d63ebab9e21,

.minimum_zig_version = "0.15.2",
.dependencies = .{},
.paths = .{
"build.zig", "build.zig.zon",
"src/", "doc/",
"deps/", "HACKING",
"INSTALL", "README.md",
"LICENCE.md", "AUTHORS.md",
"SECURITY.md",
},
}
1 change: 1 addition & 0 deletions doc/html/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -991,6 +991,7 @@ The distribution should contain the files listed below.
BUILD.bazel ) files used by the Bazel
MODULE.bazel ) build system
build.zig file used by zig's build system
build.zig.zon file used by zig's package manager

(G) Auxiliary files for building PCRE2 under OpenVMS

Expand Down
1 change: 1 addition & 0 deletions maint/UpdateAlways
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ txt_files=(
RunTest
SECURITY.md
build.zig
build.zig.zon
configure.ac
libpcre2-8.pc.in
libpcre2-16.pc.in
Expand Down
8 changes: 8 additions & 0 deletions maint/UpdateRelease.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
# Script to update all the hardcoded release numbers in the source tree.
# - Documentation manpages.
# - Bazel MODULE file.
# - Zig package manifest.

# This script should be run in the main PCRE2 directory.

import glob
import re

from UpdateCommon import update_file, CURRENT_RELEASE

Expand All @@ -27,3 +29,9 @@ def update_man_version(filename):
# MODULE.bazel
print('Updating MODULE.bazel')
update_file('MODULE.bazel', r'(?m)^ version = ".*?"', ' version = "%s"' % CURRENT_RELEASE)

# build.zig.zon
# Zig requires a semver MAJOR.MINOR.PATCH[-prerelease], so insert .0 as patch.
print('Updating build.zig.zon')
ZIG_VERSION = re.sub(r'^(\d+\.\d+)(.*)$', r'\1.0\2', CURRENT_RELEASE)
update_file('build.zig.zon', r'(?m)^ \.version = ".*?"', ' .version = "%s"' % ZIG_VERSION)
1 change: 1 addition & 0 deletions maint/manifest-tarball
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ drwxr-xr-x tarball-dir/pcre2-SNAPSHOT
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/aclocal.m4
-rwxr-xr-x tarball-dir/pcre2-SNAPSHOT/ar-lib
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/build.zig
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/build.zig.zon
drwxr-xr-x tarball-dir/pcre2-SNAPSHOT/cmake
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/cmake/COPYING-CMAKE-SCRIPTS
-rw-r--r-- tarball-dir/pcre2-SNAPSHOT/cmake/FindEditline.cmake
Expand Down
Loading