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
003ecb67
Commit
003ecb67
authored
Dec 09, 2015
by
Adam Barth
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #819 from abarth/travis_artifacts
Switch over to the Travis-built artifacts
parents
5cdfb2d7
2b6b781c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
22 deletions
+17
-22
artifacts.dart
packages/flutter_tools/lib/src/artifacts.dart
+1
-5
run_mojo.dart
packages/flutter_tools/lib/src/commands/run_mojo.dart
+16
-17
No files found.
packages/flutter_tools/lib/src/artifacts.dart
View file @
003ecb67
...
...
@@ -40,11 +40,7 @@ String _getNameForTargetPlatform(TargetPlatform platform) {
// Keep in sync with https://github.com/flutter/engine/blob/master/sky/tools/release_engine.py
// and https://github.com/flutter/buildbot/blob/master/travis/build.sh
String
_getCloudStorageBaseUrl
(
{
String
platform
,
String
revision
})
{
// In the fullness of time, we'll have a consistent URL pattern for all of
// our artifacts, but, for the time being, Mac OS X artifacts are stored in a
// different cloud storage bucket.
String
bucket
=
(
platform
==
'darwin-x64'
)
?
"mojo_infra"
:
"mojo"
;
return
'https://storage.googleapis.com/
$bucket
/flutter/
$revision
/
$platform
/'
;
return
'https://storage.googleapis.com/mojo_infra/flutter/
$revision
/
$platform
/'
;
}
enum
ArtifactType
{
...
...
packages/flutter_tools/lib/src/commands/run_mojo.dart
View file @
003ecb67
...
...
@@ -88,31 +88,30 @@ class RunMojoCommand extends FlutterCommand {
args
.
add
(
command
);
BuildConfiguration
config
=
_getCurrentHostConfig
();
final
String
appPath
=
_makePathAbsolute
(
bundlePath
);
String
flutterPath
;
if
(
config
==
null
||
config
.
type
==
BuildType
.
prebuilt
)
{
TargetPlatform
targetPlatform
=
argResults
[
'android'
]
?
TargetPlatform
.
android
:
TargetPlatform
.
linux
;
Artifact
artifact
=
ArtifactStore
.
getArtifact
(
type:
ArtifactType
.
mojo
,
targetPlatform:
targetPlatform
);
flutterPath
=
_makePathAbsolute
(
await
ArtifactStore
.
getPath
(
artifact
));
}
else
{
String
localPath
=
path
.
join
(
config
.
buildDir
,
'flutter.mojo'
);
flutterPath
=
_makePathAbsolute
(
localPath
);
}
if
(
argResults
[
'android'
])
{
args
.
add
(
'--android'
);
final
String
appPath
=
_makePathAbsolute
(
bundlePath
);
final
String
appName
=
path
.
basename
(
appPath
);
final
String
appDir
=
path
.
dirname
(
appPath
);
args
.
add
(
'http://app/
$appName
'
);
args
.
add
(
'--map-origin=http://app/=
$appDir
'
);
if
(
config
==
null
||
config
.
type
==
BuildType
.
prebuilt
)
{
final
String
cloudStorageBaseUrl
=
ArtifactStore
.
getCloudStorageBaseUrl
(
'android-arm'
);
args
.
add
(
'--map-origin=http://flutter/=
$cloudStorageBaseUrl
'
);
}
else
{
args
.
add
(
'--map-origin=http://flutter/=
${config.buildDir}
'
);
}
args
.
add
(
'--url-mappings=mojo:flutter=http://flutter/flutter.mojo'
);
final
String
flutterName
=
path
.
basename
(
flutterPath
);
final
String
flutterDir
=
path
.
dirname
(
flutterPath
);
args
.
add
(
'--map-origin=http://flutter/=
$flutterDir
'
);
args
.
add
(
'--url-mappings=mojo:flutter=http://flutter/
$flutterName
'
);
}
else
{
final
String
appPath
=
_makePathAbsolute
(
bundlePath
);
String
flutterPath
;
if
(
config
==
null
||
config
.
type
==
BuildType
.
prebuilt
)
{
Artifact
artifact
=
ArtifactStore
.
getArtifact
(
type:
ArtifactType
.
mojo
,
targetPlatform:
TargetPlatform
.
linux
);
flutterPath
=
_makePathAbsolute
(
await
ArtifactStore
.
getPath
(
artifact
));
}
else
{
String
localPath
=
path
.
join
(
config
.
buildDir
,
'flutter.mojo'
);
flutterPath
=
_makePathAbsolute
(
localPath
);
}
args
.
add
(
'file://
$appPath
'
);
args
.
add
(
'--url-mappings=mojo:flutter=file://
$flutterPath
'
);
}
...
...
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