Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Remove unused libmbfl build system related files 

PHP build system already builds necessary files also from libmbfl
directory using the mbstring config.m4 file.
pull/3415/merge
Peter Kokot 8 years ago
parent
b12cece8d5
commit
255e29f3bc
14 changed files with 0 additions and 478 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      .gitignore
  2. 12
      ext/mbstring/libmbfl/INSTALL
  3. 7
      ext/mbstring/libmbfl/Makefile.am
  4. 2
      ext/mbstring/libmbfl/README
  5. 6
      ext/mbstring/libmbfl/buildconf
  6. 49
      ext/mbstring/libmbfl/configure.ac
  7. 269
      ext/mbstring/libmbfl/filters/Makefile.am
  8. 48
      ext/mbstring/libmbfl/mbfl/Makefile.am
  9. 25
      ext/mbstring/libmbfl/nls/Makefile.am
  10. 10
      ext/mbstring/libmbfl/tests/Makefile.am
  11. 31
      ext/mbstring/libmbfl/tests/conv_encoding.tests/Makefile.am
  12. 1
      ext/mbstring/libmbfl/tests/conv_kana.tests/Makefile.am
  13. 1
      ext/mbstring/libmbfl/tests/strcut.tests/Makefile.am
  14. 1
      ext/mbstring/libmbfl/tests/strwidth.tests/Makefile.am

16
.gitignore
View File

@ -156,22 +156,6 @@ ext/iconv/php_have_iconv.h
ext/iconv/php_iconv_supports_errno.h
ext/iconv/php_iconv_broken_ignore.h
ext/iconv/php_iconv_aliased_libiconv.h
ext/mbstring/libmbfl/Makefile.in
ext/mbstring/libmbfl/autoscan.log
ext/mbstring/libmbfl/config.sub
ext/mbstring/libmbfl/depcomp
ext/mbstring/libmbfl/ltmain.sh
ext/mbstring/libmbfl/stamp-h1
ext/mbstring/libmbfl/*.dll
ext/mbstring/libmbfl/*.lib
ext/mbstring/libmbfl/*.RES
ext/mbstring/libmbfl/*.res
ext/mbstring/libmbfl/*.obj
ext/mbstring/libmbfl/*.tds
ext/mbstring/libmbfl/filters/Makefile.in
ext/mbstring/libmbfl/mbfl/Makefile.in
ext/mbstring/libmbfl/mbfl/EastAsianWidth.txt
ext/mbstring/libmbfl/nls/Makefile.in
ext/mbstring/oniguruma/oniguruma.h
ext/oci8/tests/*.vglog
ext/pdo/conftest*

12
ext/mbstring/libmbfl/INSTALL
View File

@ -1,12 +0,0 @@
For UNIX compatible system,
./buildconf
./configure
make
make install
For Windows,
Visual C++ 6.0 and Borland C++ 5.0 is suppoted.

7
ext/mbstring/libmbfl/Makefile.am
View File

@ -1,7 +0,0 @@
AUTOMAKE_OPTIONS=dejagnu
DEJATOOL=conv_encoding conv_kana strwidth strcut
RUNTESTDEFAULTFLAGS=--tool $$tool --srcdir "$$srcdir"/tests
LANG=C
EXTRA_DIST=AUTHORS DISCLAIMER LICENSE buildconf
SUBDIRS = nls filters mbfl tests
CLEANFILES=*.log *.sum

2
ext/mbstring/libmbfl/README
View File

@ -9,5 +9,3 @@ is not in sync with the upstream at https://github.com/moriyoshi/libmbfl. As suc
the libmbfl directory is directly modified in the php-src repository.
See LICENSE and DISCLAIMER for licensing information.
See INSTALL for building and installation instructions.

6
ext/mbstring/libmbfl/buildconf
View File

@ -1,6 +0,0 @@
#!/bin/sh
libtoolize -c -f --automake
aclocal
autoheader
automake -a -c --foreign
autoconf

49
ext/mbstring/libmbfl/configure.ac
View File

@ -1,49 +0,0 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(mbfl/mbfilter.c)
AM_INIT_AUTOMAKE(libmbfl, 1.1.0)
AC_CONFIG_SRCDIR(mbfl/mbfilter.c)
AM_CONFIG_HEADER(config.h)
# SHLIB isn't a version number but the API reference
# Read http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
SHLIB_VERSION="1:1:0"
AC_SUBST(SHLIB_VERSION)
# Checks for programs.
AC_PROG_CC
AC_PROG_CXX
AC_PROG_LIBTOOL
AC_PROG_RANLIB
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([stdlib.h stddef.h assert.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_REALLOC
AC_CHECK_FUNCS([strcasecmp strchr])
AC_CHECK_PROGS([FETCH_VIA_FTP], [wget curl ncftpget])
if test "$FETCH_VIA_FTP" = "curl"; then
FETCH_VIA_FTP="curl -O"
fi
AC_CONFIG_FILES([
Makefile
mbfl/Makefile
filters/Makefile
nls/Makefile
tests/Makefile
tests/conv_encoding.tests/Makefile
tests/conv_kana.tests/Makefile
tests/strwidth.tests/Makefile
tests/strcut.tests/Makefile])
AC_OUTPUT

269
ext/mbstring/libmbfl/filters/Makefile.am
View File

@ -1,269 +0,0 @@
EXTRA_DIST=Makefile.bcc32 mk_sb_tbl.awk
noinst_LTLIBRARIES=libmbfl_filters.la
INCLUDES=-I../mbfl
PERL=perl
libmbfl_filters_la_LDFLAGS=-version-info $(SHLIB_VERSION)
libmbfl_filters_la_SOURCES=mbfilter_cp936.c \
mbfilter_hz.c \
mbfilter_euc_tw.c \
mbfilter_big5.c \
mbfilter_euc_jp.c \
mbfilter_jis.c \
mbfilter_iso8859_1.c \
mbfilter_iso8859_2.c \
mbfilter_cp1254.c \
mbfilter_cp1252.c \
mbfilter_cp1251.c \
mbfilter_ascii.c \
mbfilter_iso8859_3.c \
mbfilter_iso8859_4.c \
mbfilter_iso8859_5.c \
mbfilter_iso8859_6.c \
mbfilter_iso8859_7.c \
mbfilter_iso8859_8.c \
mbfilter_iso8859_9.c \
mbfilter_iso8859_10.c \
mbfilter_iso8859_13.c \
mbfilter_iso8859_14.c \
mbfilter_iso8859_15.c \
mbfilter_iso8859_16.c \
mbfilter_htmlent.c \
mbfilter_byte2.c \
mbfilter_byte4.c \
mbfilter_uuencode.c \
mbfilter_base64.c \
mbfilter_sjis.c \
mbfilter_sjis_2004.c \
mbfilter_sjis_open.c \
mbfilter_sjis_mobile.c \
mbfilter_sjis_mac.c \
mbfilter_7bit.c \
mbfilter_qprint.c \
mbfilter_ucs4.c \
mbfilter_ucs2.c \
mbfilter_utf32.c \
mbfilter_utf16.c \
mbfilter_utf8.c \
mbfilter_utf8_mobile.c \
mbfilter_utf7.c \
mbfilter_utf7imap.c \
mbfilter_euc_jp_win.c \
mbfilter_euc_jp_2004.c \
mbfilter_cp932.c \
mbfilter_cp51932.c \
mbfilter_euc_cn.c \
mbfilter_euc_kr.c \
mbfilter_uhc.c \
mbfilter_iso2022_jp_ms.c \
mbfilter_iso2022jp_2004.c \
mbfilter_iso2022jp_mobile.c \
mbfilter_gb18030.c \
mbfilter_iso2022_kr.c \
mbfilter_cp866.c \
mbfilter_koi8r.c \
mbfilter_koi8u.c \
mbfilter_armscii8.c \
mbfilter_cp850.c \
mbfilter_cp5022x.c \
mbfilter_tl_jisx0201_jisx0208.c \
html_entities.c \
cp932_table.h \
html_entities.h \
mbfilter_7bit.h \
mbfilter_ascii.h \
mbfilter_base64.h \
mbfilter_big5.h \
mbfilter_byte2.h \
mbfilter_byte4.h \
mbfilter_cp1251.h \
mbfilter_cp1252.h \
mbfilter_cp1254.h \
mbfilter_cp866.h \
mbfilter_cp932.h \
mbfilter_cp936.h \
mbfilter_gb18030.h \
mbfilter_euc_cn.h \
mbfilter_euc_jp.h \
mbfilter_euc_jp_2004.h \
mbfilter_euc_jp_win.h \
mbfilter_euc_kr.h \
mbfilter_euc_tw.h \
mbfilter_htmlent.h \
mbfilter_hz.h \
mbfilter_iso2022_jp_ms.h \
mbfilter_iso2022jp_2004.h \
mbfilter_iso2022jp_mobile.h \
mbfilter_iso2022_kr.h \
mbfilter_iso8859_1.h \
mbfilter_iso8859_10.h \
mbfilter_iso8859_13.h \
mbfilter_iso8859_14.h \
mbfilter_iso8859_15.h \
mbfilter_iso8859_16.h \
mbfilter_iso8859_2.h \
mbfilter_iso8859_3.h \
mbfilter_iso8859_4.h \
mbfilter_iso8859_5.h \
mbfilter_iso8859_6.h \
mbfilter_iso8859_7.h \
mbfilter_iso8859_8.h \
mbfilter_iso8859_9.h \
mbfilter_jis.h \
mbfilter_koi8r.h \
mbfilter_koi8u.h \
mbfilter_armscii8.h \
mbfilter_qprint.h \
mbfilter_sjis.h \
mbfilter_sjis_open.h \
mbfilter_sjis_mobile.h \
mbfilter_sjis_mac.h \
mbfilter_ucs2.h \
mbfilter_ucs4.h \
mbfilter_uhc.h \
mbfilter_utf16.h \
mbfilter_utf32.h \
mbfilter_utf7.h \
mbfilter_utf7imap.h \
mbfilter_utf8.h \
mbfilter_utf8_mobile.h \
mbfilter_uuencode.h \
mbfilter_cp5022x.h \
mbfilter_cp51932.h \
mbfilter_cp850.h \
mbfilter_tl_jisx0201_jisx0208.h \
unicode_prop.h \
unicode_table_big5.h \
unicode_table_cns11643.h \
unicode_table_cp1251.h \
unicode_table_cp1252.h \
unicode_table_cp1254.h \
unicode_table_cp866.h \
unicode_table_cp932_ext.h \
unicode_table_cp936.h \
unicode_table_iso8859_10.h \
unicode_table_iso8859_13.h \
unicode_table_iso8859_14.h \
unicode_table_iso8859_15.h \
unicode_table_iso8859_16.h \
unicode_table_iso8859_2.h \
unicode_table_iso8859_3.h \
unicode_table_iso8859_4.h \
unicode_table_iso8859_5.h \
unicode_table_iso8859_6.h \
unicode_table_iso8859_7.h \
unicode_table_iso8859_8.h \
unicode_table_iso8859_9.h \
unicode_table_jis.h \
unicode_table_koi8r.h \
unicode_table_koi8u.h \
unicode_table_armscii8.h \
unicode_table_cp850.h \
unicode_table_uhc.h \
unicode_table_gb18030.h \
translit_kana_jisx0201_jisx0208.h \
emoji2uni.h
mbfilter_iso8859_2.c: unicode_table_iso8859_2.h
mbfilter_iso8859_3.c: unicode_table_iso8859_3.h
mbfilter_iso8859_4.c: unicode_table_iso8859_4.h
mbfilter_iso8859_5.c: unicode_table_iso8859_5.h
mbfilter_iso8859_6.c: unicode_table_iso8859_6.h
mbfilter_iso8859_7.c: unicode_table_iso8859_7.h
mbfilter_iso8859_8.c: unicode_table_iso8859_8.h
mbfilter_iso8859_9.c: unicode_table_iso8859_9.h
mbfilter_iso8859_10.c: unicode_table_iso8859_10.h
mbfilter_iso8859_11.c: unicode_table_iso8859_11.h
mbfilter_iso8859_13.c: unicode_table_iso8859_13.h
mbfilter_iso8859_14.c: unicode_table_iso8859_13.h
mbfilter_iso8859_15.c: unicode_table_iso8859_15.h
mbfilter_iso8859_16.c: unicode_table_iso8859_16.h
8859-1.TXT 8859-2.TXT 8859-3.TXT 8859-4.TXT 8859-5.TXT 8859-6.TXT \
8859-7.TXT 8859-8.TXT 8859-9.TXT 8859-10.TXT 8859-11.TXT 8859-13.TXT \
8859-14.TXT 8859-15.TXT 8859-16.TXT:
$(FETCH_VIA_FTP) ftp://ftp.unicode.org/Public/MAPPINGS/ISO8859/$@
unicode_table_iso8859_1.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_1_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_1_H -f mk_sb_tbl.awk 8859-1.TXT > $@
unicode_table_iso8859_2.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_2_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_2_H -f mk_sb_tbl.awk 8859-2.TXT > $@
unicode_table_iso8859_3.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_3_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_3_H -f mk_sb_tbl.awk 8859-3.TXT > $@
unicode_table_iso8859_4.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_4_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_4_H -f mk_sb_tbl.awk 8859-4.TXT > $@
unicode_table_iso8859_5.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_5_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_5_H -f mk_sb_tbl.awk 8859-5.TXT > $@
unicode_table_iso8859_6.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_6_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_6_H -f mk_sb_tbl.awk 8859-6.TXT > $@
unicode_table_iso8859_7.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_7_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_7_H -f mk_sb_tbl.awk 8859-7.TXT > $@
unicode_table_iso8859_8.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_8_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_8_H -f mk_sb_tbl.awk 8859-8.TXT > $@
unicode_table_iso8859_9.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_9_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_9_H -f mk_sb_tbl.awk 8859-9.TXT > $@
unicode_table_iso8859_10.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_10_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_10_H -f mk_sb_tbl.awk 8859-10.TXT > $@
unicode_table_iso8859_11.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_11_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_11_H -f mk_sb_tbl.awk 8859-11.TXT > $@
unicode_table_iso8859_13.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_13_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_13_H -f mk_sb_tbl.awk 8859-13.TXT > $@
unicode_table_iso8859_14.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_14_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_14_H -f mk_sb_tbl.awk 8859-14.TXT > $@
unicode_table_iso8859_15.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_15_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLE_ISO8859_15_H -f mk_sb_tbl.awk 8859-15.TXT > $@
unicode_table_iso8859_16.h: mk_sb_tbl.awk
$(AWK) -v TABLE_NAME=iso8859_16_ucs_table \
-v IFNDEF_NAME=UNICODE_TABLEISO8859_16_H -f mk_sb_tbl.awk 8859-16.TXT > $@
EmojiSources.txt :
$(FETCH_VIA_FTP) ftp://ftp.unicode.org/Public/UNIDATA/$@
emoji2uni.h : mk_emoji_tbl.pl
$(PERL) mk_emoji_tbl.pl EmojiSources.txt
unidata: 8859-1.TXT 8859-2.TXT 8859-3.TXT 8859-4.TXT 8859-5.TXT 8859-6.TXT \
8859-7.TXT 8859-8.TXT 8859-9.TXT 8859-10.TXT 8859-11.TXT 8859-13.TXT \
8859-14.TXT 8859-15.TXT 8859-16.TXT EmojiSources.txt
.PHONY: unidata

48
ext/mbstring/libmbfl/mbfl/Makefile.am
View File

@ -1,48 +0,0 @@
EXTRA_DIST=mk_eaw_tbl.awk
lib_LTLIBRARIES=libmbfl.la
libmbfl_la_SOURCES=mbfilter.c \
mbfl_string.c \
mbfl_language.c \
mbfl_encoding.c \
mbfl_convert.c \
mbfl_ident.c \
mbfl_memory_device.c \
mbfl_allocators.c \
mbfl_filter_output.c \
mbfilter_pass.c \
mbfilter_wchar.c \
mbfilter_8bit.c \
eaw_table.h
libmbfl_filters_la=../filters/libmbfl_filters.la
libmbfl_nls_la=../nls/libmbfl_nls.la
libmbfl_la_LIBADD=$(libmbfl_filters_la) $(libmbfl_nls_la)
libmbfl_la_LDFLAGS=-version-info $(SHLIB_VERSION)
libmbfl_includedir=$(includedir)/mbfl
libmbfl_include_HEADERS=mbfilter.h \
mbfl_consts.h \
mbfl_encoding.h \
mbfl_language.h \
mbfl_string.h \
mbfl_convert.h \
mbfl_ident.h \
mbfl_memory_device.h \
mbfl_allocators.h \
mbfl_defs.h \
mbfl_filter_output.h \
mbfilter_pass.h \
mbfilter_wchar.h \
mbfilter_8bit.h
mbfilter.c: eaw_table.h
eaw_table.h: mk_eaw_tbl.awk
$(AWK) -v TABLE_NAME=mbfl_eaw_table -f mk_eaw_tbl.awk EastAsianWidth.txt > $@
EastAsianWidth.txt:
$(FETCH_VIA_FTP) ftp://ftp.unicode.org/Public/UNIDATA/EastAsianWidth.txt
$(libmbfl_filters_la):
$(MAKE) -C `dirname $(libmbfl_filters_la)`
$(libmbfl_nls_la):
$(MAKE) -C `dirname $(libmbfl_nls_la)`

25
ext/mbstring/libmbfl/nls/Makefile.am
View File

@ -1,25 +0,0 @@
noinst_LTLIBRARIES=libmbfl_nls.la
INCLUDES=-I../mbfl
libmbfl_nls_la_LDFLAGS=-version-info $(SHLIB_VERSION)
libmbfl_nls_la_SOURCES=nls_ja.c \
nls_de.c \
nls_en.c \
nls_hy.c \
nls_tr.c \
nls_kr.c \
nls_ru.c \
nls_ua.c \
nls_zh.c \
nls_uni.c \
nls_neutral.c \
nls_ja.h \
nls_de.h \
nls_en.h \
nls_hy.h \
nls_tr.h \
nls_kr.h \
nls_ru.h \
nls_ua.h \
nls_zh.h \
nls_uni.h \
nls_neutral.h

10
ext/mbstring/libmbfl/tests/Makefile.am
View File

@ -1,10 +0,0 @@
SUBDIRS=conv_encoding.tests conv_kana.tests strwidth.tests strcut.tests
noinst_PROGRAMS=conv_encoding conv_kana strwidth strcut
conv_encoding_SOURCES=conv_encoding.c
conv_encoding_LDADD=../mbfl/libmbfl.la
conv_kana_SOURCES=conv_kana.c
conv_kana_LDADD=../mbfl/libmbfl.la
strwidth_SOURCES=strwidth.c
strwidth_LDADD=../mbfl/libmbfl.la
strcut_SOURCES=strcut.c
strcut_LDADD=../mbfl/libmbfl.la

31
ext/mbstring/libmbfl/tests/conv_encoding.tests/Makefile.am
View File

@ -1,31 +0,0 @@
EXTRA_DIST=\
cp51932_cp50220raw.exp\
ujis_sjis.exp\
utf8_sjis.exp\
yensign.exp
noinst_PROGRAMS=gen_exp
gen_exp_SOURCES=gen_exp.c
CLEANFILES=\
uni_to_cp932.exp\
uni_to_cp50220.exp\
uni_to_cp50222.exp\
cp932_to_uni.exp
CP932.TXT:
$(FETCH_VIA_FTP) ftp://unicode.org/Public/MAPPINGS/VENDORS/MICSFT/WINDOWS/CP932.TXT
cp932_to_uni.exp: gen_exp CP932.TXT
./gen_exp from_cp932 > "$@"
uni_to_cp932.exp: gen_exp CP932.TXT
./gen_exp to_cp932 > "$@"
uni_to_cp50220.exp: gen_exp CP932.TXT
./gen_exp to_cp50220 > "$@"
uni_to_cp50222.exp: gen_exp CP932.TXT
./gen_exp to_cp50222 > "$@"
check-local: uni_to_cp932.exp uni_to_cp50220.exp uni_to_cp50222.exp
.PHONY: check-local

1
ext/mbstring/libmbfl/tests/conv_kana.tests/Makefile.am
View File

@ -1 +0,0 @@
EXTRA_DIST=*.exp

1
ext/mbstring/libmbfl/tests/strcut.tests/Makefile.am
View File

@ -1 +0,0 @@
EXTRA_DIST=*.exp

1
ext/mbstring/libmbfl/tests/strwidth.tests/Makefile.am
View File

@ -1 +0,0 @@
EXTRA_DIST=*.exp
Write Preview
Loading…
Cancel
Save