Skip to content

Commit 2dca9b0

Browse files
authored
Add package name arg (#2391)
1 parent b99dcc8 commit 2dca9b0

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

pkgs/native_toolchain_c/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.16.8
2+
3+
* Support building assets for packages which are not the input package.
4+
15
## 0.16.7
26

37
* Support Module Definitions for linking on Windows.

pkgs/native_toolchain_c/lib/src/cbuilder/cbuilder.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class CBuilder extends CTool implements Builder {
5353

5454
CBuilder.library({
5555
required super.name,
56+
super.packageName,
5657
super.assetName,
5758
super.sources = const [],
5859
super.includes = const [],
@@ -81,6 +82,7 @@ class CBuilder extends CTool implements Builder {
8182

8283
CBuilder.executable({
8384
required super.name,
85+
super.packageName,
8486
super.sources = const [],
8587
super.includes = const [],
8688
super.forcedIncludes = const [],
@@ -203,7 +205,7 @@ class CBuilder extends CTool implements Builder {
203205
for (final route in routing) {
204206
output.assets.code.add(
205207
CodeAsset(
206-
package: input.packageName,
208+
package: packageName ?? input.packageName,
207209
name: assetName!,
208210
file: libUri,
209211
linkMode: linkMode,

pkgs/native_toolchain_c/lib/src/cbuilder/clinker.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ class CLinker extends CTool implements Linker {
2323

2424
CLinker.library({
2525
required super.name,
26+
super.packageName,
2627
super.assetName,
2728
required this.linkerOptions,
2829
super.sources = const [],
@@ -99,7 +100,7 @@ class CLinker extends CTool implements Linker {
99100
if (assetName != null) {
100101
output.assets.code.add(
101102
CodeAsset(
102-
package: input.packageName,
103+
package: packageName ?? input.packageName,
103104
name: assetName!,
104105
file: libUri,
105106
linkMode: linkMode,

pkgs/native_toolchain_c/lib/src/cbuilder/ctool.dart

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ abstract class CTool {
2626
/// File will be placed in [LinkInput.outputDirectory].
2727
final String name;
2828

29+
/// The package name to associate the asset with.
30+
///
31+
/// If this is null, it defaults to the [HookInput.packageName].
32+
final String? packageName;
33+
2934
/// Asset identifier.
3035
///
3136
/// Used to output the [CodeAsset].
@@ -164,6 +169,7 @@ abstract class CTool {
164169

165170
CTool({
166171
required this.name,
172+
required this.packageName,
167173
required this.assetName,
168174
required this.sources,
169175
required this.includes,

pkgs/native_toolchain_c/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: native_toolchain_c
22
description: >-
33
A library to invoke the native C compiler installed on the host machine.
4-
version: 0.16.7
4+
version: 0.16.8
55
repository: https://github.com/dart-lang/native/tree/main/pkgs/native_toolchain_c
66

77
topics:

0 commit comments

Comments
 (0)