Title: [210395] branches/safari-603-branch/Source/WebCore
- Revision
- 210395
- Author
- [email protected]
- Date
- 2017-01-05 15:49:54 -0800 (Thu, 05 Jan 2017)
Log Message
Merge r210368. rdar://problem/28908164
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210394 => 210395)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 23:49:52 UTC (rev 210394)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 23:49:54 UTC (rev 210395)
@@ -1,5 +1,20 @@
2017-01-05 Matthew Hanson <[email protected]>
+ Merge r210368. rdar://problem/28908164
+
+ 2017-01-05 Antoine Quint <[email protected]>
+
+ [Cocoa] Both modern-media-controls/images/iOS modern-media-controls/images/macOS are installed on both platforms
+ https://bugs.webkit.org/show_bug.cgi?id=163871
+
+ Reviewed by Eric Carlson.
+
+ We now only copy modern media controls images, if any, for the current platform.
+
+ * WebCore.xcodeproj/project.pbxproj:
+
+2017-01-05 Matthew Hanson <[email protected]>
+
Merge r210361. rdar://problem/29870245
2017-01-05 Chris Dumez <[email protected]>
Modified: branches/safari-603-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (210394 => 210395)
--- branches/safari-603-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-05 23:49:52 UTC (rev 210394)
+++ branches/safari-603-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-01-05 23:49:54 UTC (rev 210395)
@@ -28714,7 +28714,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "rsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRCROOT/Modules/modern-media-controls/images\" \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\ncd \"$SRCROOT/Modules/modern-media-controls\"\ncat controls/*.css > \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls/modern-media-controls.css\"\ncat `cat js-files` > \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls/modern-media-controls.js\"";
+ shellScript = "SRC_DIR=\"$SRCROOT/Modules/modern-media-controls\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\n\nmkdir -p \"$DST_DIR\"\n\nif [ \"${PLATFORM_NAME}\" == \"macosx\" ]; then\n IMG_OS_PREFIX=\"macOS\"\nfi\n\nif [ \"${PLATFORM_NAME}\" == \"iphoneos\" ] || [ \"${PLATFORM_NAME}\" == \"iphonesimulator\" ]; then\n IMG_OS_PREFIX=\"iOS\"\nfi\n\nif [ -n \"$IMG_OS_PREFIX\" ]; then\n mkdir -p \"$DST_DIR/images\"\n rsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRC_DIR/images/$IMG_OS_PREFIX\" \"$DST_DIR/images\"\nfi\n\ncd \"$SRC_DIR\"\ncat controls/*.css > \"$DST_DIR/modern-media-controls.css\"\ncat `cat js-files` > \"$DST_DIR/modern-media-controls.js\"";
};
DD041FBD09D9DDBE0010AF2A /* Generate Derived Sources */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
