summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-01-16 02:51:12 (GMT)
committerEli Schwartz <eschwartz@archlinux.org>2023-01-30 17:55:03 (GMT)
commit7ab223b7fa2f5b28cfaa4c800db78ad82287be40 (patch)
tree22999d2208c0a4cbedb06a1e688433f46cb75a12
parent1f3adea1c68ea61f41903d959b4f98f45aa527a7 (diff)
downloadlz4-7ab223b7fa2f5b28cfaa4c800db78ad82287be40.zip
lz4-7ab223b7fa2f5b28cfaa4c800db78ad82287be40.tar.gz
lz4-7ab223b7fa2f5b28cfaa4c800db78ad82287be40.tar.bz2
build: move meson files from contrib, to go alongside other build systems
-rw-r--r--.github/workflows/ci.yml6
-rw-r--r--build/README.md1
-rw-r--r--build/meson/GetLz4LibraryVersion.py (renamed from contrib/meson/GetLz4LibraryVersion.py)0
-rw-r--r--build/meson/README.md (renamed from contrib/meson/README.md)0
-rw-r--r--build/meson/meson.build (renamed from contrib/meson/meson.build)0
-rw-r--r--build/meson/meson/contrib/gen_manual/meson.build (renamed from contrib/meson/meson/contrib/gen_manual/meson.build)0
-rw-r--r--build/meson/meson/contrib/meson.build (renamed from contrib/meson/meson/contrib/meson.build)0
-rw-r--r--build/meson/meson/examples/meson.build (renamed from contrib/meson/meson/examples/meson.build)0
-rw-r--r--build/meson/meson/lib/meson.build (renamed from contrib/meson/meson/lib/meson.build)0
-rw-r--r--build/meson/meson/meson.build (renamed from contrib/meson/meson/meson.build)0
-rw-r--r--build/meson/meson/ossfuzz/meson.build (renamed from contrib/meson/meson/ossfuzz/meson.build)0
-rw-r--r--build/meson/meson/programs/meson.build (renamed from contrib/meson/meson/programs/meson.build)0
-rw-r--r--build/meson/meson/tests/meson.build (renamed from contrib/meson/meson/tests/meson.build)0
-rw-r--r--build/meson/meson_options.txt (renamed from contrib/meson/meson_options.txt)0
14 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3da024..c9e7eac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -707,15 +707,15 @@ jobs:
-Dcontrib=true
-Dtests=true
-Dexamples=true
- contrib/meson build
+ build/meson builddir
- name: test
run: |
- meson test -C build
+ meson test -C builddir
- name: staging
run: |
- cd build
+ cd builddir
DESTDIR=./staging ninja install
tree ./staging
diff --git a/build/README.md b/build/README.md
index d416aeb..0bf1941 100644
--- a/build/README.md
+++ b/build/README.md
@@ -5,6 +5,7 @@ Projects for various integrated development environments (IDE)
The following projects are included with the lz4 distribution:
- `cmake` - CMake project
+- `meson` - Meson project
- `VS2010` - Visual Studio 2010 project (which also works well with Visual Studio 2012, 2013, 2015)
- `VS2017` - Visual Studio 2017 project
diff --git a/contrib/meson/GetLz4LibraryVersion.py b/build/meson/GetLz4LibraryVersion.py
index d8abfcb..d8abfcb 100644
--- a/contrib/meson/GetLz4LibraryVersion.py
+++ b/build/meson/GetLz4LibraryVersion.py
diff --git a/contrib/meson/README.md b/build/meson/README.md
index 1dc1bd9..1dc1bd9 100644
--- a/contrib/meson/README.md
+++ b/build/meson/README.md
diff --git a/contrib/meson/meson.build b/build/meson/meson.build
index fc6408a..fc6408a 100644
--- a/contrib/meson/meson.build
+++ b/build/meson/meson.build
diff --git a/contrib/meson/meson/contrib/gen_manual/meson.build b/build/meson/meson/contrib/gen_manual/meson.build
index c4349aa..c4349aa 100644
--- a/contrib/meson/meson/contrib/gen_manual/meson.build
+++ b/build/meson/meson/contrib/gen_manual/meson.build
diff --git a/contrib/meson/meson/contrib/meson.build b/build/meson/meson/contrib/meson.build
index ef780fb..ef780fb 100644
--- a/contrib/meson/meson/contrib/meson.build
+++ b/build/meson/meson/contrib/meson.build
diff --git a/contrib/meson/meson/examples/meson.build b/build/meson/meson/examples/meson.build
index 65f54ca..65f54ca 100644
--- a/contrib/meson/meson/examples/meson.build
+++ b/build/meson/meson/examples/meson.build
diff --git a/contrib/meson/meson/lib/meson.build b/build/meson/meson/lib/meson.build
index 4acf614..4acf614 100644
--- a/contrib/meson/meson/lib/meson.build
+++ b/build/meson/meson/lib/meson.build
diff --git a/contrib/meson/meson/meson.build b/build/meson/meson/meson.build
index 3bea06d..3bea06d 100644
--- a/contrib/meson/meson/meson.build
+++ b/build/meson/meson/meson.build
diff --git a/contrib/meson/meson/ossfuzz/meson.build b/build/meson/meson/ossfuzz/meson.build
index 9945d8c..9945d8c 100644
--- a/contrib/meson/meson/ossfuzz/meson.build
+++ b/build/meson/meson/ossfuzz/meson.build
diff --git a/contrib/meson/meson/programs/meson.build b/build/meson/meson/programs/meson.build
index a8bc18a..a8bc18a 100644
--- a/contrib/meson/meson/programs/meson.build
+++ b/build/meson/meson/programs/meson.build
diff --git a/contrib/meson/meson/tests/meson.build b/build/meson/meson/tests/meson.build
index df47b83..df47b83 100644
--- a/contrib/meson/meson/tests/meson.build
+++ b/build/meson/meson/tests/meson.build
diff --git a/contrib/meson/meson_options.txt b/build/meson/meson_options.txt
index 36eedbb..36eedbb 100644
--- a/contrib/meson/meson_options.txt
+++ b/build/meson/meson_options.txt