Title: [144506] trunk/Source/WebKit/gtk
- Revision
- 144506
- Author
- [email protected]
- Date
- 2013-03-01 14:38:28 -0800 (Fri, 01 Mar 2013)
Log Message
[GTK] Expose more of the configuration step to the gyp build
https://bugs.webkit.org/show_bug.cgi?id=111213
Patch by Martin Robinson <[email protected]> on 2013-03-01
Reviewed by Dirk Pranke.
Expose more of the configuration phase to the gyp build, including WebKit features
and binary paths.
* gyp/Configuration.gypi.in: Add templatized gyp variables for the new configuration bits.
* gyp/autogen.sh: Properly link up the WebKit features script. So we can access it
relatively as if we were at the top-level of the source directory.
* gyp/configure.ac: Export the WebKit features.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (144505 => 144506)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-03-01 22:26:29 UTC (rev 144505)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-03-01 22:38:28 UTC (rev 144506)
@@ -1,3 +1,18 @@
+2013-03-01 Martin Robinson <[email protected]>
+
+ [GTK] Expose more of the configuration step to the gyp build
+ https://bugs.webkit.org/show_bug.cgi?id=111213
+
+ Reviewed by Dirk Pranke.
+
+ Expose more of the configuration phase to the gyp build, including WebKit features
+ and binary paths.
+
+ * gyp/Configuration.gypi.in: Add templatized gyp variables for the new configuration bits.
+ * gyp/autogen.sh: Properly link up the WebKit features script. So we can access it
+ relatively as if we were at the top-level of the source directory.
+ * gyp/configure.ac: Export the WebKit features.
+
2013-03-01 Sheriff Bot <[email protected]>
Unreviewed, rolling out r144422 and r144424.
Modified: trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in (144505 => 144506)
--- trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in 2013-03-01 22:26:29 UTC (rev 144505)
+++ trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in 2013-03-01 22:38:28 UTC (rev 144506)
@@ -26,6 +26,15 @@
'-I.',
],
+ 'BISON': '@BISON@',
+ 'FLEX': '@FLEX@',
+ 'GPERF': '@GPERF@',
+ 'PERL': '@PERL@',
+ 'PYTHON': '@PYTHON@',
+ 'RUBY': '@RUBY@',
+
+ 'feature_defines': '@WEBKIT_FEATURES@',
+
# We use intermediate variables so that gyp properly handles white space.
'ATSPI2_CFLAGS': '@ATSPI2_CFLAGS@',
'ATSPI2_LIBS': '@ATSPI2_LIBS@',
Modified: trunk/Source/WebKit/gtk/gyp/autogen.sh (144505 => 144506)
--- trunk/Source/WebKit/gtk/gyp/autogen.sh 2013-03-01 22:26:29 UTC (rev 144505)
+++ trunk/Source/WebKit/gtk/gyp/autogen.sh 2013-03-01 22:38:28 UTC (rev 144506)
@@ -22,6 +22,14 @@
cp "$TOPLEVEL_DIRECTORY/Source/autotools/acinclude.m4" Macros
fi
+if [ ! -d Tools ]; then
+ mkdir Tools
+fi
+
+if [ ! -e Tools/gtk ]; then
+ ln -s "../$TOPLEVEL_DIRECTORY/Tools/gtk" Tools/gtk
+fi
+
autoreconf --verbose --install -I Macros $ACLOCAL_FLAGS
# Automake is bizarrely responsible for copying some of the files necessary
Modified: trunk/Source/WebKit/gtk/gyp/configure.ac (144505 => 144506)
--- trunk/Source/WebKit/gtk/gyp/configure.ac 2013-03-01 22:26:29 UTC (rev 144505)
+++ trunk/Source/WebKit/gtk/gyp/configure.ac 2013-03-01 22:38:28 UTC (rev 144506)
@@ -23,7 +23,12 @@
m4_include([WebKitMacros/FindDependencies.m4])
m4_include([WebKitMacros/SetupCompilerFlags.m4])
m4_include([WebKitMacros/SetupAutoconfHeader.m4])
+m4_include([WebKitMacros/SetupWebKitFeatures.m4])
+# Expose the WebKit features as one long string to the configure template processor.
+WEBKIT_FEATURES=`cat WebKitFeatures.txt | tr -d '\n'`
+AC_SUBST(WEBKIT_FEATURES)
+
AC_SUBST(TOPLEVEL_DIRECTORY)
AC_CONFIG_FILES([Configuration.gypi:Configuration.gypi.in])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
