Skip to content

Commit

Permalink
Put target specific files in their own directory and update Xcode ref…
Browse files Browse the repository at this point in the history 
…erneces
  • Loading branch information
@chinmaygarde
chinmaygarde committed Dec 11, 2015
1 parent 42deccf commit 34cfa1a
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 34 deletions.
113 changes: 88 additions & 25 deletions sky/build/sdk_xcode_harness/FlutterApplication.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
9E0FB06D1C1A3F5600DDAEFA /* InstructionsSnapshotSource.S in Sources */ = {isa = PBXBuildFile; fileRef = 9E0FB0691C1A3F5600DDAEFA /* InstructionsSnapshotSource.S */; };
9E0FB06E1C1A3F5600DDAEFA /* kDartIsolateSnapshotBufferSource.c in Sources */ = {isa = PBXBuildFile; fileRef = 9E0FB06A1C1A3F5600DDAEFA /* kDartIsolateSnapshotBufferSource.c */; };
9E0FB06F1C1A3F5600DDAEFA /* kDartVmIsolateSnapshotBufferSource.c in Sources */ = {isa = PBXBuildFile; fileRef = 9E0FB06B1C1A3F5600DDAEFA /* kDartVmIsolateSnapshotBufferSource.c */; };
9E29675A1C03C1D200546454 /* FlutterRunner in Resources */ = {isa = PBXBuildFile; fileRef = 9E2967581C03C18700546454 /* FlutterRunner */; };
9E29675B1C03C1D200546454 /* icudtl.dat in Resources */ = {isa = PBXBuildFile; fileRef = 9E2967591C03C18700546454 /* icudtl.dat */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -73,13 +71,20 @@
9E0FB0691C1A3F5600DDAEFA /* InstructionsSnapshotSource.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = InstructionsSnapshotSource.S; sourceTree = "<group>"; };
9E0FB06A1C1A3F5600DDAEFA /* kDartIsolateSnapshotBufferSource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kDartIsolateSnapshotBufferSource.c; sourceTree = "<group>"; };
9E0FB06B1C1A3F5600DDAEFA /* kDartVmIsolateSnapshotBufferSource.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = kDartVmIsolateSnapshotBufferSource.c; sourceTree = "<group>"; };
9E2967531C03C17300546454 /* EmbedderEntryPoints */ = {isa = PBXFileReference; lastKnownFileType = text; name = EmbedderEntryPoints; path = FlutterResources/EmbedderEntryPoints; sourceTree = SOURCE_ROOT; };
9E2967541C03C17300546454 /* PackagerInvoke */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = PackagerInvoke; path = FlutterResources/PackagerInvoke; sourceTree = SOURCE_ROOT; };
9E2967551C03C17300546454 /* Runner.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Runner.xcconfig; path = FlutterResources/Runner.xcconfig; sourceTree = SOURCE_ROOT; };
9E2967561C03C17300546454 /* Snapshotter */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = Snapshotter; path = FlutterResources/Snapshotter; sourceTree = SOURCE_ROOT; };
9E2967571C03C17300546454 /* SnapshotterInvoke */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = SnapshotterInvoke; path = FlutterResources/SnapshotterInvoke; sourceTree = SOURCE_ROOT; };
9E2967581C03C18700546454 /* FlutterRunner */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = FlutterRunner; path = FlutterResources/FlutterRunner; sourceTree = SOURCE_ROOT; };
9E2967591C03C18700546454 /* icudtl.dat */ = {isa = PBXFileReference; lastKnownFileType = file; name = icudtl.dat; path = FlutterResources/icudtl.dat; sourceTree = SOURCE_ROOT; };
9E40462E1C1B617500A4B87C /* EmbedderEntryPoints */ = {isa = PBXFileReference; lastKnownFileType = text; path = EmbedderEntryPoints; sourceTree = "<group>"; };
9E40462F1C1B617500A4B87C /* PackagerInvoke */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = PackagerInvoke; sourceTree = "<group>"; };
9E4046301C1B617500A4B87C /* Runner.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Runner.xcconfig; sourceTree = "<group>"; };
9E4046311C1B617500A4B87C /* ScriptSnapshotter */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = ScriptSnapshotter; sourceTree = "<group>"; };
9E4046321C1B617500A4B87C /* SnapshotterInvoke */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = SnapshotterInvoke; sourceTree = "<group>"; };
9E4046331C1B617500A4B87C /* icudtl.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = icudtl.dat; sourceTree = "<group>"; };
9E4046361C1B617500A4B87C /* FlutterRunner */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = FlutterRunner; sourceTree = "<group>"; };
9E4046371C1B617500A4B87C /* Snapshotter */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = Snapshotter; sourceTree = "<group>"; };
9E4046391C1B617500A4B87C /* FlutterRunner */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = FlutterRunner; sourceTree = "<group>"; };
9E40463A1C1B617500A4B87C /* Snapshotter */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = Snapshotter; sourceTree = "<group>"; };
9E40463D1C1B617500A4B87C /* FlutterRunner */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = FlutterRunner; sourceTree = "<group>"; };
9E40463E1C1B617500A4B87C /* Snapshotter */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = Snapshotter; sourceTree = "<group>"; };
9E4046401C1B617500A4B87C /* FlutterRunner */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = FlutterRunner; sourceTree = "<group>"; };
9E4046411C1B617500A4B87C /* Snapshotter */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = Snapshotter; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -106,7 +111,7 @@
children = (
9E07CF881BE7F4D200BCD8DE /* FlutterApplication */,
9E07CF9B1BE8280A00BCD8DE /* Runner */,
9E07CFEB1BEAA44D00BCD8DE /* FlutterResources */,
9E40462C1C1B617500A4B87C /* Tools */,
9E07CF871BE7F4D200BCD8DE /* Products */,
);
sourceTree = "<group>";
Expand Down Expand Up @@ -164,19 +169,81 @@
name = Generated;
sourceTree = "<group>";
};
9E07CFEB1BEAA44D00BCD8DE /* FlutterResources */ = {
9E40462C1C1B617500A4B87C /* Tools */ = {
isa = PBXGroup;
children = (
9E2967531C03C17300546454 /* EmbedderEntryPoints */,
9E2967541C03C17300546454 /* PackagerInvoke */,
9E2967551C03C17300546454 /* Runner.xcconfig */,
9E2967561C03C17300546454 /* Snapshotter */,
9E2967571C03C17300546454 /* SnapshotterInvoke */,
9E2967581C03C18700546454 /* FlutterRunner */,
9E2967591C03C18700546454 /* icudtl.dat */,
);
name = FlutterResources;
path = RunnerResources;
9E40462D1C1B617500A4B87C /* Common */,
9E4046341C1B617500A4B87C /* Device */,
9E40463B1C1B617500A4B87C /* Simulator */,
);
path = Tools;
sourceTree = "<group>";
};
9E40462D1C1B617500A4B87C /* Common */ = {
isa = PBXGroup;
children = (
9E40462E1C1B617500A4B87C /* EmbedderEntryPoints */,
9E40462F1C1B617500A4B87C /* PackagerInvoke */,
9E4046301C1B617500A4B87C /* Runner.xcconfig */,
9E4046311C1B617500A4B87C /* ScriptSnapshotter */,
9E4046321C1B617500A4B87C /* SnapshotterInvoke */,
9E4046331C1B617500A4B87C /* icudtl.dat */,
);
path = Common;
sourceTree = "<group>";
};
9E4046341C1B617500A4B87C /* Device */ = {
isa = PBXGroup;
children = (
9E4046351C1B617500A4B87C /* Debug */,
9E4046381C1B617500A4B87C /* Release */,
);
path = Device;
sourceTree = "<group>";
};
9E4046351C1B617500A4B87C /* Debug */ = {
isa = PBXGroup;
children = (
9E4046361C1B617500A4B87C /* FlutterRunner */,
9E4046371C1B617500A4B87C /* Snapshotter */,
);
path = Debug;
sourceTree = "<group>";
};
9E4046381C1B617500A4B87C /* Release */ = {
isa = PBXGroup;
children = (
9E4046391C1B617500A4B87C /* FlutterRunner */,
9E40463A1C1B617500A4B87C /* Snapshotter */,
);
path = Release;
sourceTree = "<group>";
};
9E40463B1C1B617500A4B87C /* Simulator */ = {
isa = PBXGroup;
children = (
9E40463C1C1B617500A4B87C /* Debug */,
9E40463F1C1B617500A4B87C /* Release */,
);
path = Simulator;
sourceTree = "<group>";
};
9E40463C1C1B617500A4B87C /* Debug */ = {
isa = PBXGroup;
children = (
9E40463D1C1B617500A4B87C /* FlutterRunner */,
9E40463E1C1B617500A4B87C /* Snapshotter */,
);
path = Debug;
sourceTree = "<group>";
};
9E40463F1C1B617500A4B87C /* Release */ = {
isa = PBXGroup;
children = (
9E4046401C1B617500A4B87C /* FlutterRunner */,
9E4046411C1B617500A4B87C /* Snapshotter */,
);
path = Release;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand Down Expand Up @@ -285,8 +352,6 @@
files = (
9E07CFAC1BE8280A00BCD8DE /* LaunchScreen.storyboard in Resources */,
9E07CFA91BE8280A00BCD8DE /* Assets.xcassets in Resources */,
9E29675B1C03C1D200546454 /* icudtl.dat in Resources */,
9E29675A1C03C1D200546454 /* FlutterRunner in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -392,7 +457,6 @@
/* Begin XCBuildConfiguration section */
9E07CF8C1BE7F4D200BCD8DE /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9E2967551C03C17300546454 /* Runner.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(FLUTTER_TARGET_ARCH)";
Expand Down Expand Up @@ -442,7 +506,6 @@
};
9E07CF8D1BE7F4D200BCD8DE /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 9E2967551C03C17300546454 /* Runner.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(FLUTTER_TARGET_ARCH)";
Expand Down
2 changes: 1 addition & 1 deletion sky/build/sdk_xcode_harness/Runner/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<string>Flutter</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
Expand Down
27 changes: 19 additions & 8 deletions sky/build/sky_precompilation_sdk.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,18 @@ template("sky_precompilation_sdk") {

sdk_name = invoker.sdk_name
sdk_dir = "$root_out_dir/$sdk_name"
resources_dir = "FlutterResources"
tools_dir_name = "Tools"
tools_dir = "$tools_dir_name/Common"

arch_tools_dir = "$tools_dir_name/Device"
if (use_ios_simulator) {
arch_tools_dir = "$tools_dir_name/Simulator"
}

arch_tools_dir = "$arch_tools_dir/Release"
if (is_debug) {
arch_tools_dir = "$arch_tools_dir/Debug"
}

snapshotter_copy_gen_target_name = target_name + "_copy_snapshotter"
copy(snapshotter_copy_gen_target_name) {
Expand All @@ -21,7 +32,7 @@ template("sky_precompilation_sdk") {
snapshotter_name = get_label_info(snapshotter_target, "name")

sources = [ "$snapshotter_directory/$snapshotter_name" ]
outputs = [ "$sdk_dir/$resources_dir/Snapshotter" ]
outputs = [ "$sdk_dir/$arch_tools_dir/Snapshotter" ]

deps = [ snapshotter_target ]
}
Expand All @@ -35,22 +46,22 @@ template("sky_precompilation_sdk") {
script_snapshotter_name = get_label_info(script_snapshotter_target, "name")

sources = [ "$script_snapshotter_directory/$script_snapshotter_name" ]
outputs = [ "$sdk_dir/$resources_dir/ScriptSnapshotter" ]
outputs = [ "$sdk_dir/$tools_dir/ScriptSnapshotter" ]

deps = [ script_snapshotter_target ]
}

copy("embedder_entry_points") {
sources = [ "//sky/engine/bindings/dart_vm_entry_points.txt" ]
outputs = [ "$sdk_dir/$resources_dir/EmbedderEntryPoints" ]
outputs = [ "$sdk_dir/$tools_dir/EmbedderEntryPoints" ]
}

copy("precompilation_xcode_scripts") {
sources = [
"//sky/build/SnapshotterInvoke",
"//sky/build/PackagerInvoke",
]
outputs = [ "$sdk_dir/$resources_dir/{{source_file_part}}" ]
outputs = [ "$sdk_dir/$tools_dir/{{source_file_part}}" ]
}

copy("copy_sdk_xcode_harness") {
Expand All @@ -76,7 +87,7 @@ template("sky_precompilation_sdk") {
copy_runner_gen_target_name = target_name + "_copy_runner"
copy(copy_runner_gen_target_name) {
sources = [ "$root_out_dir/$executable_gen_target_name" ]
outputs = [ "$sdk_dir/$resources_dir/FlutterRunner" ]
outputs = [ "$sdk_dir/$arch_tools_dir/FlutterRunner" ]

deps = [ ":$executable_gen_target_name" ]
}
Expand All @@ -85,14 +96,14 @@ template("sky_precompilation_sdk") {
copy(copy_data_gen_target_name) {
set_sources_assignment_filter([])
sources = [ "//third_party/icu/android/icudtl.dat" ]
outputs = [ "$sdk_dir/$resources_dir/{{source_file_part}}" ]
outputs = [ "$sdk_dir/$tools_dir/{{source_file_part}}" ]
set_sources_assignment_filter(sources_assignment_filter)
}

copy_config_gen_target_name = target_name + "_sdk_config"
file_template(copy_config_gen_target_name) {
input = "//sky/build/Runner.xcconfig.template"
output = "$sdk_dir/$resources_dir/Runner.xcconfig"
output = "$sdk_dir/$tools_dir/Runner.xcconfig"
variables = "target_arch=$target_cpu"
}

Expand Down

0 comments on commit 34cfa1a

Please sign in to comment.