2006-03-29 Darin Adler <darin@apple.com>
Reviewed by Anders.
- another cut at fixing the buildbot
* generate-derived-sources: Fix if statement that was always following
the Windows case. I believe this is the main problem.
* WebCore.xcodeproj/project.pbxproj: Added CharsetData.h and added CharsetData.cpp
to the target.
* WebCore.vcproj/WebCore/WebCore.vcproj: Similar changes.
* platform/CharsetData.h: Added.
* platform/CharsetNames.cpp: Moved the actual character set data out into a
separate source file instead of include a .cpp file.
* platform/make-charset-table.pl: Changed to generate a file that can stand alone.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13558 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/platform/make-charset-table.pl b/WebCore/platform/make-charset-table.pl
index a233d32..83c940f 100755
--- a/WebCore/platform/make-charset-table.pl
+++ b/WebCore/platform/make-charset-table.pl
@@ -1,10 +1,33 @@
#!/usr/bin/perl -w
+# Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, 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;
-
-my $MAC_SUPPORTED_ONLY = 1;
-
my %aliasesFromCharsetsFile;
my %namesWritten;
@@ -25,7 +48,7 @@
error "$name shows up twice in output" if $namesWritten{$name};
$namesWritten{$name} = 1;
- $output .= " { \"$name\", $prefix$encoding, $flags },\n";
+ $output .= " { \"$name\", $prefix$encoding, $flags },\n";
}
sub process_platform_encodings
@@ -183,6 +206,18 @@
exit 1 if $error;
-print "static const CharsetEntry table[] = {\n";
-print $output;
-print " { 0, WebCore::InvalidEncoding, NoEncodingFlags }\n};\n";
+print <<EOF
+// File generated by make-charset-table.pl. Do not edit!
+
+#include "config.h"
+#include "CharsetData.h"
+
+namespace WebCore {
+
+ const CharsetEntry CharsetTable[] = {
+$output
+ { 0, WebCore::InvalidEncoding, NoEncodingFlags }
+ };
+
+}
+EOF
