@port-labs/jq-node-bindings 0.0.4 → 0.0.6

package/binding.gyp

@@ -8,15 +8,15 @@
             "include_dirs": [
                 "<!(node -e \"require('nan')\")",
                 "<(module_root_dir)/",
-                "deps/jq"
+                "deps/jq/src"
             ],
             'conditions': [
                 [
                     'OS=="linux"',
                     {
                         "libraries": [
-                            "../build/deps/libjq.so.1",
                             "-Wl,-rpath='$$ORIGIN/../deps'",
+                            "../build/deps/libjq.so.1",
                         ],
                         'cflags_cc': [
                             '-std=c++17'
@@ -43,7 +43,7 @@
                             '-std=c++17'
                         ],
                         "include_dirs": [
-                            "deps/jq"
+                            "deps/jq/src"
                         ]
                     }
                 ]

package/configure

@@ -11,16 +11,18 @@ echo $scriptdir
 autoreconf -fi
 CPPFLAGS=-D_REENTRANT ./configure \
             --disable-maintainer-mode \
+            --with-oniguruma=builtin \
             --libdir="${scriptdir}/build/deps" \
             --prefix="${scriptdir}/build/deps" $*
 make -j8
-make install-libLTLIBRARIES install-includeHEADERS
 
-# cp modules/oniguruma/src/.libs/libonig.a ${scriptdir}/build/deps/libonig.a
-# cp modules/oniguruma/src/.libs/libonig.la ${scriptdir}/build/deps/libonig.la
-# cp modules/oniguruma/src/.libs/libonig.lai ${scriptdir}/build/deps/libonig.lai
-# cp modules/oniguruma/src/.libs/libonig.4.dylib ${scriptdir}/build/deps/libonig.4.dylib
-# cp modules/oniguruma/src/.libs/libonig.dylib ${scriptdir}/build/deps/libonig.dylib
+cp modules/oniguruma/src/.libs/libonig.a ${scriptdir}/build/deps/libonig.a
+cp modules/oniguruma/src/.libs/libonig.la ${scriptdir}/build/deps/libonig.la
+cp modules/oniguruma/src/.libs/libonig.lai ${scriptdir}/build/deps/libonig.lai
+cp modules/oniguruma/src/.libs/libonig.4.dylib ${scriptdir}/build/deps/libonig.4.dylib
+cp modules/oniguruma/src/.libs/libonig.dylib ${scriptdir}/build/deps/libonig.dylib
+
+make install-libLTLIBRARIES install-includeHEADERS
 
 echo "finished building jq"
 popd &> /dev/null

package/deps/jq/.travis.yml

@@ -2,52 +2,201 @@ sudo: false
 
 language: c
 
-compiler:
-    - gcc
-    - clang
+stages:
+    -   name: test
 
-matrix:
+    -   name: build
+        # Don't run build stage for pull requests to save time and resources.
+        if: type != pull_request
+
+
+jobs:
     include:
-        - compiler: gcc
-          env: COVERAGE="--disable-valgrind --enable-gcov"
+        # Build with gcc and run tests on Ubuntu.
+        -   &test-ubuntu
+            stage: test
+            os: linux
+            compiler: gcc
+
+            addons:
+                apt:
+                    packages:
+                        - valgrind
+                        - bison
+                        - automake
+
+            before_install:
+                - uname -s
+                - rvm install ruby-1.9.3-p551
+                - rvm use 1.9.3
+                - rm src/{lexer,parser}.{c,h}
+                - sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
+
+            install:
+                - bundle install --gemfile=docs/Gemfile
+                - wget http://ftp.debian.org/debian/pool/main/b/bison/bison_3.0.2.dfsg-2_amd64.deb
+                - ar p bison_3.0.2.dfsg-2_amd64.deb data.tar.xz | tar xJ
+                - if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi
+
+            before_script:
+                # If this is OS X we'll get bison from brew, else we'll get bison
+                # from the .deb unpacked above in the install section.
+                - PATH=/usr/local/opt/bison/bin:$PWD/usr/bin:$PATH
+                - echo SHELL=$SHELL
+                - echo PATH=$PATH
+                - which bison
+                - bison --version
+                - autoreconf -if
+                - ./configure --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE
+
+            script:
+                # When using the bison from Debian we need to tell that bison where
+                # to find its data.  Yay non-relocatable code.  Not.
+                - echo PATH=$PATH
+                - which bison
+                - make BISON_PKGDATADIR=$PWD/usr/share/bison src/parser.c || make src/parser.c
+                # Make dist!
+                #
+                # Make it first to fail the build early, before we test with
+                # valgrind.
+                - make dist
+                # Build and test the dist (without valgrind)
+                - |
+                    (
+                    tar xvf jq-`scripts/version`.tar.gz &&
+                    cd jq-`scripts/version` &&
+                    pwd &&
+                    ./configure --disable-valgrind --with-oniguruma=builtin YACC="$(which bison) -y" $COVERAGE &&
+                    make BISON_PKGDATADIR=$PWD/usr/share/bison src/parser.c || make src/parser.c &&
+                    make -j4 &&
+                    make check -j4 || true
+                    )
+                # Build and test the HEAD
+                - make -j4
+                - make check -j4
+
+            after_failure:
+                - cat test-suite.log
+                - cat tests/*.log
+
+
+        # Build with clang and run tests on Ubuntu.
+        -   <<: *test-ubuntu
+            compiler: clang
+
+
+        # Build with gcc and run tests with gcov on Ubuntu.
+        -   <<: *test-ubuntu
+            env: COVERAGE="--disable-valgrind --enable-gcov"
+
+            after_script:
+                - rm -rf src/.libs # don't care about coverage for libjq
+                - coveralls --gcov-options '\-lp'
+                    -e src/lexer.c -e src/parser.c -e src/jv_dtoa.c
+
 
-addons:
-    apt:
-        packages:
-            - libonig-dev
-            - valgrind
+        # Build with gcc and run tests on macOS.
+        -   &test-osx
+            <<: *test-ubuntu
+            os: osx
 
-before_install:
-    - rm lexer.h lexer.c parser.h parser.c
+            before_install:
+                - uname -s
+                - brew update
+                - brew install flex bison
+                - rvm install ruby-1.9.3-p551
+                - rvm use 1.9.3
+                - gem install bundler
+                - rm src/{lexer,parser}.{c,h}
+                - sed -i.bak '/^AM_INIT_AUTOMAKE(\[-Wno-portability 1\.14\])$/s/14/11/' modules/oniguruma/configure.ac
 
-install:
-    - bundle install --gemfile=docs/Gemfile
+            install:
+                - bundle install --gemfile=docs/Gemfile
+                - if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi
 
-    - wget http://ftp.debian.org/debian/pool/main/b/bison/bison_3.0.2.dfsg-2_amd64.deb
-    - ar p bison_3.0.2.dfsg-2_amd64.deb data.tar.xz | tar xJ
 
-    - if [ -n "$COVERAGE" ]; then pip install --user cpp-coveralls; fi
+        # Build with clang and run tests on macOS.
+        -   <<: *test-osx
+            compiler: clang
 
-before_script:
-    - autoreconf -i
-    - ./configure
-        YACC="usr/bin/bison -y"
-        $COVERAGE
 
-script:
-    - make -j4 BISON_PKGDATADIR=$(pwd)/usr/share/bison
-    - make check -j4
+        # Build with gcc and run tests on Alpine Linux v3.7 (inside chroot).
+        # Note: Alpine uses musl libc.
+        -   &test-alpine
+            stage: test
+            os: linux
+            language: minimal
+            compiler: gcc
+            sudo: true
 
-after_script:
-    - |
-        if [ -n "$COVERAGE" ]; then
-            rm -rf .libs usr # don't care about coverage for libjq and bison
-            coveralls -e lexer.c -e parser.c -e jv_dtoa.c --gcov-options '\-lp'
-        fi
+            before_install:
+                - "wget 'https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.7.0/alpine-chroot-install' \
+                    && echo '090d323d887ef3a2fd4e752428553f22a52b87bb  alpine-chroot-install' | sha1sum -c || travis_terminate 1"
+                - alpine() { /alpine/enter-chroot -u "$USER" "$@"; }
+
+            install:
+                - sudo sh alpine-chroot-install -b v3.7 -a "$ARCH"
+                    -p 'build-base automake autoconf bison libtool oniguruma-dev'
+
+            before_script:
+                - autoreconf -if
+
+            script:
+                - alpine ./configure --disable-docs
+                - alpine make
+                - alpine make check
+
+
+        # Build release binary statically linked with musl libc on Alpine Linux
+        # (inside chroot). If building a tagged commit, then deploy release
+        # tarball to GitHub Releases.
+        -   &build-alpine
+            <<: *test-alpine
+            stage: build
+            env: ARCH=x86_64
+
+            script:
+                - alpine ./configure --disable-docs --enable-all-static
+                    CFLAGS='-Os -static -no-pie' CXXFLAGS='-Os -static -no-pie'
+                - alpine make
+                - alpine strip jq
+
+                - jq -V
+                - ls -lah jq
+                - file jq
+                # Ensure that the built executable is really statically linked.
+                - file jq | grep -Fw 'statically linked'
+
+            before_deploy:
+                - PKGNAME="jq-$TRAVIS_TAG-$ARCH-linux"
+                - mkdir $PKGNAME && mv jq $PKGNAME/
+                - tar -czf $PKGNAME.tar.gz $PKGNAME/
+                - sha256sum $PKGNAME.tar.gz > $PKGNAME.tar.gz.sha256
+
+            deploy:
+                provider: releases
+                api_key:
+                    secure:  # TODO: put encrypted GitHub token here!
+                file: jq-$TRAVIS_TAG-*.tar.gz*
+                file_glob: true
+                skip_cleanup: true
+                on:
+                    tags: true
+
+        # Build binaries for other architectures using QEMU user-mode emulation.
+        -   <<: *build-alpine
+            env: ARCH=x86
+
+        -   <<: *build-alpine
+            env: ARCH=aarch64
+
+        -   <<: *build-alpine
+            env: ARCH=armhf
+
+        -   <<: *build-alpine
+            env: ARCH=ppc64le
 
-after_failure:
-    - cat test-suite.log
-    - cat tests/*.log
 
 notifications:
     email: false
+

package/deps/jq/AUTHORS

@@ -4,63 +4,63 @@ Stephen Dolan        <mu@netsoc.tcd.ie>
 Maintained by:
 Nicolas Williams     <nico@cryptonector.com>
 William Langford     <wlangfor@gmail.com>
-David Tolnay         <dtolnay@gmail.com>
 
 Contributions by:
-Andrew Rodland       <andrew@cleverdomain.org>        - bug fixes
-Ankur                <ankz.kothari@gmail.com>         - bug fixes
-Anthony Shortland    <anthony.shortland@me.com>       - rpmbuild target
-Brendan Macmillan    <melbourne.research@gmail.com>   - bug fixes, load library from ~/.jq
-David R. MacIver     <david@drmaciver.com>            - bug fixes
-David Tolnay         <dtolnay@gmail.com>              - destructuring, build improvements
-Filippo Giunchedi    <fgiunchedi@gmail.com>           - bug fixes
-Filippo Valsorda     <filippo.valsorda@gmail.com>     - recursive object merge (`*`)
-Jack Pearkes         <jackpearkes@gmail.com>          - update tutorial
-Jingwen Owen Ou      <jingweno@gmail.com>             - jqplay.org and link to it
-Joe Littlejohn       <joe.littlejohn@nokia.com>       - bug fixes
-Juan Guerrero        <juan.guerrero.lozano@gmail.com> - bug fixes  
-Kenny Shen           <kenny.shen@zalora.com>          - doc fixes
-Lee Thompson         <stagr.lee@gmail.com>            - autoconf stuff
-Markus Lanthaler     <mark_lanthaler@gmx.net>         - doc fixes
-Michael Daines       <michael@mdaines.com>            - add sqrt; doc fixes
-Mike McCabe          <mccabe@archive.org>             - math (libm) functions
-Nicolas Pouillard    <nicolas.pouillard@gmail.com>    - add tests
-Nicolas Williams     <nico@cryptonector.com>          - library-fication, autoconf stuff, exception handling, various
-Peter van Dijk       <peter@7bits.nl>                 - doc fixes
-Philipp Hagemeister  <phihag@phihag.de>               - doc fixes
-polyester            <paul@cleanclothes.org>          - automake version update
-Rémy Léone           <remy.leone@gmail.com>           - add .travis.yml
-Ryoichi KATO         <ryo1kato@gmail.com>             - doc fixes
-Santiago Lapresta    <santiago.lapresta@gmail.com>    - join, arrays, all, any, other filters
-pkoppstein           <pkoppstein@gmail.com>           - various builtins, improvements
-13ren                <melbourne.research@gmail.com>
 Aaron Peschel        <apeschel@zendesk.com>
 Adam Lindberg        <hello@alind.io>
 Alex Chamberlain     <alex@alexchamberlain.co.uk>
 Andrew O'Brien       <obrien.andrew@gmail.com>        - docs build
+Andrew Rodland       <andrew@cleverdomain.org>        - bug fixes
+Ankur                <ankz.kothari@gmail.com>         - bug fixes
+Anthony Shortland    <anthony.shortland@me.com>       - rpmbuild target
 Assaf Gordon         <assafgordon@gmail.com>          - error handling
+Brendan Macmillan    <melbourne.research@gmail.com>   - bug fixes, load library from ~/.jq
 cdnbacon             <mike@busbud.com>
 Charles Merriam      <charles.merriam@gmail.com>
 Colin von Heuring    <colin@janrain.com>
 Damian Gryski        <damian@gryski.com>
+David Fetter         <david@fetter.org>               - added --rawfile
 David Haguenauer     <ml@kurokatta.org>
+David R. MacIver     <david@drmaciver.com>            - bug fixes
+David Tolnay         <dtolnay@gmail.com>              - destructuring, build improvements
 Doug Luce            <doug@github.con.com>            - build
 Eiichi Sato          <sato.eiichi@gmail.com>
+Eric Bréchemier      <eric@egull.co>                  - bug fix
+Filippo Giunchedi    <fgiunchedi@gmail.com>           - bug fixes
+Filippo Valsorda     <filippo.valsorda@gmail.com>     - recursive object merge (`*`)
 Hanfei Shen          <qqshfox@gmail.com>
-Ian Miell            <ian.miell@gmail.com>
 i                    <isomorphisms@sdf.org>
+Ian Miell            <ian.miell@gmail.com>
+Jack Pearkes         <jackpearkes@gmail.com>          - update tutorial
 James Andariese      <james.andariese@locationlabs.com> - Dockerfile
+Jingwen Owen Ou      <jingweno@gmail.com>             - jqplay.org and link to it
 jkleint              <jkleint@gmail.com>
+Joe Littlejohn       <joe.littlejohn@nokia.com>       - bug fixes
 Joel Purra           <code+github@joelpurra.com>
+Juan Guerrero        <juan.guerrero.lozano@gmail.com> - bug fixes
+Kenny Shen           <kenny.shen@zalora.com>          - doc fixes
 Kim De Mey           <kim.demey@gmail.com>            - build
 Kim Toms             <kim.toms@bplglobal.net>
 LCD 47               <lcd047@gmail.com>
-Lee Thompson         <thompson@dtosolutions.com>      - rpm
+Lee Thompson         <stagr.lee@gmail.com>            - autoconf stuff, rpm
 Marc Abramowitz      <marc@marc-abramowitz.com>
 Marc Bruggmann       <marcbr@spotify.com>
+Markus Lanthaler     <mark_lanthaler@gmx.net>         - doc fixes
 Maxime Biais         <maxime.biais@gmail.com>         - build
+Michael Daines       <michael@mdaines.com>            - add sqrt; doc fixes
 Mike Fletcher        <john.m.fletcher@bankofamerica.com>
+Mike McCabe          <mccabe@archive.org>             - math (libm) functions
+Nicolas Pouillard    <nicolas.pouillard@gmail.com>    - add tests
+Nicolas Williams     <nico@cryptonector.com>          - library-fication, autoconf stuff, exception handling, various
+Peter van Dijk       <peter@7bits.nl>                 - doc fixes
+Philipp Hagemeister  <phihag@phihag.de>               - doc fixes
+pkoppstein           <pkoppstein@gmail.com>           - various builtins, improvements
+polyester            <paul@cleanclothes.org>          - automake version update
+Ryoichi KATO         <ryo1kato@gmail.com>             - doc fixes
+Rémy Léone           <remy.leone@gmail.com>           - add .travis.yml
+Santiago Lapresta    <santiago.lapresta@gmail.com>    - join, arrays, all, any, other filters
 Sebastian Freundt    <freundt@ga-group.nl>            - build
+Shaun Guth           <shaun.guth@gmail.com>           - base64d
 Shay Elkin           <shay@everything.me>
 Simon Elsbrock       <simon@iodev.org>                - Debian
 Stefan Seemayer      <stefan@seemayer.de>
@@ -71,3 +71,4 @@ Steven Penny         <svnpenn@gmail.com>              - Windows bug fixes
 tal@whatexit.org     <tal@whatexit.org>
 Travis Gockel        <travis@gockelhut.com>
 Zhiming Wang         <zmwangx@gmail.com>
+13ren                <melbourne.research@gmail.com>

package/deps/jq/COPYING

@@ -30,9 +30,9 @@ license, which can be found at:
 The documentation website includes a copy of Twitter's Boostrap and
 relies on Bonsai, Liquid templates and various other projects, look
 them up for detailed licensing conditions.
-         
 
-         
+
+
 jq incorporates David M. Gay's dtoa.c and g_fmt.c, which bear the
 following notices:
 

package/deps/jq/KEYS

@@ -0,0 +1,8 @@
+pub   4096R/71523402 2015-10-11
+      Key fingerprint = 4FD7 01D6 FA9B 3D2D F5AC  935D AF19 040C 7152 3402
+uid                  jq Release Signing Key <jq@stedolan.github.io>
+
+pub   2048R/D15684DB 2015-10-12 [expires: 2017-10-11]
+      Key fingerprint = 7F6C 7BD3 0412 AFD5 8C1A  5007 EB26 A4F8 D156 84DB
+uid                  Nicolas Williams <nico@cryptonector.com>
+sub   2048R/9C9CCD6A 2015-10-12 [expires: 2017-10-11]

package/deps/jq/Makefile.am

@@ -1,18 +1,22 @@
 
 ### C source files to be built and distributed.
 
-LIBJQ_INCS = jq_parser.h builtin.h bytecode.h compile.h exec_stack.h	\
-   libm.h jv_alloc.h jv_dtoa.h jv_unicode.h locfile.h		 	\
-   opcode_list.h parser.y jv_utf8_tables.h lexer.l util.h linker.h
-
-LIBJQ_SRC = locfile.c bytecode.c compile.c execute.c builtin.c jv.c	\
-  jv_parse.c jv_print.c jv_dtoa.c jv_unicode.c jv_aux.c jv_file.c	\
-  jv_alloc.c jq_test.c util.c linker.c ${LIBJQ_INCS}
+LIBJQ_INCS = src/builtin.h src/bytecode.h src/compile.h                 \
+        src/exec_stack.h src/jq_parser.h src/jv_alloc.h src/jv_dtoa.h   \
+        src/jv_unicode.h src/jv_utf8_tables.h src/lexer.l src/libm.h    \
+        src/linker.h src/locfile.h src/opcode_list.h src/parser.y       \
+        src/util.h
+
+LIBJQ_SRC = src/builtin.c src/bytecode.c src/compile.c src/execute.c    \
+        src/jq_test.c src/jv.c src/jv_alloc.c src/jv_aux.c              \
+        src/jv_dtoa.c src/jv_file.c src/jv_parse.c src/jv_print.c       \
+        src/jv_unicode.c src/linker.c src/locfile.c src/util.c          \
+        ${LIBJQ_INCS}
 
 ### C build options
 
-AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers	\
-  -Wno-unused-parameter -Wno-unused-function
+AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers               \
+        -Wno-unused-parameter -Wno-unused-function
 
 ACLOCAL_AMFLAGS = -I config/m4
 
@@ -21,12 +25,13 @@ ACLOCAL_AMFLAGS = -I config/m4
 # While there is some autoconf macro support for lex/flex, it doesn't support
 # header file creation so we'll use good old make
 if MAINTAINER_MODE
-BUILT_SOURCES = lexer.h lexer.c parser.h parser.c version.h
-lexer.c: lexer.l
-	$(AM_V_LEX) flex -o lexer.c --header-file=lexer.h $<
-lexer.h: lexer.c
+BUILT_SOURCES = src/lexer.h src/lexer.c src/parser.h src/parser.c 	\
+		src/builtin.inc src/version.h
+src/lexer.c: src/lexer.l
+	$(AM_V_LEX) flex -o src/lexer.c --header-file=src/lexer.h $<
+src/lexer.h: src/lexer.c
 else
-BUILT_SOURCES = 
+BUILT_SOURCES = src/builtin.inc src/version.h
 .y.c:
 	$(AM_V_YACC) echo "NOT building parser.c!"
 .l.c:
@@ -43,17 +48,30 @@ AM_YFLAGS = --warnings=all -d
 lib_LTLIBRARIES = libjq.la
 libjq_la_SOURCES = ${LIBJQ_SRC}
 libjq_la_LIBADD = -lm
-libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+
+if WIN32
+libjq_la_LIBADD += -lshlwapi
+endif
 
-include_HEADERS = jv.h jq.h
+include_HEADERS = src/jv.h src/jq.h
+
+if ENABLE_UBSAN
+AM_CFLAGS += -fsanitize=undefined
+endif
 
 ### Running tests under Valgrind
 
+if ENABLE_ASAN
+AM_CFLAGS += -fsanitize=address
+NO_VALGRIND = 1
+else
 if ENABLE_VALGRIND
 NO_VALGRIND =
 else
 NO_VALGRIND = 1
 endif
+endif
 
 ### Code coverage with gcov
 
@@ -65,7 +83,7 @@ endif
 
 if ENABLE_ERROR_INJECTION
 lib_LTLIBRARIES += libinject_errors.la
-libinject_errors_la_SOURCES = inject_errors.c
+libinject_errors_la_SOURCES = src/inject_errors.c
 libinject_errors_la_LIBADD = -ldl
 libinject_errors_la_LDFLAGS = -module
 endif
@@ -77,58 +95,57 @@ endif
 .FORCE:
 generate_ver = ver="`{ $(srcdir)/scripts/version || echo '$(VERSION)' ; } | sed 's/.*/\#define JQ_VERSION \"&\"/'`"
 .remake-version-h: .FORCE
-	@ $(generate_ver); test "x`cat version.h 2>/dev/null`" = "x$$ver" || touch .remake-version-h
-version.h: .remake-version-h
+	@ $(generate_ver); test "x`cat src/version.h 2>/dev/null`" = "x$$ver" || touch .remake-version-h
+src/version.h: .remake-version-h
 	$(AM_V_GEN) $(generate_ver); echo "$$ver" > $@
-main.c: version.h
+src/main.c: src/version.h
+
+src/builtin.inc: src/builtin.jq
+	$(AM_V_GEN) sed -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/^/"/' -e 's/$$/\\n"/' $^ > $@
+src/builtin.o: src/builtin.inc
 
 bin_PROGRAMS = jq
-jq_SOURCES = main.c version.h
+jq_SOURCES = src/main.c src/version.h
 jq_LDFLAGS = -static-libtool-libs
 jq_LDADD = libjq.la -lm
 
+if WIN32
+jq_LDADD += -lshlwapi
+endif
+
 if ENABLE_ALL_STATIC
 jq_LDFLAGS += -all-static
 endif
 
 ### Tests (make check)
 
-TESTS = tests/mantest tests/jqtest tests/onigtest tests/shtest
+TESTS = tests/optionaltest tests/mantest tests/jqtest tests/onigtest tests/shtest tests/utf8test tests/base64test
 TESTS_ENVIRONMENT = NO_VALGRIND=$(NO_VALGRIND)
 
 
 ### Building the manpage
 
-# If ENABLE_DOCS is not set, just copy jq.1.default to jq.1
-# The real_docs target succeeds (possibly after building jq.1) only if ENABLE_DOCS is set
-# Thus, making "dist" depend on "real_docs" ensures that we never build a tarball with
-# a stub manpage.
-
 man_MANS = jq.1
-.PHONY: real_docs
 if ENABLE_DOCS
 jq.1: $(srcdir)/docs/content/3.manual/manual.yml
 	$(AM_V_GEN) ( cd ${abs_srcdir}/docs; '$(BUNDLER)' exec rake manpage ) > $@ || { rm -f $@; false; }
 jq.1.prebuilt: jq.1
 	$(AM_V_GEN) cp $^ $@ || { rm -f $@; false; }
-jq.1.default: $(srcdir)/docs/default_manpage.md
-	$(AM_V_GEN) ( cd ${abs_srcdir}/docs; '$(BUNDLER)' exec rake manpage_default ) > $@ || { rm -f $@; false; }
-real_docs: jq.1 jq.1.prebuilt
-	@if cmp jq.1 $(srcdir)/jq.1.default > /dev/null; then\
-	  rm -f jq.1; $(MAKE) $(AM_MAKEFLAGS) jq.1;\
-	fi
 else
 jq.1: $(srcdir)/jq.1.prebuilt
 	$(AM_V_GEN) cp $^ $@
-real_docs:
-	@echo "Ruby dependencies not found, cannot build manpage." > /dev/stderr
-	@echo "Follow the instructions in docs/README.md to install them" > /dev/stderr
-	@echo "and then rerun ./configure" > /dev/stderr
-	@echo "A pre-built, possibly out-of-date manpage used." > /dev/stderr
-	false
 endif
 
 
+### Build oniguruma
+
+if BUILD_ONIGURUMA
+libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
+SUBDIRS = modules/oniguruma
+endif
+
+AM_CFLAGS += $(onig_CFLAGS)
+
 ### Packaging
 
 docs/site.yml: configure.ac
@@ -138,33 +155,31 @@ docs/site.yml: configure.ac
 install-binaries: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec
 
-# Ensure "make dist" fails when we can't build the real manpage
-dist-hook: real_docs
-
-DOC_FILES = docs/content docs/public docs/templates docs/site.yml	\
-            docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md \
-            docs/default_manpage.md jq.1.default
-
-# setup is only used by distribution developers, not package developers.
-# Still, as a matter of allowing patching, its not a bad idea to distribute 
-# the developer setup script in the tarball.
-EXTRA_DIST = $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER) jq.spec		\
-	$(DOC_FILES) scripts/version parser.h parser.c lexer.h		\
-	lexer.c tests/onig.supp tests/torture/input0.json		\
-	tests/modules/.jq tests/modules/a.jq tests/modules/b/b.jq	\
-	tests/modules/c/c.jq tests/modules/c/d.jq			\
-	tests/modules/lib/jq/e/e.jq tests/modules/lib/jq/f.jq		\
-	tests/setup tests/jq.test tests/onig.test			\
-	tests/modules/data.json						\
-	tests/modules/syntaxerror/syntaxerror.jq			\
-	tests/modules/test_bind_order.jq				\
-	tests/modules/test_bind_order0.jq				\
-	tests/modules/test_bind_order1.jq				\
-	tests/modules/test_bind_order2.jq				\
-	jq.1.prebuilt
-
-
-# README.md is expected in Github projects, good stuff in it, so we'll 
+DOC_FILES = docs/content docs/public docs/templates docs/site.yml       \
+        docs/Gemfile docs/Gemfile.lock docs/Rakefile docs/README.md     \
+        jq.1.prebuilt
+
+EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER)     \
+        jq.1.prebuilt jq.spec src/lexer.c src/lexer.h src/parser.c      \
+        src/parser.h src/version.h src/builtin.jq                       \
+        scripts/version tests/jq.test tests/modules/.jq                 \
+        tests/modules/a.jq tests/modules/b/b.jq tests/modules/c/c.jq    \
+        tests/modules/c/d.jq tests/modules/data.json                    \
+        tests/modules/lib/jq/e/e.jq tests/modules/lib/jq/f.jq           \
+        tests/modules/syntaxerror/syntaxerror.jq                        \
+        tests/modules/test_bind_order.jq                                \
+        tests/modules/test_bind_order0.jq                               \
+        tests/modules/test_bind_order1.jq                               \
+        tests/modules/test_bind_order2.jq tests/onig.supp               \
+        tests/onig.test tests/setup tests/torture/input0.json		\
+        tests/optional.test tests/optionaltest				\
+	tests/utf8-truncate.jq tests/utf8test				\
+	tests/base64.test tests/base64test 				\
+	tests/jq-f-test.sh tests/shtest
+
+
+
+# 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.
 docdir = ${datadir}/doc/${PACKAGE}
 dist_doc_DATA = README.md COPYING AUTHORS README
@@ -187,12 +202,12 @@ dist-clean-local:
 clean-local-docs:
 if ENABLE_DOCS
 	rm -f jq.1
-endif 
+endif
 
 clean-local-gcov:
-	rm -f *.gcno *.gcda *.gcov
+	rm -f src/*.gcno src/*.gcda src/*.gcov
 
 clean-local: clean-local-docs clean-local-gcov
-	rm -f version.h .remake-version-h
+	rm -f src/version.h .remake-version-h
 
 .PHONY: clean-local-docs clean-local-gcov