<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23934] branches/wx-port-alpha/trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/23934">23934</a></dd>
<dt>Author</dt> <dd>kevino</dd>
<dt>Date</dt> <dd>2007-07-02 16:05:50 -0700 (Mon, 02 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enable RTTI and exceptions for now, fix a linking issue with libjpeg on Win, and improve support for building with Python versions other than 2.5.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#brancheswxportalphatrunkJavaScriptCorejscorebkl">branches/wx-port-alpha/trunk/JavaScriptCore/jscore.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebCoreProjectswxwebcorewxbkl">branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebKitwxWebViewcpp">branches/wx-port-alpha/trunk/WebKit/wx/WebView.cpp</a></li>
<li><a href="#brancheswxportalphatrunkWebKitwxbindingspythonwxwebkitpybkl">branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebKitwxwxwebkitbkl">branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl</a></li>
<li><a href="#brancheswxportalphatrunkWebKitToolsScriptsbuildwxwebkit">branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="brancheswxportalphatrunkJavaScriptCorejscorebkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/JavaScriptCore/jscore.bkl (23933 => 23934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/JavaScriptCore/jscore.bkl 2007-07-02 22:14:35 UTC (rev 23933)
+++ branches/wx-port-alpha/trunk/JavaScriptCore/jscore.bkl 2007-07-02 23:05:50 UTC (rev 23934)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> <!-- <pre-build-target>DerivedSources</pre-build-target> -->
</span><span class="cx"> <dirname>$(WKOUTPUTDIR)</dirname>
</span><span class="cx"> <warnings>default</warnings>
</span><del>- <cxx-rtti>off</cxx-rtti>
- <cxx-exceptions>off</cxx-exceptions>
</del><ins>+ <cxx-rtti>on</cxx-rtti>
+ <cxx-exceptions>on</cxx-exceptions>
</ins><span class="cx"> <debug-info>on</debug-info>
</span><span class="cx"> <if cond="FORMAT in ['msvc', 'msvs2005prj']">
</span><span class="cx"> <set var="DEBUG_RUNTIME">
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebCoreProjectswxwebcorewxbkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl (23933 => 23934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl 2007-07-02 22:14:35 UTC (rev 23933)
+++ branches/wx-port-alpha/trunk/WebCore/Projects/wx/webcore-wx.bkl 2007-07-02 23:05:50 UTC (rev 23934)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<?xml version="1.0" ?>
</del><ins>+<?xml version="1.0" ?>
</ins><span class="cx"> <!--
</span><span class="cx"> Copyright (C) 2007 Kevin Ollivier <kevino@theolliviers.com>
</span><span class="cx">
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> </action>
</span><span class="cx">
</span><span class="cx"> <template id="webcore-wx" template="webcore_base,curl,gtk,pthreads">
</span><del>- <cxx-rtti>off</cxx-rtti>
- <cxx-exceptions>off</cxx-exceptions>
</del><ins>+ <cxx-rtti>on</cxx-rtti>
+ <cxx-exceptions>on</cxx-exceptions>
</ins><span class="cx"> <pic>on</pic>
</span><span class="cx"> <threading>multi</threading>
</span><span class="cx"> <debug-info>on</debug-info>
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> <define>BUILDING_WX__=1</define>
</span><span class="cx"> <define>WTF_USE_ICU_UNICODE=1</define>
</span><span class="cx"> <define>UNICODE=1</define>
</span><del>-
</del><ins>+
</ins><span class="cx"> <if cond="PLATFORM_WIN32=='0'">
</span><span class="cx"> <ldlibs>`$(WX_CONFIG) --libs`</ldlibs>
</span><span class="cx"> </if>
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitwxWebViewcpp"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKit/wx/WebView.cpp (23933 => 23934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKit/wx/WebView.cpp 2007-07-02 22:14:35 UTC (rev 23933)
+++ branches/wx-port-alpha/trunk/WebKit/wx/WebView.cpp 2007-07-02 23:05:50 UTC (rev 23934)
</span><span class="lines">@@ -168,9 +168,14 @@
</span><span class="cx"> WebCore::InitializeLoggingChannelsIfNecessary();
</span><span class="cx"> WebCore::HTMLFrameOwnerElement* parentFrame = 0;
</span><span class="cx"> WebCore::Page* page = 0;
</span><del>- wxWebView* parentWebView = dynamic_cast<wxWebView*>(parent);
</del><ins>+
+ // FIXME: This cast is obviously not as safe as a dynamic
+ // cast, but this allows us to get around requiring RTTI
+ // support for the moment. This is only used for subframes
+ // in any case, which aren't currently supported.
+ wxWebView* parentWebView = static_cast<wxWebView*>(parent);
</ins><span class="cx">
</span><del>- if ( parentWebView )
</del><ins>+ if ( data )
</ins><span class="cx"> {
</span><span class="cx"> parentFrame = data->ownerElement;
</span><span class="cx"> page = parentWebView->m_impl->frame->page();
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitwxbindingspythonwxwebkitpybkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl (23933 => 23934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl 2007-07-02 22:14:35 UTC (rev 23933)
+++ branches/wx-port-alpha/trunk/WebKit/wx/bindings/python/wxwebkit-py.bkl 2007-07-02 23:05:50 UTC (rev 23934)
</span><span class="lines">@@ -14,7 +14,8 @@
</span><span class="cx"> </if>
</span><span class="cx">
</span><span class="cx"> <if cond="not isdefined('PYTHON_VERSION')">
</span><del>- <option name="PYTHON_VERSION" category="path">
</del><ins>+ <option name="PYTHON_VERSION">
+ <values>24,25</values>
</ins><span class="cx"> <default-value>25</default-value>
</span><span class="cx"> <description>
</span><span class="cx"> Python version we're building against.
</span><span class="lines">@@ -32,6 +33,8 @@
</span><span class="cx"> </if>
</span><span class="cx">
</span><span class="cx"> <module id="wxwebkit-python" template="wx,webcore,xml2,iconv,xslt,icu,jscore,curl,sqlite3,gtk,pthreads">
</span><ins>+ <cxx-rtti>on</cxx-rtti>
+ <cxx-exceptions>on</cxx-exceptions>
</ins><span class="cx"> <debug-info>on</debug-info>
</span><span class="cx"> <if cond="FORMAT in ['msvc', 'msvs2005prj']">
</span><span class="cx"> <!-- it's very unlikely someone will build a debug python, wxPython, etc.
</span><span class="lines">@@ -75,8 +78,16 @@
</span><span class="cx"> <ldflags>$(MAC_FLAGS) -undefined dynamic_lookup</ldflags>
</span><span class="cx"> </if>
</span><span class="cx"> <if cond="FORMAT in ['msvc','msvs2005prj']">
</span><ins>+ <set var="PY_LIBNAME">
+ <if cond="PYTHON_VERSION=='24'">
+ python24
+ </if>
+ <if cond="PYTHON_VERSION=='25'">
+ python25
+ </if>
+ </set>
</ins><span class="cx"> <sys-lib>libpng</sys-lib>
</span><del>- <sys-lib>python$(PYTHON_VERSION)</sys-lib>
</del><ins>+ <sys-lib>$(PY_LIBNAME)</sys-lib>
</ins><span class="cx"> <lib-path>$(WK_ROOT)/libpng</lib-path>
</span><span class="cx"> <lib-path>$(PYTHON_LIBDIR)</lib-path>
</span><span class="cx"> </if>
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitwxwxwebkitbkl"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl (23933 => 23934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl 2007-07-02 22:14:35 UTC (rev 23933)
+++ branches/wx-port-alpha/trunk/WebKit/wx/wxwebkit.bkl 2007-07-02 23:05:50 UTC (rev 23934)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> </if>
</span><span class="cx">
</span><span class="cx"> <dll id="wxwebkit-dynamic" template="wx,webcore,xml2,iconv,xslt,icu,jscore,curl,sqlite3,gtk,pthreads">
</span><del>- <debug-info>on</debug-info>
</del><ins>+ <cxx-rtti>on</cxx-rtti>
+ <cxx-exceptions>on</cxx-exceptions>
+ <debug-info>on</debug-info>
</ins><span class="cx"> <if cond="FORMAT in ['msvc', 'msvs2005prj']">
</span><span class="cx"> <set var="DEBUG_RUNTIME">
</span><span class="cx"> <if cond="WX_PYTHON=='1' and WX_DEBUG=='0'">off</if>
</span><span class="lines">@@ -40,9 +42,6 @@
</span><span class="cx"> <dllname>wxwebkit</dllname>
</span><span class="cx"> <libname>wxwebkit</libname>
</span><span class="cx">
</span><del>- <wx-lib>core</wx-lib>
- <wx-lib>base</wx-lib>
-
</del><span class="cx"> <if cond="FORMAT=='gnu'">
</span><span class="cx"> <ldflags>$(WKOUTPUTDIR)/libjscore.a</ldflags>
</span><span class="cx"> </if>
</span><span class="lines">@@ -71,10 +70,14 @@
</span><span class="cx"> <if cond="FORMAT in ['msvc','msvs2005prj']">
</span><span class="cx"> <sys-lib>webcore-wx</sys-lib>
</span><span class="cx"> <sys-lib>libpng</sys-lib>
</span><ins>+ <sys-lib>libjpeg</sys-lib>
</ins><span class="cx"> <lib-path>$(WKOUTPUTDIR)</lib-path>
</span><span class="cx"> <lib-path>$(WK_ROOT)/libpng</lib-path>
</span><ins>+ <lib-path>$(WK_ROOT)/libjpeg</lib-path>
</ins><span class="cx"> </if>
</span><span class="cx">
</span><ins>+ <wx-lib>core</wx-lib>
+ <wx-lib>base</wx-lib>
</ins><span class="cx"> <define>BUILDING_WX__=1</define>
</span><span class="cx">
</span><span class="cx"> <sources>
</span></span></pre></div>
<a id="brancheswxportalphatrunkWebKitToolsScriptsbuildwxwebkit"></a>
<div class="modfile"><h4>Modified: branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit (23933 => 23934)</h4>
<pre class="diff"><span>
<span class="info">--- branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit 2007-07-02 22:14:35 UTC (rev 23933)
+++ branches/wx-port-alpha/trunk/WebKitTools/Scripts/build-wxwebkit 2007-07-02 23:05:50 UTC (rev 23934)
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> PY_INCLUDE=`python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"`
</span><span class="cx"> PY_VERSION=`python -c "import sys; print str(sys.version_info[0]) + str(sys.version_info[1])"`
</span><del>- PY_LIBDIR=`python -c "import distutils.sysconfig; print distutils.sysconfig.PREFIX"`
</del><ins>+ PY_LIBDIR=`python -c "import distutils.sysconfig; import sys; sys.stdout.write(distutils.sysconfig.PREFIX)"`
</ins><span class="cx">
</span><span class="cx"> if [ "${OSTYPE:0:6}" == "cygwin" ]; then
</span><span class="cx"> PY_LIBDIR="$PY_LIBDIR\\Libs"
</span></span></pre>
</div>
</div>
</body>
</html>