Changeset 19251 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 30, 2007, 2:20:20 AM (18 years ago)

Author:

hausmann

Message:

For the Qt build combine JavaScriptCore and WebKit into one library, to make it possible to
build it with ELF visibility or on Windows without adding EXPORT macros to kjs all over the place.
r=zack

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.pri (moved) (moved from trunk/JavaScriptCore/JavaScriptCore.pro ) (1 diff)
• kjs/testkjs.pro (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-01-30  Simon Hausmann  <[email protected]>
+
+        Reviewed by Zack.
+
+        Turned JavaScriptCore from a separate library into an includable
+        project, to combine it all into libWebKitQt.
+
+        * JavaScriptCore.pri: Added.
+        * JavaScriptCore.pro: Removed.
+        * kjs/testkjs.pro:
+
 2007-01-29  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.pri

@@ -1 +1 @@
 # JavaScriptCore - Qt4 build info
 VPATH += $$PWD
-TEMPLATE = lib
-TARGET = JavaScriptCore
-DESTDIR = ../lib
-OBJECTS_DIR = tmp
+
 INCLUDEPATH += tmp
 INCLUDEPATH += $$PWD $$PWD/kjs $$PWD/bindings $$PWD/bindings/c $$PWD/bindings/qt $$PWD/wtf
 DEFINES -= KJS_IDENTIFIER_HIDE_GLOBALS 
 DEFINES += BUILDING_QT__
-QT -= gui
-
-isEmpty(OUTPUT_DIR):OUTPUT_DIR=$$PWD
-include($$OUTPUT_DIR/config.pri)
 
 include(pcre/pcre.pri)

trunk/JavaScriptCore/kjs/testkjs.pro

@@ -7 +7 @@
 DEFINES += BUILDING_QT__
 INCLUDEPATH += $$PWD/.. $$PWD $$PWD/../bindings $$PWD/../bindings/c $$PWD/../wtf
-LIBS += -L$$OUTPUT_DIR/lib -lJavaScriptCore
+LIBS += -L$$OUTPUT_DIR/lib -lWebKitQt
 QMAKE_RPATHDIR += $$OUTPUT_DIR/lib
 
@@ -13 +13 @@
 include($$OUTPUT_DIR/config.pri)
 
+include($$PWD/../JavaScriptCore.pri)