Skip to content

Json file generation build #1072

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Json file generation build #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e34536
Add bison generated files
bukka Feb 9, 2015
8c138f1
Regenerate json scanner with re2c 0.13.6
bukka Feb 9, 2015
530d1b9
Add option for enabling json file generation
bukka Feb 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/json/Makefile.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$(srcdir)/json_scanner.c: $(srcdir)/json_scanner.re
$(RE2C) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re
$(RE2C_FOR_JSON) -t $(srcdir)/php_json_scanner_defs.h --no-generation-date -bci -o $@ $(srcdir)/json_scanner.re

$(srcdir)/json_parser.tab.c: $(srcdir)/json_parser.y
$(YACC) --defines -l $(srcdir)/json_parser.y -o $@
26 changes: 21 additions & 5 deletions ext/json/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,36 @@ dnl
dnl $Id$
dnl

PHP_ARG_ENABLE(json, whether to enable JavaScript Object Serialization support,
[ --disable-json Disable JavaScript Object Serialization support], yes)
PHP_ARG_ENABLE(json,
whether to enable JavaScript Object Serialization support,
[AS_HELP_STRING([--disable-json], [Disable JavaScript Object Serialization support])],
yes)

AC_ARG_ENABLE(json-filegen,
[AS_HELP_STRING([--enable-json-filegen], [Enable new Json file generation])],
[PHP_JSON_FILEGEN=yes], [PHP_JSON_FILEGEN=no])

if test "$PHP_JSON" != "no"; then
AC_DEFINE([HAVE_JSON],1 ,[whether to enable JavaScript Object Serialization support])
AC_HEADER_STDC

PHP_NEW_EXTENSION(json,
PHP_NEW_EXTENSION(json,
json.c \
json_encoder.c \
json_parser.tab.c \
json_scanner.c,
$ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_INSTALL_HEADERS([ext/json], [php_json.h])
PHP_ADD_MAKEFILE_FRAGMENT()
PHP_INSTALL_HEADERS([ext/json], [php_json.h])

if test "$PHP_JSON_FILEGEN" != "no"; then
if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1306"; then
AC_MSG_WARN([You will need re2c 0.13.6 or later if you want to regenerate JSON scanner.])
RE2C_FOR_JSON="exit 0;"
else
RE2C_FOR_JSON="$RE2C"
fi
PHP_SUBST(RE2C_FOR_JSON)
PHP_ADD_MAKEFILE_FRAGMENT()
fi
PHP_SUBST(JSON_SHARED_LIBADD)
fi
Loading