Changeset 62001 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 28, 2010, 6:58:42 AM (15 years ago)

Author:

[email protected]

Message:

2010-06-28 Xan Lopez <​[email protected]>

Reviewed by Gustavo Noronha.

[GTK] Add support for GTK+3
​https://bugs.webkit.org/show_bug.cgi?id=41253

Add --with-gtk configure flag, defaulting to support for GTK+ 2.x.

• GNUmakefile.am:
• configure.ac:

WebCore:

2010-06-28 Xan Lopez <​[email protected]>

Reviewed by Gustavo Noronha.

[GTK] Add support for GTK+3
​https://bugs.webkit.org/show_bug.cgi?id=41253

Adapt build system for 3.x support.

• GNUmakefile.am:

WebKit/gtk:

2010-06-28 Xan Lopez <​[email protected]>

Reviewed by Gustavo Noronha.

[GTK] Add support for GTK+3
​https://bugs.webkit.org/show_bug.cgi?id=41253

Adapt build system for 3.x support, allow the JSCore gir and webkit
pc files to be configurable at build time for different API
versions.

• JSCore-1.0.gir: Removed.
• JSCore.gir.in: Added.
• docs/GNUmakefile.am:
• webkit.pc.in:

JavaScriptCore:

2010-06-28 Xan Lopez <​[email protected]>

Reviewed by Gustavo Noronha.

[GTK] Add support for GTK+3
​https://bugs.webkit.org/show_bug.cgi?id=41253

Suffix jsc with the API version of the library, so that
libwebkitgtk 1.x and 3.x can install jsc.

• GNUmakefile.am:

WebKitTools:

2010-06-28 Xan Lopez <​[email protected]>

Reviewed by Gustavo Noronha.

[GTK] Add support for GTK+3
​https://bugs.webkit.org/show_bug.cgi?id=41253

Adapt build system for 3.x support.

• GNUmakefile.am:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-06-28  Xan Lopez  <[email protected]>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] Add support for GTK+3
+        https://bugs.webkit.org/show_bug.cgi?id=41253
+
+        Suffix jsc with the API version of the library, so that
+        libwebkitgtk 1.x and 3.x can install jsc.
+
+        * GNUmakefile.am:
+
 2010-06-27  Kwang Yul Seo  <[email protected]>
 

trunk/JavaScriptCore/GNUmakefile.am

@@ -570 +570 @@
 
 bin_PROGRAMS += \
-        Programs/jsc
+        Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@
 
 noinst_PROGRAMS += \
@@ -607 +607 @@
 
 # jsc
-Programs_jsc_SOURCES = \
+Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_SOURCES = \
         JavaScriptCore/jsc.cpp
 
-Programs_jsc_CPPFLAGS = \
+Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_CPPFLAGS = \
         $(global_cppflags) \
         $(javascriptcore_cppflags)
 
-Programs_jsc_CXXFLAGS = \
+Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_CXXFLAGS = \
         -fno-strict-aliasing \
         $(global_cxxflags) \
@@ -621 +621 @@
         $(UNICODE_CFLAGS)
 
-Programs_jsc_LDADD = \
+Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LDADD = \
         libJavaScriptCore.la
 
@@ -650 +650 @@
         JavaScriptCore/runtime/StringPrototype.lut.h \
         JavaScriptCore/pcre/chartables.c \
-        Programs/jsc \
+        Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@ \
         Programs/minidom