Make maintainer-mode default to disabled
This makes the standard build instructions a bit easier, just ./configure, and also requires less tools installed (bison). Also i think few people probably want to generate the lexer and paser code.
This commit is contained in:
1 parent
4cc99831e4
commit
54fef09ac3
10 files changed
+13
-30
No files matched your search
@@ -90,7 +90,6 @@ jobs:
|
|||||||
./configure \
|
./configure \
|
||||||
--host=${{ matrix.CC }} \
|
--host=${{ matrix.CC }} \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--disable-valgrind \
|
--disable-valgrind \
|
||||||
--with-oniguruma=builtin \
|
--with-oniguruma=builtin \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
@@ -156,7 +155,6 @@ jobs:
|
|||||||
./configure \
|
./configure \
|
||||||
--host="${{ matrix.target }}$(uname -r)" \
|
--host="${{ matrix.target }}$(uname -r)" \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--disable-valgrind \
|
--disable-valgrind \
|
||||||
--with-oniguruma=builtin \
|
--with-oniguruma=builtin \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
@@ -233,7 +231,6 @@ jobs:
|
|||||||
./configure \
|
./configure \
|
||||||
--host=${{ matrix.CC }} \
|
--host=${{ matrix.CC }} \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--disable-valgrind \
|
--disable-valgrind \
|
||||||
--with-oniguruma=builtin \
|
--with-oniguruma=builtin \
|
||||||
--disable-shared \
|
--disable-shared \
|
||||||
@@ -282,7 +279,6 @@ jobs:
|
|||||||
autoreconf -i
|
autoreconf -i
|
||||||
./configure \
|
./configure \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--disable-valgrind \
|
--disable-valgrind \
|
||||||
--with-oniguruma=builtin
|
--with-oniguruma=builtin
|
||||||
make distcheck
|
make distcheck
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ jobs:
|
|||||||
autoreconf -i
|
autoreconf -i
|
||||||
./configure \
|
./configure \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--with-oniguruma=yes
|
--with-oniguruma=yes
|
||||||
make -j"$(nproc)"
|
make -j"$(nproc)"
|
||||||
file ./jq
|
file ./jq
|
||||||
@@ -55,7 +54,6 @@ jobs:
|
|||||||
autoreconf -i
|
autoreconf -i
|
||||||
./configure \
|
./configure \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--with-oniguruma=no
|
--with-oniguruma=no
|
||||||
make -j"$(nproc)"
|
make -j"$(nproc)"
|
||||||
file ./jq
|
file ./jq
|
||||||
|
|||||||
@@ -48,10 +48,7 @@ jobs:
|
|||||||
CC: ${{ matrix.compiler }}
|
CC: ${{ matrix.compiler }}
|
||||||
MAKEVARS: ${{ matrix.makevars }}
|
MAKEVARS: ${{ matrix.makevars }}
|
||||||
run: |
|
run: |
|
||||||
autoreconf -i
|
./configure --with-oniguruma=builtin $COVERAGE
|
||||||
rm src/lexer.c src/lexer.h
|
|
||||||
rm src/parser.c src/parser.h
|
|
||||||
./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE
|
|
||||||
scan-build --keep-going make -j4
|
scan-build --keep-going make -j4
|
||||||
- name: Test
|
- name: Test
|
||||||
env:
|
env:
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
./configure \
|
./configure \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--with-oniguruma=builtin
|
--with-oniguruma=builtin
|
||||||
make -j"$(nproc)"
|
make -j"$(nproc)"
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ COPY . /app
|
|||||||
RUN autoreconf -i \
|
RUN autoreconf -i \
|
||||||
&& ./configure \
|
&& ./configure \
|
||||||
--disable-docs \
|
--disable-docs \
|
||||||
--disable-maintainer-mode \
|
|
||||||
--disable-valgrind \
|
--disable-valgrind \
|
||||||
--with-oniguruma=builtin \
|
--with-oniguruma=builtin \
|
||||||
--enable-static \
|
--enable-static \
|
||||||
|
|||||||
+1
-1
@@ -229,7 +229,7 @@ EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) \
|
|||||||
tests/jq.test tests/onig.test tests/base64.test \
|
tests/jq.test tests/onig.test tests/base64.test \
|
||||||
tests/utf8-truncate.jq tests/jq-f-test.sh
|
tests/utf8-truncate.jq tests/jq-f-test.sh
|
||||||
|
|
||||||
AM_DISTCHECK_CONFIGURE_FLAGS=--disable-maintainer-mode --with-oniguruma=builtin
|
AM_DISTCHECK_CONFIGURE_FLAGS=--with-oniguruma=builtin
|
||||||
|
|
||||||
# README.md is expected in GitHub projects, good stuff in it, so we'll
|
# README.md is expected in GitHub projects, good stuff in it, so we'll
|
||||||
# distribute it and install it with the package in the doc directory.
|
# distribute it and install it with the package in the doc directory.
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ Source tarball and built executable releases can be found on the
|
|||||||
homepage and on the github release page, https://github.com/jqlang/jq/releases.
|
homepage and on the github release page, https://github.com/jqlang/jq/releases.
|
||||||
Docker image is available at https://github.com/jqlang/jq/pkgs/container/jq.
|
Docker image is available at https://github.com/jqlang/jq/pkgs/container/jq.
|
||||||
|
|
||||||
If you're building directly from the latest git, you'll need flex,
|
If you're building directly from the latest git, you'll need libtool, make, automake,
|
||||||
bison (3.0 or newer), libtool, make, automake, and autoconf installed.
|
and autoconf installed.
|
||||||
To get regexp support you'll also need to install Oniguruma or clone it as a
|
To get regexp support you'll also need to install Oniguruma or clone it as a
|
||||||
git submodule as per the instructions below. To build, run:
|
git submodule as per the instructions below. To build, run:
|
||||||
|
|
||||||
@@ -29,13 +29,8 @@ git submodule as per the instructions below. To build, run:
|
|||||||
make -j8
|
make -j8
|
||||||
make check
|
make check
|
||||||
|
|
||||||
To build without bison or flex, add `--disable-maintainer-mode` to the
|
Developers must `--enable-maintainer-mode` when making changes to the
|
||||||
./configure invocation:
|
jq parser and lexer which also requires bison and flex to be installed.
|
||||||
|
|
||||||
./configure --with-oniguruma=builtin --disable-maintainer-mode
|
|
||||||
|
|
||||||
(Developers must not use `--disable-maintainer-mode`, not when making
|
|
||||||
changes to the jq parser and/or lexer.)
|
|
||||||
|
|
||||||
To build a statically linked version of jq, run:
|
To build a statically linked version of jq, run:
|
||||||
|
|
||||||
@@ -71,7 +66,7 @@ To compile jq to WebAssembly, install the [Emscripten SDK](https://emscripten.or
|
|||||||
|
|
||||||
git submodule update --init # if building from git to get oniguruma
|
git submodule update --init # if building from git to get oniguruma
|
||||||
autoreconf -i # if building from git
|
autoreconf -i # if building from git
|
||||||
emconfigure ./configure --with-oniguruma=builtin --disable-maintainer-mode
|
emconfigure ./configure --with-oniguruma=builtin
|
||||||
emmake make EXEEXT=.js CFLAGS="-O2" LDFLAGS="-s EXPORTED_RUNTIME_METHODS=['callMain']"
|
emmake make EXEEXT=.js CFLAGS="-O2" LDFLAGS="-s EXPORTED_RUNTIME_METHODS=['callMain']"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -89,7 +89,7 @@ cd "${builddir}/"
|
|||||||
cd ${cwd}
|
cd ${cwd}
|
||||||
[[ ! -f ./configure ]] && autoreconf -ivf
|
[[ ! -f ./configure ]] && autoreconf -ivf
|
||||||
CC=${CC} LDFLAGS=${LDFLAGS} \
|
CC=${CC} LDFLAGS=${LDFLAGS} \
|
||||||
./configure --host=${HOST} --build=$(./config/config.guess) --enable-docs=no --enable-shared=no --enable-static=yes --prefix=/ --with-oniguruma=${cwd}/ios/onig/${arch} $(test -z ${BISON+x} && echo '--disable-maintainer-mode')
|
./configure --host=${HOST} --build=$(./config/config.guess) --enable-docs=no --enable-shared=no --enable-static=yes --prefix=/ --with-oniguruma=${cwd}/ios/onig/${arch} $(test -z ${BISON+x} || echo '--enable-maintainer-mode')
|
||||||
make -j${MAKEJOBS} install DESTDIR="${cwd}/ios/jq/${arch}"
|
make -j${MAKEJOBS} install DESTDIR="${cwd}/ios/jq/${arch}"
|
||||||
make clean
|
make clean
|
||||||
done
|
done
|
||||||
|
|||||||
+2
-2
@@ -9,7 +9,7 @@ AC_USE_SYSTEM_EXTENSIONS
|
|||||||
AM_INIT_AUTOMAKE([1.11.2 subdir-objects parallel-tests foreign -Wall])
|
AM_INIT_AUTOMAKE([1.11.2 subdir-objects parallel-tests foreign -Wall])
|
||||||
AM_SILENT_RULES([yes])
|
AM_SILENT_RULES([yes])
|
||||||
AM_PROG_AR
|
AM_PROG_AR
|
||||||
AM_MAINTAINER_MODE([enable])
|
AM_MAINTAINER_MODE([disable])
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
|
m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
|
||||||
AC_PROG_CPP_WERROR
|
AC_PROG_CPP_WERROR
|
||||||
@@ -33,7 +33,7 @@ if test "$USE_MAINTAINER_MODE" = yes; then
|
|||||||
else
|
else
|
||||||
AX_PROG_BISON_VERSION([3],
|
AX_PROG_BISON_VERSION([3],
|
||||||
[],
|
[],
|
||||||
[AC_MSG_ERROR([You need bison version 3.0 or greater, or use --disable-maintainer-mode.])])
|
[AC_MSG_ERROR([You need bison version 3.0 or greater])])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_CHECK_PROGS(LEX, flex lex)
|
AC_CHECK_PROGS(LEX, flex lex)
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ body:
|
|||||||
git clone --recursive https://github.com/jqlang/jq.git
|
git clone --recursive https://github.com/jqlang/jq.git
|
||||||
cd jq
|
cd jq
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
./configure --disable-maintainer-mode
|
./configure
|
||||||
make
|
make
|
||||||
sudo make install
|
sudo make install
|
||||||
|
|
||||||
@@ -181,9 +181,8 @@ body:
|
|||||||
by Apple. This can be found in [Homebrew](http://brew.sh) or
|
by Apple. This can be found in [Homebrew](http://brew.sh) or
|
||||||
[MacPorts](https://macports.org/).
|
[MacPorts](https://macports.org/).
|
||||||
|
|
||||||
The `--disable-maintainer-mode` flag says to use the pre-generated lexer
|
If you want to generate the lexer and parser from source you can use the
|
||||||
and parser that come with the code. To compile the lexer and parser also
|
`--enable-maintainer-mode` configure flag. This requires bison to be installed.
|
||||||
from source, leave out this flag. You will need to install
|
|
||||||
[Flex](https://github.com/westes/flex) and
|
[Flex](https://github.com/westes/flex) and
|
||||||
[Bison](https://www.gnu.org/software/bison/).
|
[Bison](https://www.gnu.org/software/bison/).
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user