Skip to content

Commit

Permalink
Use sljit as a submodule (#443)
Browse files Browse the repository at this point in the history
Co-authored-by: Zoltan Herczeg <hzmester@freemail.hu>
  • Loading branch information
zherczeg and Zoltan Herczeg authored Aug 22, 2024
1 parent 9a5ff3e commit 325f991
Show file tree
Hide file tree
Showing 40 changed files with 25 additions and 52,591 deletions.
14 changes: 11 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Prepare
run: ./autogen.sh
Expand Down Expand Up @@ -36,11 +38,13 @@ jobs:
runs-on: ubuntu-latest
container: alpine
steps:
- name: Setup
run: apk add --no-cache automake autoconf gcc libtool make musl-dev git #musl-locales

- name: Checkout
uses: actions/checkout@v4

- name: Setup
run: apk add --no-cache automake autoconf gcc libtool make musl-dev #musl-locales
with:
submodules: true

- name: Prepare
run: ./autogen.sh
Expand Down Expand Up @@ -69,6 +73,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Configure
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_C_FLAGS='-Wall -Wextra' -B build
Expand Down Expand Up @@ -102,6 +108,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Configure
run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -B build -A Win32
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
submodules: true

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Prepare
run: ./autogen.sh
Expand Down Expand Up @@ -41,6 +43,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Prepare
run: ./autogen.sh
Expand Down Expand Up @@ -69,6 +73,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: true

- name: Prepare
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- name: "Checkout code"
uses: actions/checkout@v4
with:
submodules: true
persist-credentials: false

- name: "Run analysis"
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "deps/sljit"]
path = deps/sljit
url = https://github.com/zherczeg/sljit.git
1 change: 1 addition & 0 deletions deps/sljit
Submodule sljit added at 2c105e
2 changes: 1 addition & 1 deletion src/pcre2_jit_compile.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ pcre2_memctl *allocator = ((pcre2_memctl*)allocator_data);
allocator->free(ptr, allocator->memory_data);
}

#include "sljit/sljitLir.c"
#include "../deps/sljit/sljit_src/sljitLir.c"

#if defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED
#error Unsupported architecture
Expand Down
137 changes: 0 additions & 137 deletions src/sljit/allocator_src/sljitExecAllocatorApple.c

This file was deleted.

Loading

0 comments on commit 325f991

Please sign in to comment.