build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
11 years ago
|
|
|
/*
|
|
|
|
* notes: by srl295
|
|
|
|
* - When in NODE_HAVE_SMALL_ICU mode, ICU is linked against "stub" (null) data
|
|
|
|
* ( stubdata/libicudata.a ) containing nothing, no data, and it's also
|
|
|
|
* linked against a "small" data file which the SMALL_ICUDATA_ENTRY_POINT
|
|
|
|
* macro names. That's the "english+root" data.
|
|
|
|
*
|
|
|
|
* If icu_data_path is non-null, the user has provided a path and we assume
|
|
|
|
* it goes somewhere useful. We set that path in ICU, and exit.
|
|
|
|
* If icu_data_path is null, they haven't set a path and we want the
|
|
|
|
* "english+root" data. We call
|
|
|
|
* udata_setCommonData(SMALL_ICUDATA_ENTRY_POINT,...)
|
|
|
|
* to load up the english+root data.
|
|
|
|
*
|
|
|
|
* - when NOT in NODE_HAVE_SMALL_ICU mode, ICU is linked directly with its full
|
|
|
|
* data. All of the variables and command line options for changing data at
|
|
|
|
* runtime are disabled, as they wouldn't fully override the internal data.
|
|
|
|
* See: http://bugs.icu-project.org/trac/ticket/10924
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include "node_i18n.h"
|
|
|
|
|
|
|
|
#if defined(NODE_HAVE_I18N_SUPPORT)
|
|
|
|
|
|
|
|
#include <unicode/putil.h>
|
|
|
|
#include <unicode/udata.h>
|
|
|
|
|
|
|
|
#ifdef NODE_HAVE_SMALL_ICU
|
|
|
|
/* if this is defined, we have a 'secondary' entry point.
|
|
|
|
compare following to utypes.h defs for U_ICUDATA_ENTRY_POINT */
|
|
|
|
#define SMALL_ICUDATA_ENTRY_POINT \
|
|
|
|
SMALL_DEF2(U_ICU_VERSION_MAJOR_NUM, U_LIB_SUFFIX_C_NAME)
|
|
|
|
#define SMALL_DEF2(major, suff) SMALL_DEF(major, suff)
|
|
|
|
#ifndef U_LIB_SUFFIX_C_NAME
|
|
|
|
#define SMALL_DEF(major, suff) icusmdt##major##_dat
|
|
|
|
#else
|
|
|
|
#define SMALL_DEF(major, suff) icusmdt##suff##major##_dat
|
|
|
|
#endif
|
|
|
|
|
|
|
|
extern "C" const char U_DATA_API SMALL_ICUDATA_ENTRY_POINT[];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
namespace node {
|
|
|
|
namespace i18n {
|
|
|
|
|
|
|
|
bool InitializeICUDirectory(const char* icu_data_path) {
|
|
|
|
if (icu_data_path != nullptr) {
|
build, i18n: improve Intl build, add "--with-intl"
The two main goals of this change are:
- To make it easier to build the Intl option using ICU (particularly,
using a newer ICU than v8/Chromium's version)
- To enable a much smaller ICU build with only English support The goal
here is to get node.js binaries built this way by default so that the
Intl API can be used. Additional data can be added at execution time
(see Readme and wiki)
More details are at https://github.com/joyent/node/pull/7719
In particular, this change adds the "--with-intl=" configure option to
provide more ways of building "Intl":
- "full-icu" picks up an ICU from deps/icu
- "small-icu" is similar, but builds only English
- "system-icu" uses pkg-config to find an installed ICU
- "none" does nothing (no Intl)
For Windows builds, the "full-icu" or "small-icu" options are added to
vcbuild.bat.
Note that the existing "--with-icu-path" option is not removed from
configure, but may not be used alongside the new option.
Wiki changes have already been made on
https://github.com/joyent/node/wiki/Installation
and a new page created at
https://github.com/joyent/node/wiki/Intl
(marked as provisional until this change lands.)
Summary of changes:
* README.md : doc updates
* .gitignore : added "deps/icu" as this is the location where ICU is
unpacked to.
* Makefile : added the tools/icu/* files to cpplint, but excluded a
problematic file.
* configure : added the "--with-intl" option mentioned above.
Calculate at config time the list of ICU source files to use and data
packaging options.
* node.gyp : add the new files src/node_i18n.cc/.h as well as ICU
linkage.
* src/node.cc : add call into
node::i18n::InitializeICUDirectory(icu_data_dir) as well as new
--icu-data-dir option and NODE_ICU_DATA env variable to configure ICU
data loading. This loading is only relevant in the "small"
configuration.
* src/node_i18n.cc : new source file for the above Initialize..
function, to setup ICU as needed.
* tools/icu : new directory with some tools needed for this build.
* tools/icu/icu-generic.gyp : new .gyp file that builds ICU in some new
ways, both on unix/mac and windows.
* tools/icu/icu-system.gyp : new .gyp file to build node against a
pkg-config detected ICU.
* tools/icu/icu_small.json : new config file for the "English-only" small
build.
* tools/icu/icutrim.py : new tool for trimming down ICU data. Reads the
above .json file.
* tools/icu/iculslocs.cc : new tool for repairing ICU data manifests
after trim operation.
* tools/icu/no-op.cc : dummy file to force .gyp into using a C++ linker.
* vcbuild.bat : added small-icu and full-icu options, to call into
configure.
* Fixed toolset dependencies, see
https://github.com/joyent/node/pull/7719#issuecomment-54641687
Note that because of a bug in gyp {CC,CXX}_host must also be set.
Otherwise gcc/g++ will be used by default for part of the build.
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Reviewed-by: Fedor Indutny <fedor@indutny.com>
11 years ago
|
|
|
u_setDataDirectory(icu_data_path);
|
|
|
|
return true; // no error
|
|
|
|
} else {
|
|
|
|
UErrorCode status = U_ZERO_ERROR;
|
|
|
|
#ifdef NODE_HAVE_SMALL_ICU
|
|
|
|
// install the 'small' data.
|
|
|
|
udata_setCommonData(&SMALL_ICUDATA_ENTRY_POINT, &status);
|
|
|
|
#else // !NODE_HAVE_SMALL_ICU
|
|
|
|
// no small data, so nothing to do.
|
|
|
|
#endif // !NODE_HAVE_SMALL_ICU
|
|
|
|
return (status == U_ZERO_ERROR);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace i18n
|
|
|
|
} // namespace node
|
|
|
|
|
|
|
|
#endif // NODE_HAVE_I18N_SUPPORT
|