Reviewed by Maciej.

Add missing assert.h and make it compile with the qmake file.

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5c375c919a9a7b99fc8f2cc46095492c96ff5d04..52fb199aeab13350f438ec141026905738695623 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-12  George Staikos <staikos@kde.org>
+
+        Reviewed by Maciej.
+
+        * kjs/kjs.pro: Updates to build the whole thing on Linux at least.
+
+        * kxmlcore/HashTable.h: Add missing assert.h
+
 2006-01-12  Darin Adler  <darin@apple.com>
 
         Reviewed by Geoff.

diff --git a/JavaScriptCore/kjs/kjs.pro b/JavaScriptCore/kjs/kjs.pro
index 7d37731c42ed0a7bf4b0d2f2b38a3f4b2846d54f..0fc81c58166c633578f10a014af2cfed62845476 100644 (file)
--- a/JavaScriptCore/kjs/kjs.pro
+++ b/JavaScriptCore/kjs/kjs.pro
@@ -13,14 +13,16 @@ unix {
        !exists(number_object.lut.h):system(perl create_hash_table number_object.cpp -i >number_object.lut.h)
        !exists(string_object.lut.h):system(perl create_hash_table string_object.cpp -i >string_object.lut.h)
        !exists(regexp_object.lut.h):system(perl create_hash_table regexp_object.cpp -i >regexp_object.lut.h)
+       !exists(grammar.cpp):system(bison -d -p kjsyy grammar.y && mv grammar.tab.c grammar.cpp && mv grammar.tab.h grammar.h)
 }
 
 # QMakes YACC support is strange
-YACCSOURCES += grammar.y
+# YACCSOURCES += grammar.y
 
 SOURCES        += \
        ../kxmlcore/FastMalloc.cpp \
        ../kxmlcore/TCSystemAlloc.cpp \
+       ../kxmlcore/HashTable.cpp \
        array_object.cpp \
        function_object.cpp \
        nodes2string.cpp \
@@ -53,17 +55,19 @@ SOURCES     += \
        ustring.cpp \
        function.cpp \
        math_object.cpp \
-       value.cpp
+       value.cpp \
+       JSLock.cpp \
+       grammar.cpp
 
 !macx:unix {
-       INCLUDEPATH += .. ../pcre ../kxmlcore
+       INCLUDEPATH += .. ../pcre ../kxmlcore ../bindings
        MOC_DIR = .moc
        OBJECTS_DIR = .obj
        QMAKE_CXXFLAGS_DEBUG += -ansi
 }
 
 win32 {
-       INCLUDEPATH += .. ../pcre ../kxmlcore ../icu
+       INCLUDEPATH += .. ../pcre ../kxmlcore ../bindings ../icu
        QMAKE_CXXFLAGS_RELEASE += /Zm1000
        QMAKE_CXXFLAGS_DEBUG += /Zm1000
 }

diff --git a/JavaScriptCore/kxmlcore/HashTable.h b/JavaScriptCore/kxmlcore/HashTable.h
index 201d17859bdaf8564b0b2b1298c7163d0bdea0cc..1ea6fe00843401343aea202a313440ccdad4fe39 100644 (file)
--- a/JavaScriptCore/kxmlcore/HashTable.h
+++ b/JavaScriptCore/kxmlcore/HashTable.h
@@ -25,6 +25,7 @@
 
 #include "FastMalloc.h"
 #include "HashTraits.h"
+#include <assert.h>
 #include <utility>
 #include <algorithm>