Index: sdk/bin/dart2js.bat |
diff --git a/sdk/bin/dart2js.bat b/sdk/bin/dart2js.bat |
index 3992aa0f28353269a53fba2cc75560b7e599454a..2b1df6c6378ab8e5d45a0c9bbf7701537a0f95d6 100644 |
--- a/sdk/bin/dart2js.bat |
+++ b/sdk/bin/dart2js.bat |
@@ -3,13 +3,55 @@ REM Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
REM for details. All rights reserved. Use of this source code is governed by a |
REM BSD-style license that can be found in the LICENSE file. |
-set SCRIPTPATH=%~dp0 |
+setlocal |
-REM Does the path have a trailing slash? If so, remove it. |
-if %SCRIPTPATH:~-1%== set SCRIPTPATH=%SCRIPTPATH:~0,-1% |
+rem Handle the case where dart-sdk/bin has been symlinked to. |
+set DIR_NAME_WITH_SLASH=%~dp0 |
+set DIR_NAME=%DIR_NAME_WITH_SLASH:~0,-1%% |
+call :follow_links "%DIR_NAME%", RETURNED_BIN_DIR |
-set arguments=%* |
-set SNAPSHOTNAME="%SCRIPTPATH%dart2js.snapshot" |
-if exist %SNAPSHOTNAME% set SNAPSHOT=--use_script_snapshot=%SNAPSHOTNAME% |
+rem Get rid of surrounding quotes. |
+for %%i in ("%RETURNED_BIN_DIR%") do set BIN_DIR=%%~fi |
-"%SCRIPTPATH%dart" --no_use_inlining --heap_growth_rate=512 %SNAPSHOT% "%SCRIPTPATH%..\lib\_internal\compiler\implementation\dart2js.dart" %arguments% |
+rem Get absolute full name for SDK_DIR. |
+for %%i in ("%BIN_DIR%\..\") do set SDK_DIR=%%~fi |
+ |
+set DART2JS=%SDK_DIR%lib\_internal\compiler\implementation\dart2js.dart |
+set DART=%BIN_DIR%\dart |
+set SNAPSHOT=%DART2JS%.snapshot |
+ |
+set EXTRA_OPTIONS= |
+set EXTRA_VM_OPTIONS= |
+ |
+if _%DART2JS_DEVELOPER_MODE%_ == _1_ ( |
+ set EXTRA_VM_OPTIONS=%EXTRA_VM_OPTIONS% --checked |
+) |
+ |
+if exist "%SNAPSHOT%" ( |
+ echo Using snapshot "%SNAPSHOT%" >&2 |
+ set EXTRA_VM_OPTIONS=%EXTRA_VM_OPTIONS% --use_script_snapshot="%SNAPSHOT%" |
+) |
+ |
+rem See comments regarding options below in dart2js shell script. |
+set EXTRA_VM_OPTIONS=%EXTRA_VM_OPTIONS% --heap_growth_rate=512 |
+set EXTRA_VM_OPTIONS=%EXTRA_VM_OPTIONS% --no_use_inlining |
+ |
+"%DART%" %EXTRA_VM_OPTIONS% "%DART2JS%" %EXTRA_OPTIONS% %* |
+ |
+endlocal |
+ |
+goto end |
+ |
+:follow_links |
+setlocal |
+for %%i in (%1) do set result=%%~fi |
+set current= |
+for /f "tokens=2 delims=[]" %%i in ('dir /a:l ^"%~dp1^" 2^>nul ^ |
+ ^| find "> %~n1 ["') do ( |
+ set current=%%i |
+) |
+if not "%current%"=="" call :follow_links "%current%", result |
+endlocal & set %~2=%result% |
+goto :eof |
+ |
+:end |