Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename web library to webview.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-19 10:45:16 +00:00
parent e7aef23e7b
commit 467d261e9d
36 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/build_cfg.bkl
View File

@@ -39,7 +39,7 @@
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_WEB=$(USE_WEB) >>$(BUILD_CFG_FILE)
@echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)

4
build/bakefiles/common.bkl
View File

@@ -161,8 +161,8 @@
<set var="WXLIB_STC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
</set>
<set var="WXLIB_WEB">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('web')))</if>
<set var="WXLIB_WEBVIEW">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>

10
build/bakefiles/config.bkl
View File

@@ -200,11 +200,11 @@ Default is to use debug CRT if and only if BUILD==debug.
</description>
</option>
<option name="USE_WEB">
<option name="USE_WEBVIEW">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxWeb library (USE_GUI must be 1)?
Build wxWebView library (USE_GUI must be 1)?
</description>
</option>
@@ -380,7 +380,7 @@ to run the tests, include CppUnit library here.
<option name="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_HTML"/>
<option name="EXTRALIBS_WEB"/>
<option name="EXTRALIBS_WEBVIEW"/>
<option name="EXTRALIBS_MEDIA"/>
<option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/>
@@ -441,7 +441,7 @@ it if SHARED=1 unless you know what you are doing.
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_WEB"/>
<set var="EXTRALIBS_WEBVIEW"/>
<set var="EXTRALIBS_MEDIA"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
@@ -490,7 +490,7 @@ Set the version of your Mingw installation here.
<set var="USE_RICHTEXT">1</set>
<set var="USE_STC">1</set>
<set var="USE_HTML">1</set>
<set var="USE_WEB">1</set>
<set var="USE_WEBVIEW">1</set>
<set var="USE_MEDIA">1</set>
<set var="USE_XRC">1</set>
<set var="USE_OPENGL">1</set>

16
build/bakefiles/files.bkl
View File

@@ -3346,21 +3346,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<!-- ====================================================================== -->
<!-- wxWEB -->
<!-- wxWEBVIEW -->
<!-- ====================================================================== -->
<set var="WEB_SRC_PLATFORM">
<set var="WEBVIEW_SRC_PLATFORM">
<if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
<if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if>
<if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
</set>
<set var="WEB_SRC" hints="files">
$(WEB_SRC_PLATFORM)
<set var="WEBVIEW_SRC" hints="files">
$(WEBVIEW_SRC_PLATFORM)
src/common/webview.cpp
src/common/webviewarchivehandler.cpp
</set>
<set var="WEB_HDR_PLATFORM" hints="files">
<set var="WEBVIEW_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MSW'">
wx/msw/webviewhistoryitem_ie.h
wx/msw/webview_ie.h
@@ -3374,8 +3374,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/webview_webkit.h
</if>
</set>
<set var="WEB_HDR" hints="files">
$(WEB_HDR_PLATFORM)
<set var="WEBVIEW_HDR" hints="files">
$(WEBVIEW_HDR_PLATFORM)
wx/webview.h
wx/webviewarchivehandler.h
</set>
@@ -3981,7 +3981,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
$(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEB_HDR}
$(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEBVIEW_HDR}
</if>
</set>

8
build/bakefiles/monolithic.bkl
View File

@@ -4,9 +4,9 @@
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEB_SRC) $(QA_SRC)
$(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC) $(RICHTEXT_SRC)
$(STC_SRC)
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
$(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
$(RICHTEXT_SRC) $(STC_SRC)
</if>
</set>
<set var="MONOLIB_SRC">
@@ -25,7 +25,7 @@
<define>WXMAKINGDLL</define>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_WEB)</ldlibs>
<ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<library>$(wxscintilla_library_link)</library>

24
build/bakefiles/multilib.bkl
View File

@@ -174,28 +174,28 @@
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- wxWEB -->
<!-- wxWEBVIEW -->
<!-- ================================================================ -->
<dll id="webdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
<dll id="webviewdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_WEB</define>
<sources>$(WEB_SRC)</sources>
<define>WXMAKINGDLL_WEBVIEW</define>
<sources>$(WEBVIEW_SRC)</sources>
<library>coredll</library>
<library>basedll</library>
<msvc-headers>$(WEB_HDR)</msvc-headers>
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
</dll>
<lib id="weblib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'">
<sources>$(WEB_SRC)</sources>
<msvc-headers>$(WEB_HDR)</msvc-headers>
<lib id="webviewlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<sources>$(WEBVIEW_SRC)</sources>
<msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
</lib>
<wxshortcut id="wxweb" cond="MONOLITHIC=='0' and USE_WEB=='1'"/>
<wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">web=weblib+webdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
<!-- ================================================================ -->
<!-- OpenGL -->

4
build/bakefiles/wxpresets/presets/wx.bkl
View File

@@ -89,6 +89,7 @@
NOTE: as a reference here is a list of all wxWidgets libraries satisfying
the dependency constraints mentioned in <wx-lib> description:
<wx-lib>webview</wx-lib>
<wx-lib>richtext</wx-lib>
<wx-lib>aui</wx-lib>
<wx-lib>ribbon</wx-lib>
@@ -104,7 +105,6 @@
<wx-lib>xml</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<wx-lib>web</wx-lib>
-->
@@ -125,7 +125,7 @@
tag definitions.
-->
<set var="WX_LIB_LIST">
base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc web
base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview
</set>
<!-- if you define this variable to 0 before including wx presets, the

4
build/bakefiles/wxwin.py
View File

@@ -39,12 +39,12 @@ def mk_wxid(id):
# All libs that are part of the main library:
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'web',
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'webview',
'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc']
# List of library names/ids for categories with different names:
LIBS_NOGUI = ['xml', 'net']
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'web']
'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview']
# Additional libraries that must be linked in:
EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)',