|
|
|
|
@echo off
|
|
|
|
|
|
|
|
|
|
cd %~dp0
|
|
|
|
|
|
|
|
|
|
if /i "%1"=="help" goto help
|
|
|
|
|
if /i "%1"=="--help" goto help
|
|
|
|
|
if /i "%1"=="-help" goto help
|
|
|
|
|
if /i "%1"=="/help" goto help
|
|
|
|
|
if /i "%1"=="?" goto help
|
|
|
|
|
if /i "%1"=="-?" goto help
|
|
|
|
|
if /i "%1"=="--?" goto help
|
|
|
|
|
if /i "%1"=="/?" goto help
|
|
|
|
|
|
|
|
|
|
@rem Process arguments.
|
|
|
|
|
set config=Release
|
|
|
|
|
set msiplatform=x86
|
|
|
|
|
set target=Build
|
|
|
|
|
set target_arch=ia32
|
|
|
|
|
set debug_arg=
|
|
|
|
|
set nosnapshot_arg=
|
|
|
|
|
set noprojgen=
|
|
|
|
|
set nobuild=
|
|
|
|
|
set nosign=
|
|
|
|
|
set nosnapshot=
|
|
|
|
|
set test=
|
|
|
|
|
set test_args=
|
|
|
|
|
set msi=
|
|
|
|
|
set licensertf=
|
|
|
|
|
set jslint=
|
|
|
|
|
set buildnodeweak=
|
|
|
|
|
set noetw=
|
|
|
|
|
set noetw_arg=
|
|
|
|
|
set noetw_msi_arg=
|
|
|
|
|
set noperfctr=
|
|
|
|
|
set noperfctr_arg=
|
|
|
|
|
set noperfctr_msi_arg=
|
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>
10 years ago
|
|
|
set i18n_arg=
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
10 years ago
|
|
|
set download_arg=
|
|
|
|
|
|
|
|
|
|
:next-arg
|
|
|
|
|
if "%1"=="" goto args-done
|
|
|
|
|
if /i "%1"=="debug" set config=Debug&goto arg-ok
|
|
|
|
|
if /i "%1"=="release" set config=Release&goto arg-ok
|
|
|
|
|
if /i "%1"=="clean" set target=Clean&goto arg-ok
|
|
|
|
|
if /i "%1"=="ia32" set target_arch=ia32&goto arg-ok
|
|
|
|
|
if /i "%1"=="x86" set target_arch=ia32&goto arg-ok
|
|
|
|
|
if /i "%1"=="x64" set target_arch=x64&goto arg-ok
|
|
|
|
|
if /i "%1"=="noprojgen" set noprojgen=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="nobuild" set nobuild=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="nosign" set nosign=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="nosnapshot" set nosnapshot=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="noetw" set noetw=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="noperfctr" set noperfctr=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="licensertf" set licensertf=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="test-uv" set test=test-uv&goto arg-ok
|
|
|
|
|
if /i "%1"=="test-internet" set test=test-internet&goto arg-ok
|
|
|
|
|
if /i "%1"=="test-pummel" set test=test-pummel&goto arg-ok
|
|
|
|
|
if /i "%1"=="test-simple" set test=test-simple&goto arg-ok
|
|
|
|
|
if /i "%1"=="test-message" set test=test-message&goto arg-ok
|
|
|
|
|
if /i "%1"=="test-gc" set test=test-gc&set buildnodeweak=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="test-all" set test=test-all&set buildnodeweak=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="test" set test=test&goto arg-ok
|
|
|
|
|
if /i "%1"=="msi" set msi=1&set licensertf=1&goto arg-ok
|
|
|
|
|
if /i "%1"=="jslint" set jslint=1&goto arg-ok
|
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>
10 years ago
|
|
|
if /i "%1"=="small-icu" set i18n_arg=%1&goto arg-ok
|
|
|
|
|
if /i "%1"=="full-icu" set i18n_arg=%1&goto arg-ok
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
10 years ago
|
|
|
if /i "%1"=="intl-none" set i18n_arg=%1&goto arg-ok
|
|
|
|
|
if /i "%1"=="download-all" set download_arg="--download=all"&goto arg-ok
|
|
|
|
|
|
|
|
|
|
echo Warning: ignoring invalid command line option `%1`.
|
|
|
|
|
|
|
|
|
|
:arg-ok
|
|
|
|
|
:arg-ok
|
|
|
|
|
shift
|
|
|
|
|
goto next-arg
|
|
|
|
|
|
|
|
|
|
:args-done
|
|
|
|
|
if defined jslint goto jslint
|
|
|
|
|
|
|
|
|
|
if "%config%"=="Debug" set debug_arg=--debug
|
|
|
|
|
if "%target_arch%"=="x64" set msiplatform=x64
|
|
|
|
|
if defined nosnapshot set nosnapshot_arg=--without-snapshot
|
|
|
|
|
if defined noetw set noetw_arg=--without-etw& set noetw_msi_arg=/p:NoETW=1
|
|
|
|
|
if defined noperfctr set noperfctr_arg=--without-perfctr& set noperfctr_msi_arg=/p:NoPerfCtr=1
|
|
|
|
|
|
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>
10 years ago
|
|
|
if "%i18n_arg%"=="full-icu" set i18n_arg=--with-intl=full-icu
|
|
|
|
|
if "%i18n_arg%"=="small-icu" set i18n_arg=--with-intl=small-icu
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
10 years ago
|
|
|
if "%i18n_arg%"=="intl-none" set i18n_arg=--with-intl=none
|
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>
10 years ago
|
|
|
|
|
|
|
|
:project-gen
|
|
|
|
|
@rem Skip project generation if requested.
|
|
|
|
|
if defined noprojgen goto msbuild
|
|
|
|
|
|
|
|
|
|
if defined NIGHTLY set TAG=nightly-%NIGHTLY%
|
|
|
|
|
|
|
|
|
|
@rem Generate the VS project.
|
|
|
|
|
SETLOCAL
|
|
|
|
|
if defined VS100COMNTOOLS call "%VS100COMNTOOLS%\VCVarsQueryRegistry.bat"
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
10 years ago
|
|
|
python configure %download_arg% %i18n_arg% %debug_arg% %nosnapshot_arg% %noetw_arg% %noperfctr_arg% --dest-cpu=%target_arch% --tag=%TAG%
|
|
|
|
|
if errorlevel 1 goto create-msvs-files-failed
|
|
|
|
|
if not exist node.sln goto create-msvs-files-failed
|
|
|
|
|
echo Project files generated.
|
|
|
|
|
ENDLOCAL
|
|
|
|
|
|
|
|
|
|
:msbuild
|
|
|
|
|
@rem Skip project generation if requested.
|
|
|
|
|
if defined nobuild goto sign
|
|
|
|
|
|
|
|
|
|
@rem Look for Visual Studio 2013
|
|
|
|
|
if not defined VS120COMNTOOLS goto msbuild-not-found
|
|
|
|
|
if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
|
|
|
|
|
if "%VCVARS_VER%" NEQ "120" (
|
|
|
|
|
call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat"
|
|
|
|
|
SET VCVARS_VER=120
|
|
|
|
|
)
|
|
|
|
|
if not defined VCINSTALLDIR goto msbuild-not-found
|
|
|
|
|
set GYP_MSVS_VERSION=2013
|
|
|
|
|
goto msbuild-found
|
|
|
|
|
|
|
|
|
|
:msbuild-not-found
|
|
|
|
|
echo Build skipped. To build, this file needs to run from VS cmd prompt.
|
|
|
|
|
goto run
|
|
|
|
|
|
|
|
|
|
:msbuild-found
|
|
|
|
|
@rem Build the sln with msbuild.
|
|
|
|
|
msbuild node.sln /m /t:%target% /p:Configuration=%config% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
|
|
|
|
|
if errorlevel 1 goto exit
|
|
|
|
|
|
|
|
|
|
:sign
|
|
|
|
|
@rem Skip signing if the `nosign` option was specified.
|
|
|
|
|
if defined nosign goto licensertf
|
|
|
|
|
|
|
|
|
|
signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs.exe
|
|
|
|
|
if errorlevel 1 echo Failed to sign exe&goto exit
|
|
|
|
|
|
|
|
|
|
:licensertf
|
|
|
|
|
@rem Skip license.rtf generation if not requested.
|
|
|
|
|
if not defined licensertf goto msi
|
|
|
|
|
|
|
|
|
|
%config%\iojs tools\license2rtf.js < LICENSE > %config%\license.rtf
|
|
|
|
|
if errorlevel 1 echo Failed to generate license.rtf&goto exit
|
|
|
|
|
|
|
|
|
|
:msi
|
|
|
|
|
@rem Skip msi generation if not requested
|
|
|
|
|
if not defined msi goto run
|
|
|
|
|
call :getnodeversion
|
|
|
|
|
|
|
|
|
|
if not defined NIGHTLY goto msibuild
|
|
|
|
|
set NODE_VERSION=%NODE_VERSION%.%NIGHTLY%
|
|
|
|
|
|
|
|
|
|
:msibuild
|
|
|
|
|
echo Building iojs-%NODE_VERSION%
|
|
|
|
|
msbuild "%~dp0tools\msvs\msi\nodemsi.sln" /m /t:Clean,Build /p:Configuration=%config% /p:Platform=%msiplatform% /p:NodeVersion=%NODE_VERSION% %noetw_msi_arg% %noperfctr_msi_arg% /clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal /nologo
|
|
|
|
|
if errorlevel 1 goto exit
|
|
|
|
|
|
|
|
|
|
if defined nosign goto run
|
|
|
|
|
signtool sign /a /d "io.js" /t http://timestamp.globalsign.com/scripts/timestamp.dll Release\iojs-v%NODE_VERSION%-%msiplatform%.msi
|
|
|
|
|
if errorlevel 1 echo Failed to sign msi&goto exit
|
|
|
|
|
|
|
|
|
|
:run
|
|
|
|
|
@rem Run tests if requested.
|
|
|
|
|
if "%test%"=="" goto exit
|
|
|
|
|
|
|
|
|
|
if "%config%"=="Debug" set test_args=--mode=debug
|
|
|
|
|
if "%config%"=="Release" set test_args=--mode=release
|
|
|
|
|
|
|
|
|
|
if "%test%"=="test" set test_args=%test_args% sequential parallel message -J
|
|
|
|
|
if "%test%"=="test-internet" set test_args=%test_args% internet
|
|
|
|
|
if "%test%"=="test-pummel" set test_args=%test_args% pummel
|
|
|
|
|
if "%test%"=="test-simple" set test_args=%test_args% sequential parallel
|
|
|
|
|
if "%test%"=="test-message" set test_args=%test_args% message
|
|
|
|
|
if "%test%"=="test-gc" set test_args=%test_args% gc
|
|
|
|
|
if "%test%"=="test-all" set test_args=%test_args%
|
|
|
|
|
|
|
|
|
|
:build-node-weak
|
|
|
|
|
@rem Build node-weak if required
|
|
|
|
|
if "%buildnodeweak%"=="" goto run-tests
|
|
|
|
|
"%config%\node" deps\npm\node_modules\node-gyp\bin\node-gyp rebuild --directory="%~dp0test\gc\node_modules\weak" --nodedir="%~dp0."
|
|
|
|
|
if errorlevel 1 goto build-node-weak-failed
|
|
|
|
|
goto run-tests
|
|
|
|
|
|
|
|
|
|
:build-node-weak-failed
|
|
|
|
|
echo Failed to build node-weak.
|
|
|
|
|
goto exit
|
|
|
|
|
|
|
|
|
|
:run-tests
|
|
|
|
|
echo running 'python tools/test.py %test_args%'
|
|
|
|
|
python tools/test.py %test_args%
|
|
|
|
|
if "%test%"=="test" goto jslint
|
|
|
|
|
goto exit
|
|
|
|
|
|
|
|
|
|
:create-msvs-files-failed
|
|
|
|
|
echo Failed to create vc project files.
|
|
|
|
|
goto exit
|
|
|
|
|
|
|
|
|
|
:jslint
|
|
|
|
|
echo running jslint
|
|
|
|
|
set PYTHONPATH=tools/closure_linter/
|
|
|
|
|
python tools/closure_linter/closure_linter/gjslint.py --unix_mode --strict --nojsdoc -r lib/ -r src/ --exclude_files lib/punycode.js
|
|
|
|
|
goto exit
|
|
|
|
|
|
|
|
|
|
:help
|
build: i18n: add icu config options
Make "--with-intl=none" the default and add "intl-none" option to
vcbuild.bat.
If icu data is missing print a warning unless either --download=all or
--download=icu is set. If set then automatically download, verify (MD5)
and unpack the ICU data if not already available.
There's a "list" of URLs being used, but right now only the first is
picked up. The logic works something like this:
* If there is no directory deps/icu,
* If no zip file (currently icu4c-54_1-src.zip),
* Download zip file (icu-project.org -> sf.net)
* Verify the MD5 sum of the zipfile
* If bad, print error and exit
* Unpack the zipfile into deps/icu
* If deps/icu now exists, use it, else fail with help text
Add the configuration option "--with-icu-source=..."
Usage:
* --with-icu-source=/path/to/my/other/icu
* --with-icu-source=/path/to/icu54.zip
* --with-icu-source=/path/to/icu54.tgz
* --with-icu-source=http://example.com/icu54.tar.bz2
Add the configuration option "--with-icu-locals=...". Allows choosing
which locales are used in the "small-icu" case.
Example:
configure --with-intl=small-icu --with-icu-locales=tlh,grc,nl
(Also note that as of this writing, neither Klingon nor Ancient Greek
are in upstream CLDR data. Serving suggestion only.)
Don't use hard coded ../../out paths on windows. This was suggested by
@misterdjules as it causes test failures. With this fix, "out" is no
longer created on windows and the following can run properly:
python tools/test.py simple
Reduce space by about 1MB with ICU 54 (over without this patch). Also
trims a few other source files, but only conditional on the exact ICU
version used. This is to future-proof - a file that is unneeded now may
be needed in future ICUs.
Also:
* Update distclean to remove icu related files
* Refactor some code into tools/configure.d/nodedownload.py
* Update docs
* Add test
PR-URL: https://github.com/joyent/node/pull/8719
Fixes: https://github.com/joyent/node/issues/7676#issuecomment-64704230
[trev.norris@gmail.com small change to test's whitespace and logic]
Signed-off-by: Trevor Norris <trev.norris@gmail.com>
10 years ago
|
|
|
echo vcbuild.bat [debug/release] [msi] [test-all/test-uv/test-internet/test-pummel/test-simple/test-message] [clean] [noprojgen] [small-icu/full-icu/intl-none] [nobuild] [nosign] [x86/x64] [download-all]
|
|
|
|
|
echo Examples:
|
|
|
|
|
echo vcbuild.bat : builds release build
|
|
|
|
|
echo vcbuild.bat debug : builds debug build
|
|
|
|
|
echo vcbuild.bat release msi : builds release build and MSI installer package
|
|
|
|
|
echo vcbuild.bat test : builds debug build and runs tests
|
|
|
|
|
goto exit
|
|
|
|
|
|
|
|
|
|
:exit
|
|
|
|
|
goto :EOF
|
|
|
|
|
|
|
|
|
|
rem ***************
|
|
|
|
|
rem Subroutines
|
|
|
|
|
rem ***************
|
|
|
|
|
|
|
|
|
|
:getnodeversion
|
|
|
|
|
set NODE_VERSION=
|
|
|
|
|
for /F "usebackq tokens=*" %%i in (`python "%~dp0tools\getnodeversion.py"`) do set NODE_VERSION=%%i
|
|
|
|
|
if not defined NODE_VERSION echo Cannot determine current version of io.js & exit /b 1
|
|
|
|
|
goto :EOF
|
