Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
af74a725
Unverified
Commit
af74a725
authored
Mar 24, 2018
by
Alexander Aprelev
Committed by
GitHub
Mar 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Send relative uri when target physical file path is specified. (#15887)
parent
2eebf6a0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
devfs.dart
packages/flutter_tools/lib/src/devfs.dart
+8
-2
resident_runner.dart
packages/flutter_tools/lib/src/resident_runner.dart
+3
-1
run_hot.dart
packages/flutter_tools/lib/src/run_hot.dart
+2
-1
No files found.
packages/flutter_tools/lib/src/devfs.dart
View file @
af74a725
...
@@ -409,6 +409,7 @@ class DevFS {
...
@@ -409,6 +409,7 @@ class DevFS {
ResidentCompiler
generator
,
ResidentCompiler
generator
,
String
dillOutputPath
,
String
dillOutputPath
,
bool
fullRestart:
false
,
bool
fullRestart:
false
,
String
projectRootPath
,
})
async
{
})
async
{
// Mark all entries as possibly deleted.
// Mark all entries as possibly deleted.
for
(
DevFSContent
content
in
_entries
.
values
)
{
for
(
DevFSContent
content
in
_entries
.
values
)
{
...
@@ -503,11 +504,16 @@ class DevFS {
...
@@ -503,11 +504,16 @@ class DevFS {
await
generator
.
recompile
(
mainPath
,
invalidatedFiles
,
await
generator
.
recompile
(
mainPath
,
invalidatedFiles
,
outputPath:
dillOutputPath
??
fs
.
path
.
join
(
getBuildDirectory
(),
'app.dill'
),
outputPath:
dillOutputPath
??
fs
.
path
.
join
(
getBuildDirectory
(),
'app.dill'
),
packagesFilePath
:
_packagesFilePath
);
packagesFilePath
:
_packagesFilePath
);
if
(
compiledBinary
!=
null
&&
compiledBinary
.
isNotEmpty
)
if
(
compiledBinary
!=
null
&&
compiledBinary
.
isNotEmpty
)
{
final
String
entryUri
=
projectRootPath
!=
null
?
fs
.
path
.
relative
(
mainPath
,
from:
projectRootPath
):
mainPath
;
dirtyEntries
.
putIfAbsent
(
dirtyEntries
.
putIfAbsent
(
fs
.
path
.
toUri
(
target
+
'.dill'
),
fs
.
path
.
toUri
(
entryUri
+
'.dill'
),
()
=>
new
DevFSFileContent
(
fs
.
file
(
compiledBinary
))
()
=>
new
DevFSFileContent
(
fs
.
file
(
compiledBinary
))
);
);
}
}
}
if
(
dirtyEntries
.
isNotEmpty
)
{
if
(
dirtyEntries
.
isNotEmpty
)
{
printTrace
(
'Updating files'
);
printTrace
(
'Updating files'
);
...
...
packages/flutter_tools/lib/src/resident_runner.dart
View file @
af74a725
...
@@ -376,7 +376,8 @@ class FlutterDevice {
...
@@ -376,7 +376,8 @@ class FlutterDevice {
bool
bundleFirstUpload:
false
,
bool
bundleFirstUpload:
false
,
bool
bundleDirty:
false
,
bool
bundleDirty:
false
,
Set
<
String
>
fileFilter
,
Set
<
String
>
fileFilter
,
bool
fullRestart:
false
bool
fullRestart:
false
,
String
projectRootPath
,
})
async
{
})
async
{
final
Status
devFSStatus
=
logger
.
startProgress
(
final
Status
devFSStatus
=
logger
.
startProgress
(
'Syncing files to device
${device.name}
...'
,
'Syncing files to device
${device.name}
...'
,
...
@@ -395,6 +396,7 @@ class FlutterDevice {
...
@@ -395,6 +396,7 @@ class FlutterDevice {
generator:
generator
,
generator:
generator
,
fullRestart:
fullRestart
,
fullRestart:
fullRestart
,
dillOutputPath:
dillOutputPath
,
dillOutputPath:
dillOutputPath
,
projectRootPath:
projectRootPath
,
);
);
}
on
DevFSException
{
}
on
DevFSException
{
devFSStatus
.
cancel
();
devFSStatus
.
cancel
();
...
...
packages/flutter_tools/lib/src/run_hot.dart
View file @
af74a725
...
@@ -279,7 +279,8 @@ class HotRunner extends ResidentRunner {
...
@@ -279,7 +279,8 @@ class HotRunner extends ResidentRunner {
bundleFirstUpload:
isFirstUpload
,
bundleFirstUpload:
isFirstUpload
,
bundleDirty:
isFirstUpload
==
false
&&
rebuildBundle
,
bundleDirty:
isFirstUpload
==
false
&&
rebuildBundle
,
fileFilter:
_dartDependencies
,
fileFilter:
_dartDependencies
,
fullRestart:
fullRestart
fullRestart:
fullRestart
,
projectRootPath:
projectRootPath
,
);
);
if
(!
result
)
if
(!
result
)
return
false
;
return
false
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment