[MERGE chakra-core#716] Change GenByteCode.cmd to allow generating bytecodes from alternately-named binaries in different locations.

dilijev · dilijev · commit 6c5da580662d · 2016-04-21T12:10:30.000-07:00
Merge pull request chakra-core#716 from dilijev:regen
diff --git a/lib/Runtime/Library/InJavascript/GenByteCode.cmd b/lib/Runtime/Library/InJavascript/GenByteCode.cmd
@@ -6,30 +6,58 @@
 @echo off
 setlocal
 set _HASERROR=0
+set _binary=ch.exe
 
-if "%1"=="-nojit" (
-    set _suffix=.nojit
-    shift
+if "%_FILE%" == "" (
+    set "_FILE=%~dp0*.js"
 )
 
-:: This script will expect ch.exe to be built for x86_debug and x64_debug
-set _BinLocation=%~dp0..\..\..\..\Build\VcBuild%_suffix%\bin
-if "%OutBaseDir%" NEQ "" (
-  set _BinLocation=%OutBaseDir%\Chakra.Core%_suffix%\bin
+:ContinueArgParse
+if not [%1]==[] (
+    if [%1]==[-nojit] (
+        set _suffix=.nojit
+        goto :ContinueArgParseEnd
+    )
+    if [%1]==[-binary] (
+        if [%2]==[] (
+            echo Error: no argument supplied to -binary. Exiting ...
+            exit /b 1
+        )
+        set _binary=%2
+        shift
+        goto :ContinueArgParseEnd
+    )
+    if [%1]==[-bindir] (
+        if [%2]==[] (
+            echo Error: no argument supplied to -bindir. Exiting ...
+            exit /b 1
+        )
+        set _BinLocation=%2
+        shift
+        goto :ContinueArgParseEnd
+    )
+
+    :ContinueArgParseEnd
+    shift
+    goto :ContinueArgParse
 )
 
-if not exist %_BinLocation%\x86_debug\ch.exe (
-    echo Error: %_BinLocation%\x86_debug\ch.exe not found, please build sources. Exiting ...
-    exit /b 1
+:: This script will expect %_binary% to be built for x86_debug and x64_debug
+
+if "%_BinLocation%"=="" (
+    set _BinLocation=%~dp0..\..\..\..\Build\VcBuild%_suffix%\bin
+) else if "%OutBaseDir%" NEQ "" (
+    set _BinLocation=%OutBaseDir%\Chakra.Core%_suffix%\bin
 )
 
-if not exist %_BinLocation%\x64_debug\ch.exe (
-    echo Error: %_BinLocation%\x64_debug\ch.exe not found, please build sources. Exiting ...
+if not exist %_BinLocation%\x86_debug\%_binary% (
+    echo Error: %_BinLocation%\x86_debug\%_binary% not found, please build sources. Exiting ...
     exit /b 1
 )
 
-if "%_FILE%" == "" (
-    set "_FILE=%~dp0*.js"
+if not exist %_BinLocation%\x64_debug\%_binary% (
+    echo Error: %_BinLocation%\x64_debug\%_binary% not found, please build sources. Exiting ...
+    exit /b 1
 )
 
 for %%i in (%_FILE%) do (
@@ -46,7 +74,7 @@ call :Generate %1 %_BinLocation%\x64_debug %1%_suffix%.bc.64b.h
 exit /B 0
 
 :Generate
-%2\ch.exe -GenerateLibraryByteCodeHeader:%3 -Intl %1
+%2\%_binary% -GenerateLibraryByteCodeHeader:%3 -Intl %1
 if "%errorlevel%" NEQ "0" (
     echo %1: Error generating bytecode file. Ensure %3 writable.
     set _HASERROR=1
