Skip to content

Commit f010d0c

Browse files
committed
update to dart version 3.2.6 and debug build
1 parent fa78740 commit f010d0c

File tree

6 files changed

+51
-35
lines changed

6 files changed

+51
-35
lines changed

Diff for: .dart_version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# This file contains the current Dart version we build against
2-
3.1.3
2+
3.2.6

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
dart-sdk/*
22
.build/*
3+
build/*
34
artifacts/*

Diff for: README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Github Actions currently builds a Windows x64 `.dll`, A Linux x64 `.so`, and a m
2727
You need:
2828
* git
2929
* Dart 3+
30-
* C++ build tools for your platform (Visual Studio, XCode, gcc, etc)
30+
* C++ build tools for your platform (Visual Studio, XCode, gcc, etc)
31+
* For Windows VS 2019 16.61 with 10.0.20348.0 SDK don't forget install Debugger Tools
3132
* CMake
3233

3334
Optionally, I recommend installing [`depot_tools`](https://www.chromium.org/developers/how-tos/depottools/) and making sure it is on your path before running setup scripts. Without depot_tools, the scripts will download them anyway, but having them already set up will save you some time with subsequent builds.
@@ -40,6 +41,9 @@ Optionally, I recommend installing [`depot_tools`](https://www.chromium.org/deve
4041
The first step is to build a statically linkable verison of Dart. This requires that we download Dart, patch some of the Dart build files, and then run the actual build. Thankfully there is a Dart script to do this.
4142

4243
```bash
44+
cd ./scripts/build_helpers
45+
dart pub get
46+
cd ../..
4347
dart ./scripts/build_helpers/bin/build_dart.dart
4448
```
4549

Diff for: scripts/build_helpers/bin/build_dart.dart

+6-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ void main(List<String> args) async {
4747
exit(-1);
4848
}
4949

50-
if (!await _buildDart()) {
50+
if (!await _buildDart('release')) {
51+
exit(-1);
52+
}
53+
if (!await _buildDart('debug')) {
5154
exit(-1);
5255
}
5356
} catch (e) {
@@ -135,12 +138,12 @@ Future<bool> _patchDartSdk() async {
135138
return result == 0;
136139
}
137140

138-
Future<bool> _buildDart() async {
141+
Future<bool> _buildDart(String buildType) async {
139142
final logger = BuildToolsLogger.shared;
140143
final result = await inDir('dart-sdk/sdk', () async {
141144
logger.i("Building libdart");
142145
var script = './tools/build.py';
143-
var args = ['--no-goma', '-m', 'release', 'libdart'];
146+
var args = ['--no-goma', '-m', buildType, 'libdart'];
144147
var command = script;
145148
if (Platform.isWindows) {
146149
command = 'python';

Diff for: scripts/build_helpers/pubspec.lock

+37-29
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ packages:
55
dependency: transitive
66
description:
77
name: _fe_analyzer_shared
8-
sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
8+
sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "64.0.0"
11+
version: "67.0.0"
1212
analyzer:
1313
dependency: transitive
1414
description:
1515
name: analyzer
16-
sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
16+
sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "6.2.0"
19+
version: "6.4.1"
2020
args:
2121
dependency: "direct main"
2222
description:
@@ -61,10 +61,10 @@ packages:
6161
dependency: transitive
6262
description:
6363
name: coverage
64-
sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb"
64+
sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
6565
url: "https://pub.dev"
6666
source: hosted
67-
version: "1.6.4"
67+
version: "1.7.2"
6868
crypto:
6969
dependency: transitive
7070
description:
@@ -125,18 +125,18 @@ packages:
125125
dependency: transitive
126126
description:
127127
name: js
128-
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
128+
sha256: "4186c61b32f99e60f011f7160e32c89a758ae9b1d0c6d28e2c02ef0382300e2b"
129129
url: "https://pub.dev"
130130
source: hosted
131-
version: "0.6.7"
131+
version: "0.7.0"
132132
lints:
133133
dependency: "direct dev"
134134
description:
135135
name: lints
136-
sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
136+
sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
137137
url: "https://pub.dev"
138138
source: hosted
139-
version: "2.1.1"
139+
version: "3.0.0"
140140
logger:
141141
dependency: "direct main"
142142
description:
@@ -157,26 +157,26 @@ packages:
157157
dependency: transitive
158158
description:
159159
name: matcher
160-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
160+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
161161
url: "https://pub.dev"
162162
source: hosted
163-
version: "0.12.16"
163+
version: "0.12.16+1"
164164
meta:
165165
dependency: transitive
166166
description:
167167
name: meta
168-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
168+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
169169
url: "https://pub.dev"
170170
source: hosted
171-
version: "1.10.0"
171+
version: "1.12.0"
172172
mime:
173173
dependency: transitive
174174
description:
175175
name: mime
176-
sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
176+
sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
177177
url: "https://pub.dev"
178178
source: hosted
179-
version: "1.0.4"
179+
version: "1.0.5"
180180
node_preamble:
181181
dependency: transitive
182182
description:
@@ -197,10 +197,10 @@ packages:
197197
dependency: "direct main"
198198
description:
199199
name: path
200-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
200+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
201201
url: "https://pub.dev"
202202
source: hosted
203-
version: "1.8.3"
203+
version: "1.9.0"
204204
pool:
205205
dependency: transitive
206206
description:
@@ -309,26 +309,26 @@ packages:
309309
dependency: "direct dev"
310310
description:
311311
name: test
312-
sha256: a20ddc0723556dc6dd56094e58ec1529196d5d7774156604cb14e8445a5a82ff
312+
sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
313313
url: "https://pub.dev"
314314
source: hosted
315-
version: "1.24.7"
315+
version: "1.25.2"
316316
test_api:
317317
dependency: transitive
318318
description:
319319
name: test_api
320-
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
320+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
321321
url: "https://pub.dev"
322322
source: hosted
323-
version: "0.6.1"
323+
version: "0.7.0"
324324
test_core:
325325
dependency: transitive
326326
description:
327327
name: test_core
328-
sha256: "96382d0bc826e260b077bb496259e58bc82e90b603ab16cd5ae95dfe1dfcba8b"
328+
sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
329329
url: "https://pub.dev"
330330
source: hosted
331-
version: "0.5.7"
331+
version: "0.6.0"
332332
typed_data:
333333
dependency: transitive
334334
description:
@@ -341,10 +341,10 @@ packages:
341341
dependency: transitive
342342
description:
343343
name: vm_service
344-
sha256: a13d5503b4facefc515c8c587ce3cf69577a7b064a9f1220e005449cf1f64aad
344+
sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246
345345
url: "https://pub.dev"
346346
source: hosted
347-
version: "12.0.0"
347+
version: "14.0.0"
348348
watcher:
349349
dependency: transitive
350350
description:
@@ -353,14 +353,22 @@ packages:
353353
url: "https://pub.dev"
354354
source: hosted
355355
version: "1.1.0"
356+
web:
357+
dependency: transitive
358+
description:
359+
name: web
360+
sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
361+
url: "https://pub.dev"
362+
source: hosted
363+
version: "0.4.2"
356364
web_socket_channel:
357365
dependency: transitive
358366
description:
359367
name: web_socket_channel
360-
sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
368+
sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23"
361369
url: "https://pub.dev"
362370
source: hosted
363-
version: "2.4.0"
371+
version: "2.4.3"
364372
webkit_inspection_protocol:
365373
dependency: transitive
366374
description:
@@ -378,4 +386,4 @@ packages:
378386
source: hosted
379387
version: "3.1.2"
380388
sdks:
381-
dart: ">=3.0.6 <4.0.0"
389+
dart: ">=3.2.0 <4.0.0"

Diff for: scripts/build_helpers/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dependencies:
1313
glob: ^2.1.2
1414

1515
dev_dependencies:
16-
lints: ^2.0.0
16+
lints: ^3.0.0
1717
test: ^1.21.0

0 commit comments

Comments
 (0)