From a1f6960b1e7568f18887cd35bb3fe6b3b7f69eae Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Wed, 18 May 2011 14:31:09 +0100
Subject: Merge WebKit at r78450: Fix Makefiles

PCRE switched for YARR - http://trac.webkit.org/changeset/78042

Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
---
 Source/JavaScriptCore/Android.mk        | 17 ++---------------
 Source/JavaScriptCore/Android.v8.wtf.mk | 28 ++++++++++------------------
 2 files changed, 12 insertions(+), 33 deletions(-)

(limited to 'Source/JavaScriptCore')

diff --git a/Source/JavaScriptCore/Android.mk b/Source/JavaScriptCore/Android.mk
index 269d298..31d6fde 100644
--- a/Source/JavaScriptCore/Android.mk
+++ b/Source/JavaScriptCore/Android.mk
@@ -64,6 +64,7 @@ LOCAL_SRC_FILES := \
 	parser/Nodes.cpp \
 	parser/Parser.cpp \
 	parser/ParserArena.cpp \
+	parser/SourceProviderCache.cpp \
 	\
 	profiler/Profile.cpp \
 	profiler/ProfileGenerator.cpp \
@@ -172,11 +173,8 @@ LOCAL_SRC_FILES := \
 	wtf/HashTable.cpp \
 	wtf/MD5.cpp \
 	wtf/MainThread.cpp \
-<<<<<<< HEAD
 	wtf/OSAllocatorPosix.cpp \
-=======
 	wtf/OSRandomSource.cpp \
->>>>>>> webkit.org at r78450
 	wtf/PageAllocationAligned.cpp\
 	wtf/PageBlock.cpp\
 	wtf/RandomNumber.cpp \
@@ -238,21 +236,10 @@ $(LEXER_HEADER): $(LOCAL_PATH)/create_hash_table
 $(LEXER_HEADER): $(intermediates)/%.lut.h : $(LOCAL_PATH)/parser/Keywords.table
 	$(transform-generated-source)
 
-<<<<<<< HEAD
-CHARTABLES := $(intermediates)/chartables.c
-$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH)
-$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@
-$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables
-$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h
-	$(transform-generated-source)
-
 REGEXP_JIT_TABLES := $(intermediates)/RegExpJitTables.h
 $(REGEXP_JIT_TABLES): PRIVATE_PATH := $(LOCAL_PATH)
 $(REGEXP_JIT_TABLES): PRIVATE_CUSTOM_TOOL = python $(PRIVATE_PATH)/create_regex_tables > $@
 $(REGEXP_JIT_TABLES): $(LOCAL_PATH)/create_regex_tables
 	$(transform-generated-source)
 
-LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) $(REGEXP_JIT_TABLES)
-=======
-LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER)
->>>>>>> webkit.org at r78450
+LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(REGEXP_JIT_TABLES)
diff --git a/Source/JavaScriptCore/Android.v8.wtf.mk b/Source/JavaScriptCore/Android.v8.wtf.mk
index 11df0fa..603c454 100644
--- a/Source/JavaScriptCore/Android.v8.wtf.mk
+++ b/Source/JavaScriptCore/Android.v8.wtf.mk
@@ -36,13 +36,10 @@ LOCAL_SRC_FILES := \
 	wtf/HashTable.cpp \
 	wtf/MD5.cpp \
 	wtf/MainThread.cpp \
-<<<<<<< HEAD
 	wtf/OSAllocatorPosix.cpp \
+	wtf/OSRandomSource.cpp \
 	wtf/PageAllocationAligned.cpp \
 	wtf/PageBlock.cpp \
-=======
-	wtf/OSRandomSource.cpp \
->>>>>>> webkit.org at r78450
 	wtf/RandomNumber.cpp \
 	wtf/RefCountedLeakCounter.cpp \
 	wtf/StackBounds.cpp \
@@ -67,24 +64,19 @@ LOCAL_SRC_FILES := \
 	wtf/unicode/CollatorDefault.cpp \
 	wtf/unicode/UTF8.cpp \
 	\
-<<<<<<< HEAD
 	wtf/unicode/icu/CollatorICU.cpp \
 	\
 	wtf/url/src/URLCharacterTypes.cpp \
 	wtf/url/src/URLEscape.cpp \
-	wtf/url/src/URLSegments.cpp
+	wtf/url/src/URLSegments.cpp \
+	\
+	yarr/YarrInterpreter.cpp \
+	yarr/YarrPattern.cpp
 
-CHARTABLES := $(intermediates)/chartables.c
-$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH)
-$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@
-$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables
-$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h
+REGEXP_JIT_TABLES := $(intermediates)/RegExpJitTables.h
+$(REGEXP_JIT_TABLES): PRIVATE_PATH := $(LOCAL_PATH)
+$(REGEXP_JIT_TABLES): PRIVATE_CUSTOM_TOOL = python $(PRIVATE_PATH)/create_regex_tables > $@
+$(REGEXP_JIT_TABLES): $(LOCAL_PATH)/create_regex_tables
 	$(transform-generated-source)
 
-$(intermediates)/pcre/pcre_tables.o : $(CHARTABLES)
-
-# We do not add $(CHARTABLES) to LOCAL_GENERATED_SOURCES because the chartables.c file
-# is explicitly #included in pcre_tables.cpp.
-=======
-	wtf/unicode/icu/CollatorICU.cpp
->>>>>>> webkit.org at r78450
+LOCAL_GENERATED_SOURCES += $(REGEXP_JIT_TABLES)
-- 
cgit v1.1