[webkit-changes] cvs commit:
JavaScriptCore/JavaScriptCore.xcodeproj project.pbxproj
Darin
darin at opensource.apple.com
Tue Aug 16 17:05:57 PDT 2005
darin 05/08/16 17:05:56
Modified: pcre Tag: pcre-6-1-branch pcre_compile.c pcre_exec.c
pcre_get.c pcre_maketables.c
JavaScriptCore.xcodeproj Tag: pcre-6-1-branch
project.pbxproj
Log:
More UTF-16 hacking; also updated the project file to merge with TOT.
Revision Changes Path
No revision
No revision
1.1.2.5 +46 -9 JavaScriptCore/pcre/Attic/pcre_compile.c
Index: pcre_compile.c
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/Attic/pcre_compile.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- pcre_compile.c 16 Aug 2005 00:17:16 -0000 1.1.2.4
+++ pcre_compile.c 17 Aug 2005 00:05:55 -0000 1.1.2.5
@@ -1950,12 +1950,14 @@
case ESC_s:
for (c = 0; c < 32; c++) classbits[c] |= cbits[c+cbit_space];
- classbits[1] &= ~0x08; /* Perl 5.004 onwards omits VT from \s */
+ /* JavaScript does not omit VT, so we leave out the following line: */
+ /* classbits[1] &= ~0x08; Perl 5.004 onwards omits VT from \s */
continue;
case ESC_S:
for (c = 0; c < 32; c++) classbits[c] |= ~cbits[c+cbit_space];
- classbits[1] |= 0x08; /* Perl 5.004 onwards omits VT from \s */
+ /* JavaScript does not omit VT, so we leave out the following line: */
+ /* classbits[1] |= 0x08; Perl 5.004 onwards omits VT from \s */
continue;
#ifdef SUPPORT_UCP
@@ -2920,12 +2922,13 @@
{
int i, namelen;
uschar *slot = cd->name_table;
- const pcre_uchar *name; /* Don't amalgamate; some compilers */
+ const pcre_uchar *name; /* Don't amalgamate; some compilers */
name = ++ptr; /* grumble at autoincrement in declaration */
while (*ptr++ != '>');
namelen = ptr - name - 1;
+ // FIXME: This won't work for UTF-16.
for (i = 0; i < cd->names_found; i++)
{
int crc = memcmp(name, slot+2, namelen);
@@ -3350,6 +3353,15 @@
default:
NORMAL_CHAR:
+#if PCRE_UTF16
+ if (c < 128)
+ {
+ mclength = 1;
+ mcbuffer[0] = c;
+ }
+ else
+ mclength = _pcre_ord2utf8(c, mcbuffer);
+#else
mclength = 1;
mcbuffer[0] = c;
@@ -3360,6 +3372,7 @@
mcbuffer[mclength++] = *(++ptr);
}
#endif
+#endif
/* At this point we have the character's bytes in mcbuffer, and the length
in mclength. When not in UTF-8 mode, the length is always 1. */
@@ -4880,6 +4893,19 @@
/* In UTF-8 mode, check for additional bytes. */
+#if PCRE_UTF16
+ if (c > 127)
+ {
+ if (IS_LEADING_SURROGATE(c))
+ {
+ c = DECODE_SURROGATE_PAIR(c, *ptr);
+ ++ptr;
+ }
+ char utf8Buffer[6];
+ lastitemlength = _pcre_ord2utf8(c, utf8Buffer);
+ length += lastitemlength - 1;
+ }
+#else
#ifdef SUPPORT_UTF8
if (utf8 && (c & 0xc0) == 0xc0)
{
@@ -4891,6 +4917,7 @@
}
}
#endif
+#endif
continue;
}
@@ -5015,9 +5042,14 @@
if (firstbyte >= 0) /* Remove caseless flag for non-caseable chars */
{
int ch = firstbyte & 255;
- re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&
- compile_block.fcc[ch] == ch)? ch : firstbyte;
- re->options |= PCRE_FIRSTSET;
+#if PCRE_UTF16
+ if (ch < 127)
+#endif
+ {
+ re->first_byte = ((firstbyte & REQ_CASELESS) != 0 &&
+ compile_block.fcc[ch] == ch)? ch : firstbyte;
+ re->options |= PCRE_FIRSTSET;
+ }
}
else if (is_startline(codestart, 0, compile_block.backref_map))
re->options |= PCRE_STARTLINE;
@@ -5032,9 +5064,14 @@
((re->options & PCRE_ANCHORED) == 0 || (reqbyte & REQ_VARY) != 0))
{
int ch = reqbyte & 255;
- re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&
- compile_block.fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;
- re->options |= PCRE_REQCHSET;
+#if PCRE_UTF16
+ if (ch < 127)
+#endif
+ {
+ re->req_byte = ((reqbyte & REQ_CASELESS) != 0 &&
+ compile_block.fcc[ch] == ch)? (reqbyte & ~REQ_CASELESS) : reqbyte;
+ re->options |= PCRE_REQCHSET;
+ }
}
/* Print out the compiled data for debugging */
1.1.2.4 +29 -5 JavaScriptCore/pcre/Attic/pcre_exec.c
Index: pcre_exec.c
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/Attic/pcre_exec.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- pcre_exec.c 16 Aug 2005 00:17:17 -0000 1.1.2.3
+++ pcre_exec.c 17 Aug 2005 00:05:55 -0000 1.1.2.4
@@ -103,7 +103,7 @@
{
int c;
if (is_subject && length > md->end_subject - p) length = md->end_subject - p;
-while (length-- > 0) {
+while (length-- > 0)
if (isprint(c = *(p++))) printf("%c", c);
#if PCRE_UTF16
else if (c < 256) printf("\\x%02x", c);
@@ -1805,9 +1805,16 @@
{
length = 1;
ecode++;
- GETCHARLEN(fc, ecode, length);
+ GETUTF8CHARLEN(fc, ecode, length);
+#if PCRE_UTF16
+ int dc;
+ ecode += length;
+ GETCHARINC(dc, eptr);
+ if (fc != dc) RRETURN(MATCH_NOMATCH);
+#else
if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
while (length-- > 0) if (*ecode++ != *eptr++) RRETURN(MATCH_NOMATCH);
+#endif
}
else
#endif
@@ -1828,16 +1835,25 @@
{
length = 1;
ecode++;
- GETCHARLEN(fc, ecode, length);
+ GETUTF8CHARLEN(fc, ecode, length);
+#if !PCRE_UTF16
if (length > md->end_subject - eptr) RRETURN(MATCH_NOMATCH);
+#endif
/* If the pattern character's value is < 128, we have only one byte, and
can use the fast lookup table. */
if (fc < 128)
{
+#if PCRE_UTF16
+ int dc;
+ ecode++;
+ dc = *eptr++;
+ if (dc >= 128 || md->lcc[fc] != md->lcc[dc]) RRETURN(MATCH_NOMATCH);
+#else
if (md->lcc[*ecode++] != md->lcc[*eptr++]) RRETURN(MATCH_NOMATCH);
+#endif
}
/* Otherwise we must pick up the subject character */
@@ -3561,9 +3577,17 @@
if (first_byte >= 0)
{
if (first_byte_caseless)
- while (start_match < end_subject &&
- match_block.lcc[*start_match] != first_byte)
+ while (start_match < end_subject)
+ {
+ int sm = *start_match;
+#if PCRE_UTF16
+ if (sm > 127)
+ break;
+#endif
+ if (match_block.lcc[sm] == first_byte)
+ break;
start_match++;
+ }
else
while (start_match < end_subject && *start_match != first_byte)
start_match++;
1.1.2.1 +26 -23 JavaScriptCore/pcre/Attic/pcre_get.c
Index: pcre_get.c
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/Attic/pcre_get.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- pcre_get.c 12 Aug 2005 22:13:27 -0000 1.1
+++ pcre_get.c 17 Aug 2005 00:05:55 -0000 1.1.2.1
@@ -62,8 +62,10 @@
*/
int
-pcre_get_stringnumber(const pcre *code, const char *stringname)
+pcre_get_stringnumber(const pcre *code, const pcre_char *stringname)
{
+// FIXME: This doesn't work for UTF-16 because the name table has 8-bit characters in it!
+#if !PCRE_UTF16
int rc;
int entrysize;
int top, bot;
@@ -87,6 +89,7 @@
if (c == 0) return (entry[0] << 8) + entry[1];
if (c > 0) bot = mid + 1; else top = mid;
}
+#endif
return PCRE_ERROR_NOSUBSTRING;
}
@@ -121,8 +124,8 @@
*/
int
-pcre_copy_substring(const char *subject, int *ovector, int stringcount,
- int stringnumber, char *buffer, int size)
+pcre_copy_substring(const pcre_char *subject, int *ovector, int stringcount,
+ int stringnumber, pcre_char *buffer, int size)
{
int yield;
if (stringnumber < 0 || stringnumber >= stringcount)
@@ -165,8 +168,8 @@
*/
int
-pcre_copy_named_substring(const pcre *code, const char *subject, int *ovector,
- int stringcount, const char *stringname, char *buffer, int size)
+pcre_copy_named_substring(const pcre *code, const pcre_char *subject, int *ovector,
+ int stringcount, const pcre_char *stringname, pcre_char *buffer, int size)
{
int n = pcre_get_stringnumber(code, stringname);
if (n <= 0) return n;
@@ -197,28 +200,28 @@
*/
int
-pcre_get_substring_list(const char *subject, int *ovector, int stringcount,
- const char ***listptr)
+pcre_get_substring_list(const pcre_char *subject, int *ovector, int stringcount,
+ const pcre_char ***listptr)
{
int i;
int size = sizeof(char *);
int double_count = stringcount * 2;
-char **stringlist;
-char *p;
+pcre_char **stringlist;
+pcre_char *p;
for (i = 0; i < double_count; i += 2)
- size += sizeof(char *) + ovector[i+1] - ovector[i] + 1;
+ size += sizeof(pcre_char *) + (ovector[i+1] - ovector[i] + 1) * sizeof(pcre_char);
-stringlist = (char **)(pcre_malloc)(size);
+stringlist = (pcre_char **)(pcre_malloc)(size);
if (stringlist == NULL) return PCRE_ERROR_NOMEMORY;
-*listptr = (const char **)stringlist;
-p = (char *)(stringlist + stringcount + 1);
+*listptr = (const pcre_char **)stringlist;
+p = (pcre_char *)(stringlist + stringcount + 1);
for (i = 0; i < double_count; i += 2)
{
int len = ovector[i+1] - ovector[i];
- memcpy(p, subject + ovector[i], len);
+ memcpy(p, subject + ovector[i], len * sizeof(pcre_char));
*stringlist++ = p;
p += len;
*p++ = 0;
@@ -242,7 +245,7 @@
*/
void
-pcre_free_substring_list(const char **pointer)
+pcre_free_substring_list(const pcre_char **pointer)
{
(pcre_free)((void *)pointer);
}
@@ -275,18 +278,18 @@
*/
int
-pcre_get_substring(const char *subject, int *ovector, int stringcount,
- int stringnumber, const char **stringptr)
+pcre_get_substring(const pcre_char *subject, int *ovector, int stringcount,
+ int stringnumber, const pcre_char **stringptr)
{
int yield;
-char *substring;
+pcre_char *substring;
if (stringnumber < 0 || stringnumber >= stringcount)
return PCRE_ERROR_NOSUBSTRING;
stringnumber *= 2;
yield = ovector[stringnumber+1] - ovector[stringnumber];
-substring = (char *)(pcre_malloc)(yield + 1);
+substring = (pcre_char *)(pcre_malloc)((yield + 1) * sizeof(pcre_char));
if (substring == NULL) return PCRE_ERROR_NOMEMORY;
-memcpy(substring, subject + ovector[stringnumber], yield);
+memcpy(substring, subject + ovector[stringnumber], yield * sizeof(pcre_char));
substring[yield] = 0;
*stringptr = substring;
return yield;
@@ -321,8 +324,8 @@
*/
int
-pcre_get_named_substring(const pcre *code, const char *subject, int *ovector,
- int stringcount, const char *stringname, const char **stringptr)
+pcre_get_named_substring(const pcre *code, const pcre_char *subject, int *ovector,
+ int stringcount, const pcre_char *stringname, const pcre_char **stringptr)
{
int n = pcre_get_stringnumber(code, stringname);
if (n <= 0) return n;
@@ -344,7 +347,7 @@
*/
void
-pcre_free_substring(const char *pointer)
+pcre_free_substring(const pcre_char *pointer)
{
(pcre_free)((void *)pointer);
}
1.1.2.1 +2 -1 JavaScriptCore/pcre/Attic/pcre_maketables.c
Index: pcre_maketables.c
===================================================================
RCS file: /cvs/root/JavaScriptCore/pcre/Attic/pcre_maketables.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- pcre_maketables.c 12 Aug 2005 22:13:27 -0000 1.1
+++ pcre_maketables.c 17 Aug 2005 00:05:55 -0000 1.1.2.1
@@ -122,11 +122,12 @@
/* Finally, the character type table. In this, we exclude VT from the white
space chars, because Perl doesn't recognize it as such for \s and for comments
within regexes. */
+/* But no, in JavaScriptCore we don't, so that's commented out below. */
for (i = 0; i < 256; i++)
{
int x = 0;
- if (i != 0x0b && isspace(i)) x += ctype_space;
+ if (/*i != 0x0b && */ isspace(i)) x += ctype_space;
if (isalpha(i)) x += ctype_letter;
if (isdigit(i)) x += ctype_digit;
if (isxdigit(i)) x += ctype_xdigit;
No revision
No revision
1.5.4.5 +39 -0 JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj,v
retrieving revision 1.5.4.4
retrieving revision 1.5.4.5
diff -u -r1.5.4.4 -r1.5.4.5
--- project.pbxproj 15 Aug 2005 22:46:43 -0000 1.5.4.4
+++ project.pbxproj 17 Aug 2005 00:05:56 -0000 1.5.4.5
@@ -196,6 +196,12 @@
93E26C0008B151D400F85226 /* ucpinternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26BFC08B151D400F85226 /* ucpinternal.h */; };
93E26C0F08B1520900F85226 /* ucptable.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26C0D08B1520900F85226 /* ucptable.c */; };
93E26C1308B1523D00F85226 /* ucptable.c in Headers */ = {isa = PBXBuildFile; fileRef = 93E26C0D08B1520900F85226 /* ucptable.c */; };
+ 93E26CCF08B2921900F85226 /* softlinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26CCE08B2921900F85226 /* softlinking.h */; };
+ 93E26CD008B2921900F85226 /* softlinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 93E26CCE08B2921900F85226 /* softlinking.h */; };
+ 93E26CF708B29A1C00F85226 /* pcre_get.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26CF608B29A1C00F85226 /* pcre_get.c */; };
+ 93E26CF808B29A1C00F85226 /* pcre_get.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26CF608B29A1C00F85226 /* pcre_get.c */; };
+ 93E26DDC08B2A4F400F85226 /* pcre_printint.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26DDB08B2A4F400F85226 /* pcre_printint.c */; };
+ 93E26DDD08B2A4F400F85226 /* pcre_printint.c in Sources */ = {isa = PBXBuildFile; fileRef = 93E26DDB08B2A4F400F85226 /* pcre_printint.c */; };
A85D81F8087B2822006A9172 /* array_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A84E0255597D01FF60F7 /* array_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
A85D81F9087B2822006A9172 /* collector.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8530255597D01FF60F7 /* collector.h */; settings = {ATTRIBUTES = (Private, ); }; };
A85D81FA087B2822006A9172 /* date_object.h in Headers */ = {isa = PBXBuildFile; fileRef = F692A8560255597D01FF60F7 /* date_object.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -521,6 +527,9 @@
93E26BFB08B151D400F85226 /* ucp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucp.h; path = pcre/ucp.h; sourceTree = "<group>"; };
93E26BFC08B151D400F85226 /* ucpinternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ucpinternal.h; path = pcre/ucpinternal.h; sourceTree = "<group>"; };
93E26C0D08B1520900F85226 /* ucptable.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 30; name = ucptable.c; path = pcre/ucptable.c; sourceTree = "<group>"; };
+ 93E26CCE08B2921900F85226 /* softlinking.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = softlinking.h; path = bindings/softlinking.h; sourceTree = "<group>"; };
+ 93E26CF608B29A1C00F85226 /* pcre_get.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_get.c; path = pcre/pcre_get.c; sourceTree = "<group>"; };
+ 93E26DDB08B2A4F400F85226 /* pcre_printint.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = pcre_printint.c; path = pcre/pcre_printint.c; sourceTree = "<group>"; };
93F1981A08245AAE001E9ABC /* keywords.table */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = keywords.table; sourceTree = "<group>"; };
A85D8288087B2822006A9172 /* JavaScriptCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F50888B6030BB74C012A967E /* simple_number.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = simple_number.h; sourceTree = "<group>"; };
@@ -794,6 +803,7 @@
51F0EC9605C88DC700E6DF1B /* objc_utility.h */,
51F0EC9705C88DC700E6DF1B /* objc_utility.mm */,
8442A376074175C2000AE2ED /* softlinking.c */,
+ 93E26CCE08B2921900F85226 /* softlinking.h */,
);
name = bindings;
sourceTree = "<group>";
@@ -819,8 +829,10 @@
930754BF08B0F68000AB3056 /* pcre_compile.c */,
930754E908B0F78500AB3056 /* pcre_exec.c */,
930754E608B0F77700AB3056 /* pcre_fullinfo.c */,
+ 93E26CF608B29A1C00F85226 /* pcre_get.c */,
930754D108B0F76200AB3056 /* pcre_globals.c */,
93E26BC908B1511900F85226 /* pcre_ord2utf8.c */,
+ 93E26DDB08B2A4F400F85226 /* pcre_printint.c */,
930754CE08B0F74500AB3056 /* pcre_tables.c */,
93E26BD008B1513800F85226 /* pcre_try_flipped.c */,
93E26BCD08B1512600F85226 /* pcre_ucp_findchar.c */,
@@ -949,6 +961,7 @@
93E26BFD08B151D400F85226 /* ucp.h in Headers */,
93E26BFE08B151D400F85226 /* ucpinternal.h in Headers */,
93E26C1308B1523D00F85226 /* ucptable.c in Headers */,
+ 93E26CCF08B2921900F85226 /* softlinking.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1032,6 +1045,7 @@
93E26BE708B1517100F85226 /* pcre_internal.h in Headers */,
93E26BFF08B151D400F85226 /* ucp.h in Headers */,
93E26C0008B151D400F85226 /* ucpinternal.h in Headers */,
+ 93E26CD008B2921900F85226 /* softlinking.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1588,6 +1602,8 @@
93E26BCE08B1512600F85226 /* pcre_ucp_findchar.c in Sources */,
93E26BD108B1513800F85226 /* pcre_try_flipped.c in Sources */,
93E26BD408B1514100F85226 /* pcre_xclass.c in Sources */,
+ 93E26CF708B29A1C00F85226 /* pcre_get.c in Sources */,
+ 93E26DDC08B2A4F400F85226 /* pcre_printint.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1682,6 +1698,8 @@
93E26BD208B1513800F85226 /* pcre_try_flipped.c in Sources */,
93E26BD508B1514100F85226 /* pcre_xclass.c in Sources */,
93E26C0F08B1520900F85226 /* ucptable.c in Sources */,
+ 93E26CF808B29A1C00F85226 /* pcre_get.c in Sources */,
+ 93E26DDD08B2A4F400F85226 /* pcre_printint.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1774,6 +1792,7 @@
APPLE_CHANGES,
HAVE_CONFIG_H,
);
+ GCC_STRICT_ALIASING = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
@@ -1781,6 +1800,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
MACOSX_DEPLOYMENT_TARGET = 10.3;
+ OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"$(STYLE_LDFLAGS)",
"-sub_library",
@@ -1825,6 +1845,7 @@
APPLE_CHANGES,
HAVE_CONFIG_H,
);
+ GCC_STRICT_ALIASING = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
@@ -1832,6 +1853,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
MACOSX_DEPLOYMENT_TARGET = 10.3;
+ OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"$(STYLE_LDFLAGS)",
"-sub_library",
@@ -1876,6 +1898,7 @@
APPLE_CHANGES,
HAVE_CONFIG_H,
);
+ GCC_STRICT_ALIASING = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
@@ -1883,6 +1906,7 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
MACOSX_DEPLOYMENT_TARGET = 10.3;
+ OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"$(STYLE_LDFLAGS)",
"-sub_library",
@@ -1927,12 +1951,14 @@
APPLE_CHANGES,
HAVE_CONFIG_H,
);
+ GCC_STRICT_ALIASING = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
HEADER_SEARCH_PATHS = icu;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
+ OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"$(STYLE_LDFLAGS)",
"-sub_library",
@@ -2324,6 +2350,9 @@
149C277208902AFE008A9EFC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_GC = YES;
+ GCC_FAST_OBJC_DISPATCH = YES;
+ GCC_STRICT_ALIASING = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = Development;
@@ -2331,6 +2360,10 @@
149C277308902AFE008A9EFC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_GC = YES;
+ GCC_FAST_OBJC_DISPATCH = YES;
+ GCC_OPTIMIZATION_LEVEL = s;
+ GCC_STRICT_ALIASING = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = Deployment;
@@ -2338,6 +2371,9 @@
149C277408902AFE008A9EFC /* OptimizedWithSymbols */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_GC = YES;
+ GCC_FAST_OBJC_DISPATCH = YES;
+ GCC_STRICT_ALIASING = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = OptimizedWithSymbols;
@@ -2345,6 +2381,9 @@
149C277508902AFE008A9EFC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_ENABLE_OBJC_GC = YES;
+ GCC_FAST_OBJC_DISPATCH = YES;
+ GCC_STRICT_ALIASING = YES;
GCC_THREADSAFE_STATICS = NO;
};
name = Default;
More information about the webkit-changes
mailing list