diff options
Diffstat (limited to 'enc')
-rw-r--r-- | enc/Makefile.in | 8 | ||||
-rw-r--r-- | enc/depend | 78 | ||||
-rw-r--r-- | enc/ebcdic.h | 2 | ||||
-rw-r--r-- | enc/encinit.c.erb | 3 | ||||
-rwxr-xr-x | enc/make_encmake.rb | 29 | ||||
-rw-r--r-- | enc/unicode/15.0.0/name2ctype.h | 2 |
6 files changed, 94 insertions, 28 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index dd8ca1b528..ce93fdd22d 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -40,6 +40,7 @@ BUILTRUBY = $(topdir)/miniruby$(EXEEXT) empty = AR = @AR@ +LD = @LD@ CC = @CC@ ARFLAGS = @ARFLAGS@$(empty) RANLIB = @RANLIB@ @@ -51,11 +52,12 @@ optflags = @optflags@ debugflags = @debugflags@ warnflags = @warnflags@ CCDLFLAGS = @CCDLFLAGS@ -INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir) +INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(top_srcdir) @incflags@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register LDFLAGS = @LDFLAGS@ LDSHARED = @LDSHARED@ +POSTLINK = @POSTLINK@ ldflags = $(LDFLAGS) dldflags = @DLDFLAGS@ extdldflags = @EXTDLDFLAGS@ @@ -70,6 +72,7 @@ WORKDIRS = @WORKDIRS@ NULLCMD = @NULLCMD@ RM = @RM@ +RMALL = @RMALL@ RMDIR = @RMDIR@ RMDIRS = @RMDIRS@ MAKEDIRS = @MAKEDIRS@ @@ -81,6 +84,9 @@ all: make-workdir: $(Q)$(MAKEDIRS) $(WORKDIRS) +.PHONY: encs all modencs libencs enc libenc trans libtrans srcs +.PHONY: clean distclean realclean clean-srcs + clean: distclean: clean diff --git a/enc/depend b/enc/depend index 47a20e957a..2918a90a05 100644 --- a/enc/depend +++ b/enc/depend @@ -35,6 +35,7 @@ ENCSOS =<%ENCS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \ <%}%> # ENCCLEANLIBS = <%=cleanlibs.map {|clean| clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"} + .gsub(/\$\(\KTARGET_SO(?=[:\)])/) {"ENCSOS"} }.join(" ")%> ENCCLEANOBJS = <%=cleanobjs.map {|clean| clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"} @@ -51,6 +52,7 @@ TRANSSOS =<%TRANS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \ <%}%> # TRANSCLEANLIBS = <%=cleanlibs.map {|clean| clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"} + .gsub(/\$\(\KTARGET_SO(?=[:\)])/) {"TRANSSOS"} }.join(" ")%> TRANSCLEANOBJS = <%=cleanobjs.map {|clean| clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"} @@ -58,12 +60,8 @@ TRANSCLEANOBJS = <%=cleanobjs.map {|clean| LIBTRANS=enc/libtrans.$(LIBEXT) UNICODE_HDR_DIR = --missing-unicode-header-dir-- -encs: all -% if MODULE_TYPE == :static -all: libenc libtrans -% else -all: enc trans -%end +encs all: <%= MODULE_TYPE == :static ? "lib" : "mod" %>encs +modencs: enc trans libencs: libenc libtrans enc: $(ENCSOS) libenc: $(LIBENC) @@ -155,7 +153,7 @@ enc/trans/transdb.$(OBJEXT): transdb.h clean: % %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean| - $(Q)$(RM) <%=pathrep[clean]%> + $(Q)$(RMALL) <%=pathrep[clean]%> % end % unless inplace $(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h @@ -338,6 +336,7 @@ enc/ascii.$(OBJEXT): internal/special_consts.h enc/ascii.$(OBJEXT): internal/static_assert.h enc/ascii.$(OBJEXT): internal/stdalign.h enc/ascii.$(OBJEXT): internal/stdbool.h +enc/ascii.$(OBJEXT): internal/stdckdint.h enc/ascii.$(OBJEXT): internal/symbol.h enc/ascii.$(OBJEXT): internal/value.h enc/ascii.$(OBJEXT): internal/value_type.h @@ -499,6 +498,7 @@ enc/big5.$(OBJEXT): internal/special_consts.h enc/big5.$(OBJEXT): internal/static_assert.h enc/big5.$(OBJEXT): internal/stdalign.h enc/big5.$(OBJEXT): internal/stdbool.h +enc/big5.$(OBJEXT): internal/stdckdint.h enc/big5.$(OBJEXT): internal/symbol.h enc/big5.$(OBJEXT): internal/value.h enc/big5.$(OBJEXT): internal/value_type.h @@ -670,6 +670,7 @@ enc/cesu_8.$(OBJEXT): internal/special_consts.h enc/cesu_8.$(OBJEXT): internal/static_assert.h enc/cesu_8.$(OBJEXT): internal/stdalign.h enc/cesu_8.$(OBJEXT): internal/stdbool.h +enc/cesu_8.$(OBJEXT): internal/stdckdint.h enc/cesu_8.$(OBJEXT): internal/symbol.h enc/cesu_8.$(OBJEXT): internal/value.h enc/cesu_8.$(OBJEXT): internal/value_type.h @@ -831,6 +832,7 @@ enc/cp949.$(OBJEXT): internal/special_consts.h enc/cp949.$(OBJEXT): internal/static_assert.h enc/cp949.$(OBJEXT): internal/stdalign.h enc/cp949.$(OBJEXT): internal/stdbool.h +enc/cp949.$(OBJEXT): internal/stdckdint.h enc/cp949.$(OBJEXT): internal/symbol.h enc/cp949.$(OBJEXT): internal/value.h enc/cp949.$(OBJEXT): internal/value_type.h @@ -991,6 +993,7 @@ enc/emacs_mule.$(OBJEXT): internal/special_consts.h enc/emacs_mule.$(OBJEXT): internal/static_assert.h enc/emacs_mule.$(OBJEXT): internal/stdalign.h enc/emacs_mule.$(OBJEXT): internal/stdbool.h +enc/emacs_mule.$(OBJEXT): internal/stdckdint.h enc/emacs_mule.$(OBJEXT): internal/symbol.h enc/emacs_mule.$(OBJEXT): internal/value.h enc/emacs_mule.$(OBJEXT): internal/value_type.h @@ -1161,6 +1164,7 @@ enc/encdb.$(OBJEXT): internal/special_consts.h enc/encdb.$(OBJEXT): internal/static_assert.h enc/encdb.$(OBJEXT): internal/stdalign.h enc/encdb.$(OBJEXT): internal/stdbool.h +enc/encdb.$(OBJEXT): internal/stdckdint.h enc/encdb.$(OBJEXT): internal/symbol.h enc/encdb.$(OBJEXT): internal/value.h enc/encdb.$(OBJEXT): internal/value_type.h @@ -1324,6 +1328,7 @@ enc/euc_jp.$(OBJEXT): internal/special_consts.h enc/euc_jp.$(OBJEXT): internal/static_assert.h enc/euc_jp.$(OBJEXT): internal/stdalign.h enc/euc_jp.$(OBJEXT): internal/stdbool.h +enc/euc_jp.$(OBJEXT): internal/stdckdint.h enc/euc_jp.$(OBJEXT): internal/symbol.h enc/euc_jp.$(OBJEXT): internal/value.h enc/euc_jp.$(OBJEXT): internal/value_type.h @@ -1484,6 +1489,7 @@ enc/euc_kr.$(OBJEXT): internal/special_consts.h enc/euc_kr.$(OBJEXT): internal/static_assert.h enc/euc_kr.$(OBJEXT): internal/stdalign.h enc/euc_kr.$(OBJEXT): internal/stdbool.h +enc/euc_kr.$(OBJEXT): internal/stdckdint.h enc/euc_kr.$(OBJEXT): internal/symbol.h enc/euc_kr.$(OBJEXT): internal/value.h enc/euc_kr.$(OBJEXT): internal/value_type.h @@ -1644,6 +1650,7 @@ enc/euc_tw.$(OBJEXT): internal/special_consts.h enc/euc_tw.$(OBJEXT): internal/static_assert.h enc/euc_tw.$(OBJEXT): internal/stdalign.h enc/euc_tw.$(OBJEXT): internal/stdbool.h +enc/euc_tw.$(OBJEXT): internal/stdckdint.h enc/euc_tw.$(OBJEXT): internal/symbol.h enc/euc_tw.$(OBJEXT): internal/value.h enc/euc_tw.$(OBJEXT): internal/value_type.h @@ -1804,6 +1811,7 @@ enc/gb18030.$(OBJEXT): internal/special_consts.h enc/gb18030.$(OBJEXT): internal/static_assert.h enc/gb18030.$(OBJEXT): internal/stdalign.h enc/gb18030.$(OBJEXT): internal/stdbool.h +enc/gb18030.$(OBJEXT): internal/stdckdint.h enc/gb18030.$(OBJEXT): internal/symbol.h enc/gb18030.$(OBJEXT): internal/value.h enc/gb18030.$(OBJEXT): internal/value_type.h @@ -1964,6 +1972,7 @@ enc/gb2312.$(OBJEXT): internal/special_consts.h enc/gb2312.$(OBJEXT): internal/static_assert.h enc/gb2312.$(OBJEXT): internal/stdalign.h enc/gb2312.$(OBJEXT): internal/stdbool.h +enc/gb2312.$(OBJEXT): internal/stdckdint.h enc/gb2312.$(OBJEXT): internal/symbol.h enc/gb2312.$(OBJEXT): internal/value.h enc/gb2312.$(OBJEXT): internal/value_type.h @@ -2124,6 +2133,7 @@ enc/gbk.$(OBJEXT): internal/special_consts.h enc/gbk.$(OBJEXT): internal/static_assert.h enc/gbk.$(OBJEXT): internal/stdalign.h enc/gbk.$(OBJEXT): internal/stdbool.h +enc/gbk.$(OBJEXT): internal/stdckdint.h enc/gbk.$(OBJEXT): internal/symbol.h enc/gbk.$(OBJEXT): internal/value.h enc/gbk.$(OBJEXT): internal/value_type.h @@ -2285,6 +2295,7 @@ enc/iso_8859_1.$(OBJEXT): internal/special_consts.h enc/iso_8859_1.$(OBJEXT): internal/static_assert.h enc/iso_8859_1.$(OBJEXT): internal/stdalign.h enc/iso_8859_1.$(OBJEXT): internal/stdbool.h +enc/iso_8859_1.$(OBJEXT): internal/stdckdint.h enc/iso_8859_1.$(OBJEXT): internal/symbol.h enc/iso_8859_1.$(OBJEXT): internal/value.h enc/iso_8859_1.$(OBJEXT): internal/value_type.h @@ -2446,6 +2457,7 @@ enc/iso_8859_10.$(OBJEXT): internal/special_consts.h enc/iso_8859_10.$(OBJEXT): internal/static_assert.h enc/iso_8859_10.$(OBJEXT): internal/stdalign.h enc/iso_8859_10.$(OBJEXT): internal/stdbool.h +enc/iso_8859_10.$(OBJEXT): internal/stdckdint.h enc/iso_8859_10.$(OBJEXT): internal/symbol.h enc/iso_8859_10.$(OBJEXT): internal/value.h enc/iso_8859_10.$(OBJEXT): internal/value_type.h @@ -2606,6 +2618,7 @@ enc/iso_8859_11.$(OBJEXT): internal/special_consts.h enc/iso_8859_11.$(OBJEXT): internal/static_assert.h enc/iso_8859_11.$(OBJEXT): internal/stdalign.h enc/iso_8859_11.$(OBJEXT): internal/stdbool.h +enc/iso_8859_11.$(OBJEXT): internal/stdckdint.h enc/iso_8859_11.$(OBJEXT): internal/symbol.h enc/iso_8859_11.$(OBJEXT): internal/value.h enc/iso_8859_11.$(OBJEXT): internal/value_type.h @@ -2767,6 +2780,7 @@ enc/iso_8859_13.$(OBJEXT): internal/special_consts.h enc/iso_8859_13.$(OBJEXT): internal/static_assert.h enc/iso_8859_13.$(OBJEXT): internal/stdalign.h enc/iso_8859_13.$(OBJEXT): internal/stdbool.h +enc/iso_8859_13.$(OBJEXT): internal/stdckdint.h enc/iso_8859_13.$(OBJEXT): internal/symbol.h enc/iso_8859_13.$(OBJEXT): internal/value.h enc/iso_8859_13.$(OBJEXT): internal/value_type.h @@ -2928,6 +2942,7 @@ enc/iso_8859_14.$(OBJEXT): internal/special_consts.h enc/iso_8859_14.$(OBJEXT): internal/static_assert.h enc/iso_8859_14.$(OBJEXT): internal/stdalign.h enc/iso_8859_14.$(OBJEXT): internal/stdbool.h +enc/iso_8859_14.$(OBJEXT): internal/stdckdint.h enc/iso_8859_14.$(OBJEXT): internal/symbol.h enc/iso_8859_14.$(OBJEXT): internal/value.h enc/iso_8859_14.$(OBJEXT): internal/value_type.h @@ -3089,6 +3104,7 @@ enc/iso_8859_15.$(OBJEXT): internal/special_consts.h enc/iso_8859_15.$(OBJEXT): internal/static_assert.h enc/iso_8859_15.$(OBJEXT): internal/stdalign.h enc/iso_8859_15.$(OBJEXT): internal/stdbool.h +enc/iso_8859_15.$(OBJEXT): internal/stdckdint.h enc/iso_8859_15.$(OBJEXT): internal/symbol.h enc/iso_8859_15.$(OBJEXT): internal/value.h enc/iso_8859_15.$(OBJEXT): internal/value_type.h @@ -3250,6 +3266,7 @@ enc/iso_8859_16.$(OBJEXT): internal/special_consts.h enc/iso_8859_16.$(OBJEXT): internal/static_assert.h enc/iso_8859_16.$(OBJEXT): internal/stdalign.h enc/iso_8859_16.$(OBJEXT): internal/stdbool.h +enc/iso_8859_16.$(OBJEXT): internal/stdckdint.h enc/iso_8859_16.$(OBJEXT): internal/symbol.h enc/iso_8859_16.$(OBJEXT): internal/value.h enc/iso_8859_16.$(OBJEXT): internal/value_type.h @@ -3411,6 +3428,7 @@ enc/iso_8859_2.$(OBJEXT): internal/special_consts.h enc/iso_8859_2.$(OBJEXT): internal/static_assert.h enc/iso_8859_2.$(OBJEXT): internal/stdalign.h enc/iso_8859_2.$(OBJEXT): internal/stdbool.h +enc/iso_8859_2.$(OBJEXT): internal/stdckdint.h enc/iso_8859_2.$(OBJEXT): internal/symbol.h enc/iso_8859_2.$(OBJEXT): internal/value.h enc/iso_8859_2.$(OBJEXT): internal/value_type.h @@ -3572,6 +3590,7 @@ enc/iso_8859_3.$(OBJEXT): internal/special_consts.h enc/iso_8859_3.$(OBJEXT): internal/static_assert.h enc/iso_8859_3.$(OBJEXT): internal/stdalign.h enc/iso_8859_3.$(OBJEXT): internal/stdbool.h +enc/iso_8859_3.$(OBJEXT): internal/stdckdint.h enc/iso_8859_3.$(OBJEXT): internal/symbol.h enc/iso_8859_3.$(OBJEXT): internal/value.h enc/iso_8859_3.$(OBJEXT): internal/value_type.h @@ -3733,6 +3752,7 @@ enc/iso_8859_4.$(OBJEXT): internal/special_consts.h enc/iso_8859_4.$(OBJEXT): internal/static_assert.h enc/iso_8859_4.$(OBJEXT): internal/stdalign.h enc/iso_8859_4.$(OBJEXT): internal/stdbool.h +enc/iso_8859_4.$(OBJEXT): internal/stdckdint.h enc/iso_8859_4.$(OBJEXT): internal/symbol.h enc/iso_8859_4.$(OBJEXT): internal/value.h enc/iso_8859_4.$(OBJEXT): internal/value_type.h @@ -3893,6 +3913,7 @@ enc/iso_8859_5.$(OBJEXT): internal/special_consts.h enc/iso_8859_5.$(OBJEXT): internal/static_assert.h enc/iso_8859_5.$(OBJEXT): internal/stdalign.h enc/iso_8859_5.$(OBJEXT): internal/stdbool.h +enc/iso_8859_5.$(OBJEXT): internal/stdckdint.h enc/iso_8859_5.$(OBJEXT): internal/symbol.h enc/iso_8859_5.$(OBJEXT): internal/value.h enc/iso_8859_5.$(OBJEXT): internal/value_type.h @@ -4053,6 +4074,7 @@ enc/iso_8859_6.$(OBJEXT): internal/special_consts.h enc/iso_8859_6.$(OBJEXT): internal/static_assert.h enc/iso_8859_6.$(OBJEXT): internal/stdalign.h enc/iso_8859_6.$(OBJEXT): internal/stdbool.h +enc/iso_8859_6.$(OBJEXT): internal/stdckdint.h enc/iso_8859_6.$(OBJEXT): internal/symbol.h enc/iso_8859_6.$(OBJEXT): internal/value.h enc/iso_8859_6.$(OBJEXT): internal/value_type.h @@ -4213,6 +4235,7 @@ enc/iso_8859_7.$(OBJEXT): internal/special_consts.h enc/iso_8859_7.$(OBJEXT): internal/static_assert.h enc/iso_8859_7.$(OBJEXT): internal/stdalign.h enc/iso_8859_7.$(OBJEXT): internal/stdbool.h +enc/iso_8859_7.$(OBJEXT): internal/stdckdint.h enc/iso_8859_7.$(OBJEXT): internal/symbol.h enc/iso_8859_7.$(OBJEXT): internal/value.h enc/iso_8859_7.$(OBJEXT): internal/value_type.h @@ -4373,6 +4396,7 @@ enc/iso_8859_8.$(OBJEXT): internal/special_consts.h enc/iso_8859_8.$(OBJEXT): internal/static_assert.h enc/iso_8859_8.$(OBJEXT): internal/stdalign.h enc/iso_8859_8.$(OBJEXT): internal/stdbool.h +enc/iso_8859_8.$(OBJEXT): internal/stdckdint.h enc/iso_8859_8.$(OBJEXT): internal/symbol.h enc/iso_8859_8.$(OBJEXT): internal/value.h enc/iso_8859_8.$(OBJEXT): internal/value_type.h @@ -4534,6 +4558,7 @@ enc/iso_8859_9.$(OBJEXT): internal/special_consts.h enc/iso_8859_9.$(OBJEXT): internal/static_assert.h enc/iso_8859_9.$(OBJEXT): internal/stdalign.h enc/iso_8859_9.$(OBJEXT): internal/stdbool.h +enc/iso_8859_9.$(OBJEXT): internal/stdckdint.h enc/iso_8859_9.$(OBJEXT): internal/symbol.h enc/iso_8859_9.$(OBJEXT): internal/value.h enc/iso_8859_9.$(OBJEXT): internal/value_type.h @@ -4694,6 +4719,7 @@ enc/koi8_r.$(OBJEXT): internal/special_consts.h enc/koi8_r.$(OBJEXT): internal/static_assert.h enc/koi8_r.$(OBJEXT): internal/stdalign.h enc/koi8_r.$(OBJEXT): internal/stdbool.h +enc/koi8_r.$(OBJEXT): internal/stdckdint.h enc/koi8_r.$(OBJEXT): internal/symbol.h enc/koi8_r.$(OBJEXT): internal/value.h enc/koi8_r.$(OBJEXT): internal/value_type.h @@ -4854,6 +4880,7 @@ enc/koi8_u.$(OBJEXT): internal/special_consts.h enc/koi8_u.$(OBJEXT): internal/static_assert.h enc/koi8_u.$(OBJEXT): internal/stdalign.h enc/koi8_u.$(OBJEXT): internal/stdbool.h +enc/koi8_u.$(OBJEXT): internal/stdckdint.h enc/koi8_u.$(OBJEXT): internal/symbol.h enc/koi8_u.$(OBJEXT): internal/value.h enc/koi8_u.$(OBJEXT): internal/value_type.h @@ -5017,6 +5044,7 @@ enc/shift_jis.$(OBJEXT): internal/special_consts.h enc/shift_jis.$(OBJEXT): internal/static_assert.h enc/shift_jis.$(OBJEXT): internal/stdalign.h enc/shift_jis.$(OBJEXT): internal/stdbool.h +enc/shift_jis.$(OBJEXT): internal/stdckdint.h enc/shift_jis.$(OBJEXT): internal/symbol.h enc/shift_jis.$(OBJEXT): internal/value.h enc/shift_jis.$(OBJEXT): internal/value_type.h @@ -5176,6 +5204,7 @@ enc/trans/big5.$(OBJEXT): internal/special_consts.h enc/trans/big5.$(OBJEXT): internal/static_assert.h enc/trans/big5.$(OBJEXT): internal/stdalign.h enc/trans/big5.$(OBJEXT): internal/stdbool.h +enc/trans/big5.$(OBJEXT): internal/stdckdint.h enc/trans/big5.$(OBJEXT): internal/symbol.h enc/trans/big5.$(OBJEXT): internal/value.h enc/trans/big5.$(OBJEXT): internal/value_type.h @@ -5334,6 +5363,7 @@ enc/trans/cesu_8.$(OBJEXT): internal/special_consts.h enc/trans/cesu_8.$(OBJEXT): internal/static_assert.h enc/trans/cesu_8.$(OBJEXT): internal/stdalign.h enc/trans/cesu_8.$(OBJEXT): internal/stdbool.h +enc/trans/cesu_8.$(OBJEXT): internal/stdckdint.h enc/trans/cesu_8.$(OBJEXT): internal/symbol.h enc/trans/cesu_8.$(OBJEXT): internal/value.h enc/trans/cesu_8.$(OBJEXT): internal/value_type.h @@ -5492,6 +5522,7 @@ enc/trans/chinese.$(OBJEXT): internal/special_consts.h enc/trans/chinese.$(OBJEXT): internal/static_assert.h enc/trans/chinese.$(OBJEXT): internal/stdalign.h enc/trans/chinese.$(OBJEXT): internal/stdbool.h +enc/trans/chinese.$(OBJEXT): internal/stdckdint.h enc/trans/chinese.$(OBJEXT): internal/symbol.h enc/trans/chinese.$(OBJEXT): internal/value.h enc/trans/chinese.$(OBJEXT): internal/value_type.h @@ -5650,6 +5681,7 @@ enc/trans/ebcdic.$(OBJEXT): internal/special_consts.h enc/trans/ebcdic.$(OBJEXT): internal/static_assert.h enc/trans/ebcdic.$(OBJEXT): internal/stdalign.h enc/trans/ebcdic.$(OBJEXT): internal/stdbool.h +enc/trans/ebcdic.$(OBJEXT): internal/stdckdint.h enc/trans/ebcdic.$(OBJEXT): internal/symbol.h enc/trans/ebcdic.$(OBJEXT): internal/value.h enc/trans/ebcdic.$(OBJEXT): internal/value_type.h @@ -5808,6 +5840,7 @@ enc/trans/emoji.$(OBJEXT): internal/special_consts.h enc/trans/emoji.$(OBJEXT): internal/static_assert.h enc/trans/emoji.$(OBJEXT): internal/stdalign.h enc/trans/emoji.$(OBJEXT): internal/stdbool.h +enc/trans/emoji.$(OBJEXT): internal/stdckdint.h enc/trans/emoji.$(OBJEXT): internal/symbol.h enc/trans/emoji.$(OBJEXT): internal/value.h enc/trans/emoji.$(OBJEXT): internal/value_type.h @@ -5966,6 +5999,7 @@ enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/special_consts.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/static_assert.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdalign.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdbool.h +enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/stdckdint.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/symbol.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/value.h enc/trans/emoji_iso2022_kddi.$(OBJEXT): internal/value_type.h @@ -6124,6 +6158,7 @@ enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/special_consts.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/static_assert.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdalign.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdbool.h +enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/stdckdint.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/symbol.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/value.h enc/trans/emoji_sjis_docomo.$(OBJEXT): internal/value_type.h @@ -6282,6 +6317,7 @@ enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/special_consts.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/static_assert.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdalign.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdbool.h +enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/stdckdint.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/symbol.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/value.h enc/trans/emoji_sjis_kddi.$(OBJEXT): internal/value_type.h @@ -6440,6 +6476,7 @@ enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/special_consts.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/static_assert.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdalign.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdbool.h +enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/stdckdint.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/symbol.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/value.h enc/trans/emoji_sjis_softbank.$(OBJEXT): internal/value_type.h @@ -6598,6 +6635,7 @@ enc/trans/escape.$(OBJEXT): internal/special_consts.h enc/trans/escape.$(OBJEXT): internal/static_assert.h enc/trans/escape.$(OBJEXT): internal/stdalign.h enc/trans/escape.$(OBJEXT): internal/stdbool.h +enc/trans/escape.$(OBJEXT): internal/stdckdint.h enc/trans/escape.$(OBJEXT): internal/symbol.h enc/trans/escape.$(OBJEXT): internal/value.h enc/trans/escape.$(OBJEXT): internal/value_type.h @@ -6756,6 +6794,7 @@ enc/trans/gb18030.$(OBJEXT): internal/special_consts.h enc/trans/gb18030.$(OBJEXT): internal/static_assert.h enc/trans/gb18030.$(OBJEXT): internal/stdalign.h enc/trans/gb18030.$(OBJEXT): internal/stdbool.h +enc/trans/gb18030.$(OBJEXT): internal/stdckdint.h enc/trans/gb18030.$(OBJEXT): internal/symbol.h enc/trans/gb18030.$(OBJEXT): internal/value.h enc/trans/gb18030.$(OBJEXT): internal/value_type.h @@ -6914,6 +6953,7 @@ enc/trans/gbk.$(OBJEXT): internal/special_consts.h enc/trans/gbk.$(OBJEXT): internal/static_assert.h enc/trans/gbk.$(OBJEXT): internal/stdalign.h enc/trans/gbk.$(OBJEXT): internal/stdbool.h +enc/trans/gbk.$(OBJEXT): internal/stdckdint.h enc/trans/gbk.$(OBJEXT): internal/symbol.h enc/trans/gbk.$(OBJEXT): internal/value.h enc/trans/gbk.$(OBJEXT): internal/value_type.h @@ -7072,6 +7112,7 @@ enc/trans/iso2022.$(OBJEXT): internal/special_consts.h enc/trans/iso2022.$(OBJEXT): internal/static_assert.h enc/trans/iso2022.$(OBJEXT): internal/stdalign.h enc/trans/iso2022.$(OBJEXT): internal/stdbool.h +enc/trans/iso2022.$(OBJEXT): internal/stdckdint.h enc/trans/iso2022.$(OBJEXT): internal/symbol.h enc/trans/iso2022.$(OBJEXT): internal/value.h enc/trans/iso2022.$(OBJEXT): internal/value_type.h @@ -7230,6 +7271,7 @@ enc/trans/japanese.$(OBJEXT): internal/special_consts.h enc/trans/japanese.$(OBJEXT): internal/static_assert.h enc/trans/japanese.$(OBJEXT): internal/stdalign.h enc/trans/japanese.$(OBJEXT): internal/stdbool.h +enc/trans/japanese.$(OBJEXT): internal/stdckdint.h enc/trans/japanese.$(OBJEXT): internal/symbol.h enc/trans/japanese.$(OBJEXT): internal/value.h enc/trans/japanese.$(OBJEXT): internal/value_type.h @@ -7388,6 +7430,7 @@ enc/trans/japanese_euc.$(OBJEXT): internal/special_consts.h enc/trans/japanese_euc.$(OBJEXT): internal/static_assert.h enc/trans/japanese_euc.$(OBJEXT): internal/stdalign.h enc/trans/japanese_euc.$(OBJEXT): internal/stdbool.h +enc/trans/japanese_euc.$(OBJEXT): internal/stdckdint.h enc/trans/japanese_euc.$(OBJEXT): internal/symbol.h enc/trans/japanese_euc.$(OBJEXT): internal/value.h enc/trans/japanese_euc.$(OBJEXT): internal/value_type.h @@ -7546,6 +7589,7 @@ enc/trans/japanese_sjis.$(OBJEXT): internal/special_consts.h enc/trans/japanese_sjis.$(OBJEXT): internal/static_assert.h enc/trans/japanese_sjis.$(OBJEXT): internal/stdalign.h enc/trans/japanese_sjis.$(OBJEXT): internal/stdbool.h +enc/trans/japanese_sjis.$(OBJEXT): internal/stdckdint.h enc/trans/japanese_sjis.$(OBJEXT): internal/symbol.h enc/trans/japanese_sjis.$(OBJEXT): internal/value.h enc/trans/japanese_sjis.$(OBJEXT): internal/value_type.h @@ -7704,6 +7748,7 @@ enc/trans/korean.$(OBJEXT): internal/special_consts.h enc/trans/korean.$(OBJEXT): internal/static_assert.h enc/trans/korean.$(OBJEXT): internal/stdalign.h enc/trans/korean.$(OBJEXT): internal/stdbool.h +enc/trans/korean.$(OBJEXT): internal/stdckdint.h enc/trans/korean.$(OBJEXT): internal/symbol.h enc/trans/korean.$(OBJEXT): internal/value.h enc/trans/korean.$(OBJEXT): internal/value_type.h @@ -7861,6 +7906,7 @@ enc/trans/newline.$(OBJEXT): internal/special_consts.h enc/trans/newline.$(OBJEXT): internal/static_assert.h enc/trans/newline.$(OBJEXT): internal/stdalign.h enc/trans/newline.$(OBJEXT): internal/stdbool.h +enc/trans/newline.$(OBJEXT): internal/stdckdint.h enc/trans/newline.$(OBJEXT): internal/symbol.h enc/trans/newline.$(OBJEXT): internal/value.h enc/trans/newline.$(OBJEXT): internal/value_type.h @@ -8019,6 +8065,7 @@ enc/trans/single_byte.$(OBJEXT): internal/special_consts.h enc/trans/single_byte.$(OBJEXT): internal/static_assert.h enc/trans/single_byte.$(OBJEXT): internal/stdalign.h enc/trans/single_byte.$(OBJEXT): internal/stdbool.h +enc/trans/single_byte.$(OBJEXT): internal/stdckdint.h enc/trans/single_byte.$(OBJEXT): internal/symbol.h enc/trans/single_byte.$(OBJEXT): internal/value.h enc/trans/single_byte.$(OBJEXT): internal/value_type.h @@ -8177,6 +8224,7 @@ enc/trans/transdb.$(OBJEXT): internal/special_consts.h enc/trans/transdb.$(OBJEXT): internal/static_assert.h enc/trans/transdb.$(OBJEXT): internal/stdalign.h enc/trans/transdb.$(OBJEXT): internal/stdbool.h +enc/trans/transdb.$(OBJEXT): internal/stdckdint.h enc/trans/transdb.$(OBJEXT): internal/symbol.h enc/trans/transdb.$(OBJEXT): internal/value.h enc/trans/transdb.$(OBJEXT): internal/value_type.h @@ -8336,6 +8384,7 @@ enc/trans/utf8_mac.$(OBJEXT): internal/special_consts.h enc/trans/utf8_mac.$(OBJEXT): internal/static_assert.h enc/trans/utf8_mac.$(OBJEXT): internal/stdalign.h enc/trans/utf8_mac.$(OBJEXT): internal/stdbool.h +enc/trans/utf8_mac.$(OBJEXT): internal/stdckdint.h enc/trans/utf8_mac.$(OBJEXT): internal/symbol.h enc/trans/utf8_mac.$(OBJEXT): internal/value.h enc/trans/utf8_mac.$(OBJEXT): internal/value_type.h @@ -8494,6 +8543,7 @@ enc/trans/utf_16_32.$(OBJEXT): internal/special_consts.h enc/trans/utf_16_32.$(OBJEXT): internal/static_assert.h enc/trans/utf_16_32.$(OBJEXT): internal/stdalign.h enc/trans/utf_16_32.$(OBJEXT): internal/stdbool.h +enc/trans/utf_16_32.$(OBJEXT): internal/stdckdint.h enc/trans/utf_16_32.$(OBJEXT): internal/symbol.h enc/trans/utf_16_32.$(OBJEXT): internal/value.h enc/trans/utf_16_32.$(OBJEXT): internal/value_type.h @@ -8655,6 +8705,7 @@ enc/unicode.$(OBJEXT): internal/special_consts.h enc/unicode.$(OBJEXT): internal/static_assert.h enc/unicode.$(OBJEXT): internal/stdalign.h enc/unicode.$(OBJEXT): internal/stdbool.h +enc/unicode.$(OBJEXT): internal/stdckdint.h enc/unicode.$(OBJEXT): internal/symbol.h enc/unicode.$(OBJEXT): internal/value.h enc/unicode.$(OBJEXT): internal/value_type.h @@ -8825,6 +8876,7 @@ enc/us_ascii.$(OBJEXT): internal/special_consts.h enc/us_ascii.$(OBJEXT): internal/static_assert.h enc/us_ascii.$(OBJEXT): internal/stdalign.h enc/us_ascii.$(OBJEXT): internal/stdbool.h +enc/us_ascii.$(OBJEXT): internal/stdckdint.h enc/us_ascii.$(OBJEXT): internal/symbol.h enc/us_ascii.$(OBJEXT): internal/value.h enc/us_ascii.$(OBJEXT): internal/value_type.h @@ -8987,6 +9039,7 @@ enc/utf_16be.$(OBJEXT): internal/special_consts.h enc/utf_16be.$(OBJEXT): internal/static_assert.h enc/utf_16be.$(OBJEXT): internal/stdalign.h enc/utf_16be.$(OBJEXT): internal/stdbool.h +enc/utf_16be.$(OBJEXT): internal/stdckdint.h enc/utf_16be.$(OBJEXT): internal/symbol.h enc/utf_16be.$(OBJEXT): internal/value.h enc/utf_16be.$(OBJEXT): internal/value_type.h @@ -9148,6 +9201,7 @@ enc/utf_16le.$(OBJEXT): internal/special_consts.h enc/utf_16le.$(OBJEXT): internal/static_assert.h enc/utf_16le.$(OBJEXT): internal/stdalign.h enc/utf_16le.$(OBJEXT): internal/stdbool.h +enc/utf_16le.$(OBJEXT): internal/stdckdint.h enc/utf_16le.$(OBJEXT): internal/symbol.h enc/utf_16le.$(OBJEXT): internal/value.h enc/utf_16le.$(OBJEXT): internal/value_type.h @@ -9309,6 +9363,7 @@ enc/utf_32be.$(OBJEXT): internal/special_consts.h enc/utf_32be.$(OBJEXT): internal/static_assert.h enc/utf_32be.$(OBJEXT): internal/stdalign.h enc/utf_32be.$(OBJEXT): internal/stdbool.h +enc/utf_32be.$(OBJEXT): internal/stdckdint.h enc/utf_32be.$(OBJEXT): internal/symbol.h enc/utf_32be.$(OBJEXT): internal/value.h enc/utf_32be.$(OBJEXT): internal/value_type.h @@ -9470,6 +9525,7 @@ enc/utf_32le.$(OBJEXT): internal/special_consts.h enc/utf_32le.$(OBJEXT): internal/static_assert.h enc/utf_32le.$(OBJEXT): internal/stdalign.h enc/utf_32le.$(OBJEXT): internal/stdbool.h +enc/utf_32le.$(OBJEXT): internal/stdckdint.h enc/utf_32le.$(OBJEXT): internal/symbol.h enc/utf_32le.$(OBJEXT): internal/value.h enc/utf_32le.$(OBJEXT): internal/value_type.h @@ -9640,6 +9696,7 @@ enc/utf_8.$(OBJEXT): internal/special_consts.h enc/utf_8.$(OBJEXT): internal/static_assert.h enc/utf_8.$(OBJEXT): internal/stdalign.h enc/utf_8.$(OBJEXT): internal/stdbool.h +enc/utf_8.$(OBJEXT): internal/stdckdint.h enc/utf_8.$(OBJEXT): internal/symbol.h enc/utf_8.$(OBJEXT): internal/value.h enc/utf_8.$(OBJEXT): internal/value_type.h @@ -9802,6 +9859,7 @@ enc/windows_1250.$(OBJEXT): internal/special_consts.h enc/windows_1250.$(OBJEXT): internal/static_assert.h enc/windows_1250.$(OBJEXT): internal/stdalign.h enc/windows_1250.$(OBJEXT): internal/stdbool.h +enc/windows_1250.$(OBJEXT): internal/stdckdint.h enc/windows_1250.$(OBJEXT): internal/symbol.h enc/windows_1250.$(OBJEXT): internal/value.h enc/windows_1250.$(OBJEXT): internal/value_type.h @@ -9962,6 +10020,7 @@ enc/windows_1251.$(OBJEXT): internal/special_consts.h enc/windows_1251.$(OBJEXT): internal/static_assert.h enc/windows_1251.$(OBJEXT): internal/stdalign.h enc/windows_1251.$(OBJEXT): internal/stdbool.h +enc/windows_1251.$(OBJEXT): internal/stdckdint.h enc/windows_1251.$(OBJEXT): internal/symbol.h enc/windows_1251.$(OBJEXT): internal/value.h enc/windows_1251.$(OBJEXT): internal/value_type.h @@ -10123,6 +10182,7 @@ enc/windows_1252.$(OBJEXT): internal/special_consts.h enc/windows_1252.$(OBJEXT): internal/static_assert.h enc/windows_1252.$(OBJEXT): internal/stdalign.h enc/windows_1252.$(OBJEXT): internal/stdbool.h +enc/windows_1252.$(OBJEXT): internal/stdckdint.h enc/windows_1252.$(OBJEXT): internal/symbol.h enc/windows_1252.$(OBJEXT): internal/value.h enc/windows_1252.$(OBJEXT): internal/value_type.h @@ -10283,6 +10343,7 @@ enc/windows_1253.$(OBJEXT): internal/special_consts.h enc/windows_1253.$(OBJEXT): internal/static_assert.h enc/windows_1253.$(OBJEXT): internal/stdalign.h enc/windows_1253.$(OBJEXT): internal/stdbool.h +enc/windows_1253.$(OBJEXT): internal/stdckdint.h enc/windows_1253.$(OBJEXT): internal/symbol.h enc/windows_1253.$(OBJEXT): internal/value.h enc/windows_1253.$(OBJEXT): internal/value_type.h @@ -10444,6 +10505,7 @@ enc/windows_1254.$(OBJEXT): internal/special_consts.h enc/windows_1254.$(OBJEXT): internal/static_assert.h enc/windows_1254.$(OBJEXT): internal/stdalign.h enc/windows_1254.$(OBJEXT): internal/stdbool.h +enc/windows_1254.$(OBJEXT): internal/stdckdint.h enc/windows_1254.$(OBJEXT): internal/symbol.h enc/windows_1254.$(OBJEXT): internal/value.h enc/windows_1254.$(OBJEXT): internal/value_type.h @@ -10605,6 +10667,7 @@ enc/windows_1257.$(OBJEXT): internal/special_consts.h enc/windows_1257.$(OBJEXT): internal/static_assert.h enc/windows_1257.$(OBJEXT): internal/stdalign.h enc/windows_1257.$(OBJEXT): internal/stdbool.h +enc/windows_1257.$(OBJEXT): internal/stdckdint.h enc/windows_1257.$(OBJEXT): internal/symbol.h enc/windows_1257.$(OBJEXT): internal/value.h enc/windows_1257.$(OBJEXT): internal/value_type.h @@ -10768,6 +10831,7 @@ enc/windows_31j.$(OBJEXT): internal/special_consts.h enc/windows_31j.$(OBJEXT): internal/static_assert.h enc/windows_31j.$(OBJEXT): internal/stdalign.h enc/windows_31j.$(OBJEXT): internal/stdbool.h +enc/windows_31j.$(OBJEXT): internal/stdckdint.h enc/windows_31j.$(OBJEXT): internal/symbol.h enc/windows_31j.$(OBJEXT): internal/value.h enc/windows_31j.$(OBJEXT): internal/value_type.h diff --git a/enc/ebcdic.h b/enc/ebcdic.h index a3b380a327..5109bf7065 100644 --- a/enc/ebcdic.h +++ b/enc/ebcdic.h @@ -7,5 +7,5 @@ ENC_ALIAS("ebcdic-cp-us", "IBM037"); * hopefully the most widely used one. * * See http://www.iana.org/assignments/character-sets/character-sets.xhtml - * http://tools.ietf.org/html/rfc1345 + * https://www.rfc-editor.org/rfc/rfc1345 */ diff --git a/enc/encinit.c.erb b/enc/encinit.c.erb index 120408f8e3..3662ba200d 100644 --- a/enc/encinit.c.erb +++ b/enc/encinit.c.erb @@ -1,3 +1,6 @@ +/* Automatically generated from <%= erb.filename %> + * Do not edit<%# directly%>. + */ /* Copyright 2012 Google Inc. Some Rights Reserved. * Author: yugui@google.com (Yugui Sonoda) */ diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index fcfc2c9267..96d1944bcb 100755 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -121,39 +121,32 @@ ENCS, ENC_DEPS = target_encodings ATRANS, TRANS = target_transcoders if File.exist?(depend = File.join($srcdir, "depend")) - if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ - erb = ERB.new(File.read(depend), trim_mode: '%') - else - erb = ERB.new(File.read(depend), nil, '%') - end + erb = ERB.new(File.read(depend), trim_mode: '%') erb.filename = depend tmp = erb.result(binding) - dep = "\n#### depend ####\n\n" << depend_rules(tmp).join + dep = "\n#### depend ####\n\n" + depend_rules(tmp).join else dep = "" end mkin = File.read(File.join($srcdir, "Makefile.in")) -mkin.gsub!(/@(#{CONFIG.keys.join('|')})@/) {CONFIG[$1]} +# Variables that should not be expanded in Makefile.in to allow +# overriding inherited variables at make-time. +not_expand_vars = %w(CFLAGS) +mkin.gsub!(/@(#{RbConfig::CONFIG.keys.join('|')})@/) do + not_expand_vars.include?($1) ? CONFIG[$1] : RbConfig::CONFIG[$1] +end File.open(ARGV[0], 'wb') {|f| f.puts mkin, dep } if MODULE_TYPE == :static filename = "encinit.c.erb" - if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ - erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-') - else - erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-') - end + erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-') erb.filename = "enc/#{filename}" tmp = erb.result(binding) begin Dir.mkdir 'enc' rescue Errno::EEXIST end - File.open("enc/encinit.c", "w") {|f| - f.puts "/* Automatically generated from enc/encinit.c.erb" - f.puts " * Do not edit." - f.puts " */" - f.puts tmp - } + require 'tool/lib/output' + Output.new(path: "enc/encinit.c", ifchange: true).write(tmp) end diff --git a/enc/unicode/15.0.0/name2ctype.h b/enc/unicode/15.0.0/name2ctype.h index a2c996423d..6bbbb3512f 100644 --- a/enc/unicode/15.0.0/name2ctype.h +++ b/enc/unicode/15.0.0/name2ctype.h @@ -5402,7 +5402,7 @@ static const OnigCodePoint CR_ASCII[] = { 0x0000, 0x007f, }; /* CR_ASCII */ -/* 'Punct' */ +/* 'Punct': [[:Punct:]] */ static const OnigCodePoint CR_Punct[] = { 191, 0x0021, 0x0023, |