Skip to content

Commit

Permalink
Use pub get --offline for flutter_frontend_server and const_finder (f…
Browse files Browse the repository at this point in the history
  • Loading branch information
zanderso authored May 11, 2021
1 parent 304ee81 commit 0fe6b7b
Show file tree
Hide file tree
Showing 10 changed files with 151 additions and 219 deletions.
12 changes: 3 additions & 9 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ deps = {

'src/third_party/khronos':
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275',

'src/third_party/googletest':
Var('github_git') + '/google/googletest' + '@' + 'f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4',

Expand Down Expand Up @@ -598,12 +598,6 @@ hooks = [
'pattern': '.',
'action': ['python', 'src/build/vs_toolchain.py', 'update'],
},
{
'name': 'generate_package_files',
'pattern': '.',
'cwd': 'src/',
'action': ['python', 'flutter/tools/generate_package_files.py'],
},
{
# Ensure that we don't accidentally reference any .pyc files whose
# corresponding .py files have already been deleted.
Expand Down Expand Up @@ -659,11 +653,11 @@ hooks = [
'--arch=arm64'],
},
{
'name': 'dart package config',
'name': 'pub get --offline',
'pattern': '.',
'action': [
'python',
'src/flutter/tools/run_third_party_dart.py',
'src/flutter/tools/pub_get_offline.py',
]
},
{
Expand Down
77 changes: 74 additions & 3 deletions flutter_frontend_server/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
name: frontend_server
name: flutter_frontend_server
publish_to: none
version: 0.1.1-dev
description: Communication pipe to Dart Frontend
homepage: http://flutter.io
homepage: https://flutter.dev
author: Flutter Authors <[email protected]>

# Do not add any dependencies that require more than what is provided in
# //third_party/dart/pkg or //third_party/dart/third_party/pkg.
# In particular, package:test is not usable here.

# If you do add packages here, make sure you can run `pub get --offline`, and
# check the .packages and .package_config to make sure all the paths are
# relative to this directory into //third_party/dart

environment:
sdk: ">=2.2.2 <3.0.0"

Expand All @@ -15,13 +24,75 @@ dependencies:
convert: any
crypto: any
front_end: any
frontend_server: any
kernel: any
logging: any
meta: any
quiver: any
package_config: any
path: any
source_span: any
typed_data: any
usage: any
vm: any

dependency_overrides:
_fe_analyzer_shared:
path: ../../third_party/dart/pkg/_fe_analyzer_shared
_js_interop_checks:
path: ../../third_party/dart/pkg/_js_interop_checks
args:
path: ../../third_party/dart/third_party/pkg/args
async:
path: ../../third_party/dart/third_party/pkg/async
bazel_worker:
path: ../../third_party/dart/third_party/pkg/bazel_worker
build_integration:
path: ../../third_party/dart/pkg/build_integration
charcode:
path: ../../third_party/dart/third_party/pkg/charcode
cli_util:
path: ../../third_party/dart/third_party/pkg/cli_util
collection:
path: ../../third_party/dart/third_party/pkg/collection
convert:
path: ../../third_party/dart/third_party/pkg/convert
crypto:
path: ../../third_party/dart/third_party/pkg/crypto
dev_compiler:
path: ../../third_party/dart/pkg/dev_compiler
fixnum:
path: ../../third_party/dart/third_party/pkg/fixnum
front_end:
path: ../../third_party/dart/pkg/front_end
frontend_server:
path: ../../third_party/dart/pkg/frontend_server
kernel:
path: ../../third_party/dart/pkg/kernel
logging:
path: ../../third_party/dart/third_party/pkg/logging
matcher:
path: ../../third_party/dart/third_party/pkg/matcher
meta:
path: ../../third_party/dart/pkg/meta
package_config:
path: ../../third_party/dart/third_party/pkg_tested/package_config
path:
path: ../../third_party/dart/third_party/pkg/path
pedantic:
path: ../../third_party/dart/third_party/pkg/pedantic
protobuf:
path: ../../third_party/dart/third_party/pkg/protobuf/protobuf
source_maps:
path: ../../third_party/dart/third_party/pkg/source_maps
source_span:
path: ../../third_party/dart/third_party/pkg/source_span
stack_trace:
path: ../../third_party/dart/third_party/pkg/stack_trace
term_glyph:
path: ../../third_party/dart/third_party/pkg/term_glyph
typed_data:
path: ../../third_party/dart/third_party/pkg/typed_data
usage:
path: ../../third_party/dart/third_party/pkg/usage
vm:
path: ../../third_party/dart/pkg/vm
41 changes: 0 additions & 41 deletions tools/const_finder/.dart_tool/package_config.json

This file was deleted.

5 changes: 2 additions & 3 deletions tools/const_finder/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
*.dill

!.dart_tool
!.dart_tool/package_config.json
!.packages
!test/fixtures/.dart_tool
!test/fixtures/.dart_tool/package_config.json
!test/fixtures/.packages
7 changes: 0 additions & 7 deletions tools/const_finder/.packages

This file was deleted.

97 changes: 0 additions & 97 deletions tools/generate_package_config/bin/generate_from_legacy.dart

This file was deleted.

8 changes: 0 additions & 8 deletions tools/generate_package_config/pubspec.yaml

This file was deleted.

36 changes: 0 additions & 36 deletions tools/generate_package_files.py

This file was deleted.

Loading

0 comments on commit 0fe6b7b

Please sign in to comment.