projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
b0e9a64
)
cpack: artifacts
author
Michael Wallner
<mike@php.net>
Wed, 16 Dec 2020 14:16:51 +0000
(15:16 +0100)
committer
Michael Wallner
<mike@php.net>
Wed, 16 Dec 2020 14:16:51 +0000
(15:16 +0100)
.builds/openbsd.yml
patch
|
blob
|
history
.github/workflows/cmake-build-ci.gen
patch
|
blob
|
history
.github/workflows/cmake-build-ci.yml
patch
|
blob
|
history
docs/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/.builds/openbsd.yml
b/.builds/openbsd.yml
index 490db5fcf32b1e2cc81d2246d2f1a41b8be808d8..7321c7cd33d48fecdbaeae19eba1bbc9e02e6af6 100644
(file)
--- a/
.builds/openbsd.yml
+++ b/
.builds/openbsd.yml
@@
-6,6
+6,7
@@
packages:
- libevent
- memcached--
- pkgconf
- libevent
- memcached--
- pkgconf
+ - pigz
- py3-sphinx
- py3-m2r
- rsync
- py3-sphinx
- py3-m2r
- rsync
diff --git
a/.github/workflows/cmake-build-ci.gen
b/.github/workflows/cmake-build-ci.gen
index 0859cf405c22dbd7eb24af2a03a37146031cb340..2d07e8dc2b546d65a3db20bf21c8ba6285be8862 100755
(executable)
--- a/
.github/workflows/cmake-build-ci.gen
+++ b/
.github/workflows/cmake-build-ci.gen
@@
-136,11
+136,11
@@
function steps_getdeps() {
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- sudo apt-get install \
+ sudo apt-get install
-my
\
libevent-dev \
libsasl2-dev \
libtbb-dev \
libevent-dev \
libsasl2-dev \
libtbb-dev \
-
python3-
m2r \
+ m2r \
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
@@
-349,6
+349,7
@@
jobs:
name: rel-mac (<?=DEF["macOS"]?>, <?=DEF[DEF["macOS"]]?>, <?=DEF[DEF[DEF["macOS"]]]["ver"]?>)
runs-on: <?=DEF["macOS"]?> #
env:
name: rel-mac (<?=DEF["macOS"]?>, <?=DEF[DEF["macOS"]]?>, <?=DEF[DEF[DEF["macOS"]]]["ver"]?>)
runs-on: <?=DEF["macOS"]?> #
env:
+ CMAKE_BUILD_TYPE: "Release"
ENABLE_SASL: "OFF"
BUILD_DOCS_MANGZ: "ON"
<?php env_override("macOS")?>
ENABLE_SASL: "OFF"
BUILD_DOCS_MANGZ: "ON"
<?php env_override("macOS")?>
@@
-362,6
+363,7
@@
jobs:
name: win-msvc (<?=DEF["Windows"]?>, <?=DEF[DEF["Windows"]]?>, <?=DEF[DEF[DEF["Windows"]]]["ver"]?>)
runs-on: <?=DEF["Windows"]?> #
env:
name: win-msvc (<?=DEF["Windows"]?>, <?=DEF[DEF["Windows"]]?>, <?=DEF[DEF[DEF["Windows"]]]["ver"]?>)
runs-on: <?=DEF["Windows"]?> #
env:
+ CMAKE_BUILD_TYPE: "Release"
ENABLE_SASL: "OFF"
BISON_ROOT: "C:/msys64/usr"
FLEX_ROOT: "C:/msys64/usr"
ENABLE_SASL: "OFF"
BISON_ROOT: "C:/msys64/usr"
FLEX_ROOT: "C:/msys64/usr"
@@
-403,6
+405,7
@@
jobs:
runs-on: ${{ matrix.os_ver }}
continue-on-error: ${{ matrix.cc_vnd == 'clang' }}
env:
runs-on: ${{ matrix.os_ver }}
continue-on-error: ${{ matrix.cc_vnd == 'clang' }}
env:
+ CMAKE_BUILD_TYPE: "Release"
BUILD_DOCS_MANGZ: "ON"
OS_VND: Linux
OS_VER: ${{ matrix.os_ver }}
BUILD_DOCS_MANGZ: "ON"
OS_VND: Linux
OS_VER: ${{ matrix.os_ver }}
diff --git
a/.github/workflows/cmake-build-ci.yml
b/.github/workflows/cmake-build-ci.yml
index 09cfb6706f0ffe47edbc9a85b8394af21ea6acc9..cf86dbbf400cd19ca2bd06f8d0decedd8cfa2628 100644
(file)
--- a/
.github/workflows/cmake-build-ci.yml
+++ b/
.github/workflows/cmake-build-ci.yml
@@
-54,11
+54,11
@@
jobs:
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- sudo apt-get install \
+ sudo apt-get install
-my
\
libevent-dev \
libsasl2-dev \
libtbb-dev \
libevent-dev \
libsasl2-dev \
libtbb-dev \
-
python3-
m2r \
+ m2r \
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
@@
-146,11
+146,11
@@
jobs:
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- sudo apt-get install \
+ sudo apt-get install
-my
\
libevent-dev \
libsasl2-dev \
libtbb-dev \
libevent-dev \
libsasl2-dev \
libtbb-dev \
-
python3-
m2r \
+ m2r \
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
@@
-237,11
+237,11
@@
jobs:
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- sudo apt-get install \
+ sudo apt-get install
-my
\
libevent-dev \
libsasl2-dev \
libtbb-dev \
libevent-dev \
libsasl2-dev \
libtbb-dev \
-
python3-
m2r \
+ m2r \
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
@@
-331,11
+331,11
@@
jobs:
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- sudo apt-get install \
+ sudo apt-get install
-my
\
libevent-dev \
libsasl2-dev \
libtbb-dev \
libevent-dev \
libsasl2-dev \
libtbb-dev \
-
python3-
m2r \
+ m2r \
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
@@
-409,6
+409,7
@@
jobs:
name: rel-mac (macos-10.15, clang, cur)
runs-on: macos-10.15 #
env:
name: rel-mac (macos-10.15, clang, cur)
runs-on: macos-10.15 #
env:
+ CMAKE_BUILD_TYPE: "Release"
ENABLE_SASL: "OFF"
BUILD_DOCS_MANGZ: "ON"
OS_VND: macOS #
ENABLE_SASL: "OFF"
BUILD_DOCS_MANGZ: "ON"
OS_VND: macOS #
@@
-421,11
+422,11
@@
jobs:
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- sudo apt-get install \
+ sudo apt-get install
-my
\
libevent-dev \
libsasl2-dev \
libtbb-dev \
libevent-dev \
libsasl2-dev \
libtbb-dev \
-
python3-
m2r \
+ m2r \
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
@@
-498,6
+499,7
@@
jobs:
name: win-msvc (windows-2019, msvc, cur)
runs-on: windows-2019 #
env:
name: win-msvc (windows-2019, msvc, cur)
runs-on: windows-2019 #
env:
+ CMAKE_BUILD_TYPE: "Release"
ENABLE_SASL: "OFF"
BISON_ROOT: "C:/msys64/usr"
FLEX_ROOT: "C:/msys64/usr"
ENABLE_SASL: "OFF"
BISON_ROOT: "C:/msys64/usr"
FLEX_ROOT: "C:/msys64/usr"
@@
-542,6
+544,7
@@
jobs:
runs-on: ${{ matrix.os_ver }}
continue-on-error: ${{ matrix.cc_vnd == 'clang' }}
env:
runs-on: ${{ matrix.os_ver }}
continue-on-error: ${{ matrix.cc_vnd == 'clang' }}
env:
+ CMAKE_BUILD_TYPE: "Release"
BUILD_DOCS_MANGZ: "ON"
OS_VND: Linux
OS_VER: ${{ matrix.os_ver }}
BUILD_DOCS_MANGZ: "ON"
OS_VND: Linux
OS_VER: ${{ matrix.os_ver }}
@@
-620,11
+623,11
@@
jobs:
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- name: Install dependencies (Linux)
if: runner.os == 'Linux'
run: |
- sudo apt-get install \
+ sudo apt-get install
-my
\
libevent-dev \
libsasl2-dev \
libtbb-dev \
libevent-dev \
libsasl2-dev \
libtbb-dev \
-
python3-
m2r \
+ m2r \
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
python3-sphinx \
${INSTALL_MEMCACHED} \
${INSTALL_CC} ${INSTALL_CXX}
diff --git
a/docs/CMakeLists.txt
b/docs/CMakeLists.txt
index 1240f31ebacca303126ed1a1e1d6a480dc7ac626..303ceada3fa46eeecf4092308b70b9ab0a946524 100644
(file)
--- a/
docs/CMakeLists.txt
+++ b/
docs/CMakeLists.txt
@@
-87,7
+87,7
@@
else()
set(MAN_EXT ".gz")
add_custom_target(man_gz ALL
${GZIP} -kf ${SPHINX_MAN_DIR}/*.{1,3}
set(MAN_EXT ".gz")
add_custom_target(man_gz ALL
${GZIP} -kf ${SPHINX_MAN_DIR}/*.{1,3}
- DEPENDS
man
+ DEPENDS
${SPHINX_MAN_DIR}
)
endif()
endif()
)
endif()
endif()