Title: [97798] trunk
- Revision
- 97798
- Author
- [email protected]
- Date
- 2011-10-18 15:47:21 -0700 (Tue, 18 Oct 2011)
Log Message
<http://webkit.org/b/70365> Web Inspector: Some localizedStrings.js Updates
Reviewed by Darin Adler.
Source/WebCore:
Fixed syntax issue, added missing strings, and removed a duplicate.
* English.lproj/localizedStrings.js:
Tools:
* Scripts/check-inspector-strings:
Updated to the new webkitpy way to determine checkout root.
* Scripts/webkitdirs.pm:
(copyInspectorFrontendFiles):
Made it so build-webkit --inspector-frontend copies over
the localizedStrings.js file as well as the frontend files.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97797 => 97798)
--- trunk/Source/WebCore/ChangeLog 2011-10-18 22:45:35 UTC (rev 97797)
+++ trunk/Source/WebCore/ChangeLog 2011-10-18 22:47:21 UTC (rev 97798)
@@ -1,3 +1,14 @@
+2011-10-18 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Some localizedStrings.js Updates
+ https://bugs.webkit.org/show_bug.cgi?id=70365
+
+ Reviewed by Darin Adler.
+
+ Fixed syntax issue, added missing strings, and removed a duplicate.
+
+ * English.lproj/localizedStrings.js:
+
2011-10-18 Tony Chang <[email protected]>
fix unused-but-set-variable warnings in WebCore
Modified: trunk/Source/WebCore/English.lproj/localizedStrings.js
(Binary files differ)
Modified: trunk/Tools/ChangeLog (97797 => 97798)
--- trunk/Tools/ChangeLog 2011-10-18 22:45:35 UTC (rev 97797)
+++ trunk/Tools/ChangeLog 2011-10-18 22:47:21 UTC (rev 97798)
@@ -1,3 +1,18 @@
+2011-10-18 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Some localizedStrings.js Updates
+ https://bugs.webkit.org/show_bug.cgi?id=70365
+
+ Reviewed by Darin Adler.
+
+ * Scripts/check-inspector-strings:
+ Updated to the new webkitpy way to determine checkout root.
+
+ * Scripts/webkitdirs.pm:
+ (copyInspectorFrontendFiles):
+ Made it so build-webkit --inspector-frontend copies over
+ the localizedStrings.js file as well as the frontend files.
+
2011-10-18 Raphael Kubo da Costa <[email protected]>
[EFL] DRT: Clear list of visited pages before each test.
Modified: trunk/Tools/Scripts/check-inspector-strings (97797 => 97798)
--- trunk/Tools/Scripts/check-inspector-strings 2011-10-18 22:45:35 UTC (rev 97797)
+++ trunk/Tools/Scripts/check-inspector-strings 2011-10-18 22:47:21 UTC (rev 97798)
@@ -30,10 +30,12 @@
import codecs
import logging
+import os
+import os.path
import re
import sys
-from webkitpy.style_references import detect_checkout
+from webkitpy.common.checkout.scm import detect_scm_system
from webkitpy.common.system.logutils import configure_logging
from webkitpy.style.checker import ProcessorBase
from webkitpy.style.filereader import TextFileReader
@@ -90,12 +92,15 @@
if __name__ == "__main__":
configure_logging()
- checkout = detect_checkout()
- if checkout is None:
+ cwd = os.path.abspath(os.curdir)
+ scm = detect_scm_system(cwd)
+
+ if scm is None:
_log.error("WebKit checkout not found: You must run this script "
"from within a WebKit checkout.")
sys.exit(1)
- checkout_root = checkout.root_path()
+
+ checkout_root = scm.checkout_root
_log.debug("WebKit checkout found with root: %s" % checkout_root)
change_directory(checkout_root=checkout_root, paths=None)
Modified: trunk/Tools/Scripts/webkitdirs.pm (97797 => 97798)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-10-18 22:45:35 UTC (rev 97797)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-10-18 22:47:21 UTC (rev 97798)
@@ -1306,6 +1306,13 @@
print "*************************************************************\n";
die;
}
+
+ if (isAppleMacWebKit()) {
+ my $sourceLocalizedStrings = sourceDir() . "/Source/WebCore/English.lproj/localizedStrings.js";
+ my $destinationLocalizedStrings = $productDir . "/WebCore.framework/Resources/English.lproj/localizedStrings.js";
+ system "ditto", $sourceLocalizedStrings, $destinationLocalizedStrings;
+ }
+
return system "rsync", "-aut", "--exclude=/.DS_Store", "--exclude=*.re2js", "--exclude=.svn/", !isQt() ? "--exclude=/WebKit.qrc" : "", $sourceInspectorPath, $inspectorResourcesDirPath;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
