Fixed update-webkit-localizable-strings to work with new extract-localizable-strings

Got rid of extract-webkit-localizable-strings because it was trying to
do update-webkit-localizable-strings' job.

Rubberstamped by Darin.

* Scripts/extract-webkit-localizable-strings: Removed.
* Scripts/update-webkit-localizable-strings: Renamed from
extract-localizable-strings.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23974 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 81588c68d1345ad07ed8e39bfcd962214290e7e6..ff004ff30840b72840e9b1b14633865d91e15331 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2007-07-03  Adam Roben  <aroben@apple.com>
+
+        Fixed update-webkit-localizable-strings to work with new extract-localizable-strings
+
+        Got rid of extract-webkit-localizable-strings because it was trying to
+        do update-webkit-localizable-strings' job.
+
+        Rubberstamped by Darin.
+
+        * Scripts/extract-webkit-localizable-strings: Removed.
+        * Scripts/update-webkit-localizable-strings: Renamed from
+        extract-localizable-strings.
+
 2007-07-03  Adam Roben  <aroben@apple.com>
 
         Modify scripts to keep Mac/Windows localized strings in sync

diff --git a/WebKitTools/Scripts/extract-webkit-localizable-strings b/WebKitTools/Scripts/extract-webkit-localizable-strings
deleted file mode 100755 (executable)
index f1da8cf..0000000
--- a/WebKitTools/Scripts/extract-webkit-localizable-strings
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/perl -w
-
-# Copyright (C) 2007 Apple Inc.  All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer. 
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution. 
-# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
-#     its contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission. 
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-use strict;
-use warnings;
-
-use File::Basename;
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-my @directoriesToScan = ("WebKit", "WebKit/win");
-my $exceptionsFile = "WebKit/StringsNotToBeLocalized.txt";
-
-@ARGV == 0 or die "Usage: " . basename($0) . "\n";
-
-chdirWebKit();
-
-exec "extract-localizable-strings", $exceptionsFile, @directoriesToScan;

diff --git a/WebKitTools/Scripts/update-webkit-localizable-strings b/WebKitTools/Scripts/update-webkit-localizable-strings
index adcffaa50ca2433b0ad3dfadc89634ff8afd8435..a91b9d6eae965bb561fa9d0c831fd5beb38ffb71 100755 (executable)
--- a/WebKitTools/Scripts/update-webkit-localizable-strings
+++ b/WebKitTools/Scripts/update-webkit-localizable-strings
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+# Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -26,14 +26,20 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Script to update localizable strings for WebKit Open Source Project.
-
 use strict;
+use warnings;
+
+use File::Basename;
 use FindBin;
 use lib $FindBin::Bin;
 use webkitdirs;
 
+my @directoriesToScan = ("WebKit", "WebKit/win");
+my $exceptionsFile = "WebKit/StringsNotToBeLocalized.txt";
+
+@ARGV == 0 or die "Usage: " . basename($0) . "\n";
+
 chdirWebKit();
-chdir "WebKit" or die;
-system "sort -u English.lproj/StringsNotToBeLocalized.txt -o English.lproj/StringsNotToBeLocalized.txt";
-system "../WebKitTools/Scripts/extract-localizable-strings";
+
+system "sort -u $exceptionsFile -o $exceptionsFile";
+exec "extract-localizable-strings", $exceptionsFile, @directoriesToScan;