提交 3a463204 编写于 作者: I Ian Fischer

Rename skyx to flx in sky.

This is needed for coordination with sky_tools development.
上级 8b21e382
......@@ -176,7 +176,7 @@ if (is_android) {
native_libs = [ "libsky_shell.so" ]
asset_location = "$root_build_dir/sky_shell/assets"
extensions_to_not_compress = ".skyx"
extensions_to_not_compress = ".flx"
deps = [
":assets",
......
......@@ -35,7 +35,7 @@ import org.domokit.vsync.VSyncProviderImpl;
*/
public class SkyApplication extends BaseChromiumApplication {
static final String SNAPSHOT = "snapshot_blob.bin";
static final String APP_BUNDLE = "app.skyx";
static final String APP_BUNDLE = "app.flx";
static final String MANIFEST = "sky.yaml";
private static final String TAG = "SkyApplication";
......
......@@ -186,13 +186,13 @@ static std::string SkPictureTracingPath() {
}
- (NSString*)skyInitialBundleURL {
NSString *skyxBundlePath = [[NSBundle mainBundle] pathForResource:@"app" ofType:@"skyx"];
NSString *flxBundlePath = [[NSBundle mainBundle] pathForResource:@"app" ofType:@"flx"];
#ifndef NDEBUG
NSFileManager *fileManager = [NSFileManager defaultManager];
NSError *error = nil;
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
NSString *documentsDirectory = [paths objectAtIndex:0];
NSString *skyxDocsPath = [documentsDirectory stringByAppendingPathComponent:@"app.skyx"];
NSString *flxDocsPath = [documentsDirectory stringByAppendingPathComponent:@"app.flx"];
// Write an empty file to help identify the correct simulator app by its bundle id. See sky_tool for its use.
NSString *bundleIDPath = [documentsDirectory stringByAppendingPathComponent:[[NSBundle mainBundle] bundleIdentifier]];
......@@ -201,16 +201,16 @@ static std::string SkPictureTracingPath() {
NSLog(@"Couldn't write the bundle id file %@: auto reloading on the iOS simulator won't work\n%@", bundleIDPath, error);
}
if (skyxBundlePath != nil && [fileManager fileExistsAtPath:skyxDocsPath] == NO) {
if ([fileManager copyItemAtPath:skyxBundlePath toPath:skyxDocsPath error:&error]) {
return skyxDocsPath;
if (flxBundlePath != nil && [fileManager fileExistsAtPath:flxDocsPath] == NO) {
if ([fileManager copyItemAtPath:flxBundlePath toPath:flxDocsPath error:&error]) {
return flxDocsPath;
}
NSLog(@"Error encountered copying app.skyx from the Bundle to the Documents directory. Dynamic reloading will not be possible. %@", error);
return skyxBundlePath;
NSLog(@"Error encountered copying app.flx from the Bundle to the Documents directory. Dynamic reloading will not be possible. %@", error);
return flxBundlePath;
}
return skyxDocsPath;
return flxDocsPath;
#endif
return skyxBundlePath;
return flxBundlePath;
}
- (void)connectToEngineAndLoad {
......
......@@ -73,13 +73,13 @@ static inline sky::EventType EventTypeFromNSEventPhase(NSEventPhase phase) {
}
- (NSString*)skyInitialBundleURL {
return [[NSBundle mainBundle] pathForResource:@"app" ofType:@"skyx"];
return [[NSBundle mainBundle] pathForResource:@"app" ofType:@"flx"];
}
// TODO(eseidel): This does not belong in sky_window!
// Probably belongs in NSApplicationDelegate didFinishLaunching.
// We also want a separate setup for normal apps vs SkyShell
// normal apps only use a skyx vs. SkyShell which always pulls from network.
// normal apps only use a flx vs. SkyShell which always pulls from network.
- (void)setupAndLoadDart {
auto interface_request = mojo::GetProxy(&_sky_engine);
self.platformView->ConnectToEngine(interface_request.Pass());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册