diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index ee25f1b7c4a..5be83bf0cca 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -7,7 +7,6 @@ This tracker is for issues related to: * Dart core libraries ("dart:async", "dart:io", etc.) * Dart VM * dart2js -* dartfix * dev_compiler Some other pieces of the Dart ecosystem are maintained elsewhere. Please diff --git a/BUILD.gn b/BUILD.gn index d59ce8e2499..f1332bf39d4 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -107,10 +107,6 @@ group("dartfmt") { deps = [ "utils/dartfmt" ] } -group("dartfix") { - deps = [ "utils/dartfix" ] -} - group("analysis_server") { deps = [ "utils/analysis_server" ] } diff --git a/pkg/pkg.status b/pkg/pkg.status index 63918903121..6b93319434d 100644 --- a/pkg/pkg.status +++ b/pkg/pkg.status @@ -114,7 +114,6 @@ analyzer_plugin/tool/*: SkipByDesign # Only meant to run on vm build_integration/test/*: SkipByDesign # Only meant to run on vm, most use dart:mirrors and dart:io compiler/tool/*: SkipByDesign # Only meant to run on vm dartdev/test/*: SkipByDesign # Only meant to run on vm -dartfix/test/*: SkipByDesign # Only meant to run on vm front_end/test/*: SkipByDesign # Only meant to run on vm, most use dart:mirrors and dart:io front_end/tool/*: SkipByDesign # Only meant to run on vm modular_test/test/memory_pipeline_test: Slow, Pass diff --git a/sdk/bin/dartfix b/sdk/bin/dartfix deleted file mode 100755 index bbeb80d42bb..00000000000 --- a/sdk/bin/dartfix +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file -# for details. All rights reserved. Use of this source code is governed by a -# BSD-style license that can be found in the LICENSE file. - -# Run dartfix.dart on the Dart VM. This script assumes the Dart SDK's -# directory structure. - -function follow_links() { - file="$1" - while [ -h "$file" ]; do - # On Mac OS, readlink -f doesn't work. - file="$(readlink "$file")" - done - echo "$file" -} - -# Unlike $0, $BASH_SOURCE points to the absolute path of this file. -PROG_NAME="$(follow_links "$BASH_SOURCE")" - -# Handle the case where dart-sdk/bin has been symlinked to. -BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" - -SNAPSHOT="$BIN_DIR/snapshots/dartfix.dart.snapshot" - -# We are running the snapshot in the built SDK. -DART="$BIN_DIR/dart" -exec "$DART" "$SNAPSHOT" "$@" diff --git a/sdk/bin/dartfix.bat b/sdk/bin/dartfix.bat deleted file mode 100644 index b58475cd9eb..00000000000 --- a/sdk/bin/dartfix.bat +++ /dev/null @@ -1,44 +0,0 @@ -@echo off -REM Copyright (c) 2013, 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. - -setlocal -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 -rem Get rid of surrounding quotes. -for %%i in ("%RETURNED_BIN_DIR%") do set BIN_DIR=%%~fi - -set DART=%BIN_DIR%\dart -set SNAPSHOT=%BIN_DIR%\snapshots\dartfix.dart.snapshot - -"%DART%" "%SNAPSHOT%" %* - -endlocal - -exit /b %errorlevel% - -rem Follow the symbolic links (junctions points) using `dir to determine the -rem canonical path. Output with a link looks something like this -rem -rem 01/03/2013 10:11 PM abc def -rem [c:\dart_bleeding\dart-repo.9\dart\out\ReleaseIA32\dart-sdk] -rem -rem So in the output of 'dir /a:l "targetdir"' we are looking for a filename -rem surrounded by right angle bracket and left square bracket. Once we get -rem the filename, which is name of the link, we recursively follow that. -:follow_links -setlocal -for %%i in (%1) do set result=%%~fi -set current= -for /f "usebackq tokens=2 delims=[]" %%i in (`dir /a:l "%~dp1" 2^>nul ^ - ^| %SystemRoot%\System32\find.exe "> %~n1 [" 2^>nul`) do ( - set current=%%i -) -if not "%current%"=="" call :follow_links "%current%", result -endlocal & set %~2=%result% -goto :eof - -:end diff --git a/utils/dartdev/BUILD.gn b/utils/dartdev/BUILD.gn index 13885c35ca2..02823aefcc4 100644 --- a/utils/dartdev/BUILD.gn +++ b/utils/dartdev/BUILD.gn @@ -11,12 +11,6 @@ dartdev_files = exec_script("../../tools/list_dart_files.py", ], "list lines") -dartfix_files = exec_script("../../tools/list_dart_files.py", - [ - "absolute", - rebase_path("../../pkg/dartfix"), - ], - "list lines") group("dartdev") { public_deps = [ ":copy_dartdev_kernel" ] } @@ -33,6 +27,6 @@ application_snapshot("generate_dartdev_kernel") { main_dart = "../../pkg/dartdev/bin/dartdev.dart" training_args = [] deps = [ "../dds:dds" ] - inputs = dartdev_files + dartfix_files + inputs = dartdev_files output = "$root_gen_dir/dartdev.dill" } diff --git a/utils/dartfix/BUILD.gn b/utils/dartfix/BUILD.gn deleted file mode 100644 index e8043465c5f..00000000000 --- a/utils/dartfix/BUILD.gn +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file -# for details. All rights reserved. Use of this source code is governed by a -# BSD-style license that can be found in the LICENSE file. - -import("../application_snapshot.gni") - -application_snapshot("dartfix") { - main_dart = "../../pkg/dartfix/bin/dartfix.dart" - training_args = [ "--help" ] -}