build: chakracore build improvements

Makes the following improvements to node-chakracore builds:
- Support ChakraCore test builds
- Support ChakraCore builds using ninja

PR-URL: #300
Reviewed-By: Kyle Farnung <kfarnung@microsoft.com>
Reviewed-By: Kunal Pathak <kpathak@microsoft.com>
Reviewed-By: Joao Reis <reis@janeasystems.com>

Author: digitalinfinity

configure

@@ -475,6 +475,18 @@ parser.add_option('--engine',
     default='chakracore',
     help='Use specified JS engine (default is ChakraCore)')
 
+parser.add_option('--chakracore-test-build',
+    action='store_true',
+    dest='chakracore_test_build',
+    default=False,
+    help='Build "test" build of ChakraCore (requires engine to be ChakraCore)')
+
+parser.add_option('--chakracore-ninja-build',
+    action='store_true',
+    dest='chakracore_ninja_build',
+    default=False,
+    help='Enable build of ChakraCore using ninja (requires engine to be ChakraCore)')
+
 parser.add_option('--shared',
     action='store_true',
     dest='shared',
@@ -1320,6 +1332,15 @@ def configure_engine(o):
   o['variables']['node_engine'] = engine
   if engine != 'v8':
     o['variables']['node_use_bundled_v8'] = b(False)
+  if engine == 'chakracore':
+    o['variables']['chakracore_build_config'] = o['default_configuration']
+    if options.chakracore_test_build:
+      o['variables']['chakracore_build_config'] = 'Test'
+    if options.chakracore_ninja_build:
+      o['variables']['chakracore_parallel_build_flags'] = [ "--ninja" ]
+    else:
+      o['variables']['chakracore_parallel_build_flags'] = []
+
 
 output = {
   'variables': {},

deps/chakrashim/chakracore.gyp

@@ -11,7 +11,7 @@
     'chakra_libs_absolute%': '',
 
     # xplat (non-win32) only
-    'chakra_config': 'Release',     # Debug, Release
+    'chakra_config': '<(chakracore_build_config)',     # Debug, Release, Test
 
     'conditions': [
       ['target_arch=="ia32"', { 'Platform': 'x86' }],
@@ -24,8 +24,10 @@
       }],
 
       # xplat (non-win32) only
-      ['chakra_config=="Debug"', {
+      ['chakracore_build_config=="Debug"', {
         'chakra_build_flags': [ '-d' ],
+      }, 'chakracore_build_config=="Test"', {
+        'chakra_build_flags': [ '-t' ],
       }, {
         'chakra_build_flags': [],
       }],
@@ -57,7 +59,7 @@
         ],
 
         'chakracore_win_bin_dir':
-          '<(chakra_dir)/build/vcbuild/bin/<(Platform)_$(ConfigurationName)',
+          '<(chakra_dir)/build/vcbuild/bin/<(Platform)_<(chakracore_build_config)',
         'xplat_dir': '<(chakra_dir)/out/<(chakra_config)',
         'chakra_libs_absolute': '<(PRODUCT_DIR)/../../deps/chakrashim/<(xplat_dir)',
 
@@ -107,7 +109,7 @@
               'action': [
                 'msbuild',
                 '/p:Platform=<(Platform)',
-                '/p:Configuration=$(ConfigurationName)',
+                '/p:Configuration=<(chakracore_build_config)',
                 '/p:RuntimeLib=<(component)',
                 '/p:AdditionalPreprocessorDefinitions=COMPILE_DISABLE_Simdjs=1',
                 '/m',
@@ -119,6 +121,7 @@
                 '<(chakra_dir)/build.sh',
                 '--without=Simdjs',
                 '--static',
+                '<@(chakracore_parallel_build_flags)',
                 '<@(chakra_build_flags)',
                 '<@(icu_args)',
                 '--libs-only'

vcbuild.bat

@@ -44,14 +44,16 @@ set enable_static=
 set build_addons_napi=
 set test_node_inspect=
 set test_check_deopts=
+set engine=chakracore
+set chakracore_test_build=
 set js_test_suites=inspector known_issues message parallel sequential
 set "common_test_suites=%js_test_suites% doctool addons addons-napi&set build_addons=1&set build_addons_napi=1"
-set engine=chakracore
 
 :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"=="chakracoretest" set config=Release&set chakracore_test_build=1&goto arg-ok
 if /i "%1"=="clean"         set target=Clean&goto arg-ok
 if /i "%1"=="ia32"          set target_arch=x86&goto arg-ok
 if /i "%1"=="x86"           set target_arch=x86&goto arg-ok
@@ -130,6 +132,7 @@ set "node_exe=%~dp0%config%\node.exe"
 if not defined native_node_exe set "native_node_exe=%node_exe%"
 
 if "%config%"=="Debug" set configure_flags=%configure_flags% --debug
+if "%chakracore_test_build%"=="1" set configure_flags=%configure_flags% --chakracore-test-build
 if defined nosnapshot set configure_flags=%configure_flags% --without-snapshot
 if defined noetw set configure_flags=%configure_flags% --without-etw& set noetw_msi_arg=/p:NoETW=1
 if defined noperfctr set configure_flags=%configure_flags% --without-perfctr& set noperfctr_msi_arg=/p:NoPerfCtr=1