Changeset 97798 in webkit

Timestamp:

Oct 18, 2011 3:47:21 PM (13 years ago)

Author:

Joseph Pecoraro

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.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/English.lproj/localizedStrings.js (modified) (previous)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/check-inspector-strings (modified) (2 diffs)
• Tools/Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-18  Joseph Pecoraro  <joepeck@webkit.org>
+
+        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  <tony@chromium.org>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-18  Joseph Pecoraro  <joepeck@webkit.org>
+
+        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  <kubo@profusion.mobi>
 

trunk/Tools/Scripts/check-inspector-strings

@@ -31 +31 @@
 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
@@ -91 +93 @@
     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)

trunk/Tools/Scripts/webkitdirs.pm

@@ -1307 +1307 @@
         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;
 }