diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-17 11:59:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-17 11:59:26 +0000 |
| commit | ae9d17e198fcab2f797c0b5bceebdf5e6742e6cd (patch) | |
| tree | 5d1c25600faa7a8d1940585dcb952d8df6edebfd /enc | |
| parent | d9efcb237442aa763cf8761101003e4d9ca23550 (diff) | |
| download | ruby-ae9d17e198fcab2f797c0b5bceebdf5e6742e6cd.tar.gz | |
Move generated headers to unicode data directory
* common.mk, enc/depend (casefold.h, name2ctype.h): move to
unicode data directory per version.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/depend | 4 | ||||
| -rw-r--r-- | enc/unicode.c | 22 | ||||
| -rw-r--r-- | enc/unicode/data/8.0.0/casefold.h (renamed from enc/unicode/casefold.h) | 0 | ||||
| -rw-r--r-- | enc/unicode/data/8.0.0/name2ctype.h (renamed from enc/unicode/name2ctype.h) | 0 |
4 files changed, 22 insertions, 4 deletions
diff --git a/enc/depend b/enc/depend index 48a7cb0128..d2ee791c31 100644 --- a/enc/depend +++ b/enc/depend @@ -602,8 +602,8 @@ enc/unicode.$(OBJEXT): $(top_srcdir)/regint.h enc/unicode.$(OBJEXT): config.h enc/unicode.$(OBJEXT): defines.h enc/unicode.$(OBJEXT): enc/unicode.c -enc/unicode.$(OBJEXT): enc/unicode/casefold.h -enc/unicode.$(OBJEXT): enc/unicode/name2ctype.h +enc/unicode.$(OBJEXT): enc/unicode/data/$(UNICODE_VERSION)/casefold.h +enc/unicode.$(OBJEXT): enc/unicode/data/$(UNICODE_VERSION)/name2ctype.h enc/unicode.$(OBJEXT): intern.h enc/unicode.$(OBJEXT): missing.h enc/unicode.$(OBJEXT): oniguruma.h diff --git a/enc/unicode.c b/enc/unicode.c index 39d1e7a31f..ab91bca829 100644 --- a/enc/unicode.c +++ b/enc/unicode.c @@ -164,7 +164,7 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y) #define L(n) SpecialsLengthEncode(n) #endif /* ONIG_CASE_MAPPING */ -#include "enc/unicode/casefold.h" +#include "casefold.h" #ifdef ONIG_CASE_MAPPING #undef U @@ -178,7 +178,7 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y) #undef L #endif /* ONIG_CASE_MAPPING */ -#include "enc/unicode/name2ctype.h" +#include "name2ctype.h" #define CODE_RANGES_NUM numberof(CodeRanges) @@ -800,3 +800,21 @@ onigenc_unicode_case_map(OnigCaseFoldType* flagP, } #endif /* ONIG_CASE_MAPPING */ + +#if 0 +const char onigenc_unicode_version_string[] = +#ifdef ONIG_UNICODE_VERSION_STRING + ONIG_UNICODE_VERSION_STRING +#endif + ""; + +const int onigenc_unicode_version_number[3] = { +#ifdef ONIG_UNICODE_VERSION_MAJOR + ONIG_UNICODE_VERSION_MAJOR, + ONIG_UNICODE_VERSION_MINOR, + ONIG_UNICODE_VERSION_TEENY, +#else + 0 +#endif +}; +#endif diff --git a/enc/unicode/casefold.h b/enc/unicode/data/8.0.0/casefold.h index 1d743e4bc3..1d743e4bc3 100644 --- a/enc/unicode/casefold.h +++ b/enc/unicode/data/8.0.0/casefold.h diff --git a/enc/unicode/name2ctype.h b/enc/unicode/data/8.0.0/name2ctype.h index d27c544a8f..d27c544a8f 100644 --- a/enc/unicode/name2ctype.h +++ b/enc/unicode/data/8.0.0/name2ctype.h |