diff --git a/sdk/bin/dart2js b/sdk/bin/dart2js index 17559bf13b9..d2e983343f4 100755 --- a/sdk/bin/dart2js +++ b/sdk/bin/dart2js @@ -52,4 +52,4 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)" DART2JS="$DART_ROOT/pkg/compiler/lib/src/dart2js.dart" -exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$DART2JS" "${EXTRA_OPTIONS[@]}" "$@" +exec "$DART" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$DART2JS" "${EXTRA_OPTIONS[@]}" "$@" diff --git a/sdk/bin/dart2js.bat b/sdk/bin/dart2js.bat index 4c6669a36bf..76601828b70 100644 --- a/sdk/bin/dart2js.bat +++ b/sdk/bin/dart2js.bat @@ -39,7 +39,7 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1% set DART2JS=%DART_ROOT%\pkg\compiler\lib\src\dart2js.dart -"%DART%" %EXTRA_VM_OPTIONS% "%DART2JS%" %EXTRA_OPTIONS% %* +"%DART%" "--packages=%DART_ROOT%\.packages" %EXTRA_VM_OPTIONS% "%DART2JS%" %EXTRA_OPTIONS% %* endlocal diff --git a/sdk/bin/dartanalyzer b/sdk/bin/dartanalyzer index c508c625503..34ce8956351 100755 --- a/sdk/bin/dartanalyzer +++ b/sdk/bin/dartanalyzer @@ -45,4 +45,4 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)" ANALYZER="$DART_ROOT/pkg/analyzer_cli/bin/analyzer.dart" -exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$ANALYZER" "$SDK_ARG" "$@" +exec "$DART" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$ANALYZER" "$SDK_ARG" "$@" diff --git a/sdk/bin/dartanalyzer.bat b/sdk/bin/dartanalyzer.bat index f03dfbd8c7d..4e8ba547df8 100644 --- a/sdk/bin/dartanalyzer.bat +++ b/sdk/bin/dartanalyzer.bat @@ -40,7 +40,7 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1% set ANALYZER=%DART_ROOT%\pkg\analyzer_cli\bin\analyzer.dart -"%DART%" %EXTRA_VM_OPTIONS% "%ANALYZER%" "%SDK_ARG%" %* +"%DART%" "--packages=%DART_ROOT%\.packages" %EXTRA_VM_OPTIONS% "%ANALYZER%" "%SDK_ARG%" %* endlocal diff --git a/sdk/bin/dartdevc b/sdk/bin/dartdevc index 246f6b75c7b..5b75ad2fdec 100755 --- a/sdk/bin/dartdevc +++ b/sdk/bin/dartdevc @@ -45,4 +45,4 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)" DEV_COMPILER="$DART_ROOT/pkg/dev_compiler/bin/dartdevc.dart" -exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$DEV_COMPILER" "$SDK_ARG" "$@" +exec "$DART" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$DEV_COMPILER" "$SDK_ARG" "$@" diff --git a/sdk/bin/dartdevc.bat b/sdk/bin/dartdevc.bat index 5c714ca7923..dd49b4337fe 100644 --- a/sdk/bin/dartdevc.bat +++ b/sdk/bin/dartdevc.bat @@ -36,7 +36,7 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1% set DEV_COMPILER=%DART_ROOT%\third_party\pkg\dev_compiler\bin\dartdevc.dart -"%DART%" %EXTRA_VM_OPTIONS% "DEV_COMPILER%" "%SDK_ARG%" %* +"%DART%" "--packages=%DART_ROOT%\.packages" %EXTRA_VM_OPTIONS% "DEV_COMPILER%" "%SDK_ARG%" %* endlocal diff --git a/sdk/bin/dartfmt b/sdk/bin/dartfmt index a671c502f86..ad541407ae5 100755 --- a/sdk/bin/dartfmt +++ b/sdk/bin/dartfmt @@ -28,4 +28,4 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)" DARTFMT="$DART_ROOT/third_party/pkg_tested/dart_style/bin/format.dart" -exec "$DART" "$DARTFMT" "$@" +exec "$DART" "--packages=$DART_ROOT/.packages" "$DARTFMT" "$@" diff --git a/sdk/bin/dartfmt.bat b/sdk/bin/dartfmt.bat index edab2ddefe0..cd5930214bc 100644 --- a/sdk/bin/dartfmt.bat +++ b/sdk/bin/dartfmt.bat @@ -27,7 +27,7 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1% set DARTFMT=%DART_ROOT%\third_party\pkg_tested\dart_style\bin\format.dart -"%DART%" "%DARTFMT%" %* +"%DART%" "--packages=%DART_ROOT%\.packages" "%DARTFMT%" %* endlocal diff --git a/sdk/bin/pub b/sdk/bin/pub index 403635f7491..20e9d3d8970 100755 --- a/sdk/bin/pub +++ b/sdk/bin/pub @@ -82,4 +82,4 @@ DART="$BUILD_DIR/dart-sdk/bin/dart" # Run pub. PUB="$SDK_DIR/../third_party/pkg/pub/bin/pub.dart" -exec "$DART" "${VM_OPTIONS[@]}" "$PUB" "$@" +exec "$DART" "--packages=$SDK_DIR/../.packages" "${VM_OPTIONS[@]}" "$PUB" "$@" diff --git a/sdk/bin/pub.bat b/sdk/bin/pub.bat index 03c7bf0899f..2ad2baacbe3 100644 --- a/sdk/bin/pub.bat +++ b/sdk/bin/pub.bat @@ -35,7 +35,7 @@ set DART=%BUILD_DIR%\dart-sdk\bin\dart rem Run pub. set PUB="%SDK_DIR%\..\third_party\pkg\pub\bin\pub.dart" -"%DART%" %VM_OPTIONS% "%PUB%" %* +"%DART%" "--packages=%SDK_DIR%\..\.packages" %VM_OPTIONS% "%PUB%" %* endlocal