removed remains of build system support for contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
parent
7a4fa5692d
commit
591a3be426
@ -25,7 +25,6 @@
|
||||
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
|
||||
<input>
|
||||
wx.bkl
|
||||
../../contrib/build/*/*.bkl
|
||||
../../samples/*.bkl
|
||||
../../samples/*/*.bkl
|
||||
../../samples/*/*/*.bkl
|
||||
@ -35,10 +34,6 @@
|
||||
../../utils/*.bkl
|
||||
../../utils/*/*.bkl
|
||||
../../utils/*/*/*.bkl
|
||||
../../contrib/samples/*.bkl
|
||||
../../contrib/samples/*/*.bkl
|
||||
../../contrib/samples/*/*/*.bkl
|
||||
../../contrib/utils/*/*.bkl
|
||||
../../tests/*.bkl
|
||||
</input>
|
||||
|
||||
@ -70,7 +65,6 @@
|
||||
<del-formats files="../../samples/console/*">msevc4prj</del-formats>
|
||||
<del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
|
||||
<del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
|
||||
<del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>
|
||||
<del-formats files="../../tests/*">msevc4prj</del-formats>
|
||||
|
||||
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
|
||||
@ -117,13 +111,6 @@
|
||||
<add-flags files="wx.bkl" formats="msevc4prj">
|
||||
-o../wince/wx.vcw
|
||||
</add-flags>
|
||||
<add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
|
||||
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
|
||||
</add-flags>
|
||||
<add-flags files="../../contrib/build/*/*.bkl"
|
||||
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj">
|
||||
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
|
||||
</add-flags>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
This directory contains Bakefile (see http://bakefile.sourceforge.net)
|
||||
files needed to generate native makefiles for wxWidgets library, contrib and
|
||||
files needed to generate native makefiles for wxWidgets library and
|
||||
samples.
|
||||
|
||||
Use the bakefile_gen utility to regenerate the makefiles (run it in this
|
||||
@ -31,11 +31,9 @@ information that speed up regeneration process.
|
||||
|
||||
Note: the following files are generated using bakefile_gen:
|
||||
* build/msw/*
|
||||
* contrib/build/* (except .bkl files)
|
||||
* makefiles with same names as makefiles in above dirs, Makefile.in files
|
||||
that contain "This makefile was generated by Bakefile" banner and
|
||||
VC++ project files in samples, demos and utils directories (inc. contrib
|
||||
ones)
|
||||
VC++ project files in samples, demos and utils directories
|
||||
* src/wxWindows.dsp
|
||||
* {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
|
||||
* autoconf_inc.m4
|
||||
|
||||
@ -746,7 +746,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
|
||||
</define-rule>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Support for wxWidgets samples and contrib: -->
|
||||
<!-- Support for wxWidgets samples: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<!-- Link against one wxWin library. Value must be literal! -->
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
<?xml version="1.0" ?>
|
||||
<!-- $Id$ -->
|
||||
|
||||
<makefile>
|
||||
|
||||
<if cond="not isdefined('file_common_samples_included')">
|
||||
<include file="common.bkl"/>
|
||||
</if>
|
||||
|
||||
<set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
|
||||
|
||||
<!-- =============================================================== -->
|
||||
<!-- Contrib lib helpers: -->
|
||||
<!-- =============================================================== -->
|
||||
|
||||
<template id="wx_contrib_lib" template="wx_lib_b">
|
||||
<include>$(CONTRIB_HDR_DIR)</include>
|
||||
</template>
|
||||
|
||||
<if cond="isdefined('file_common_samples_included')">
|
||||
<template id="wx_contrib_sample" template="wx_sample">
|
||||
<include>$(CONTRIB_HDR_DIR)</include>
|
||||
</template>
|
||||
<template id="wx_contrib_util" template="wx_util">
|
||||
<include>$(CONTRIB_HDR_DIR)</include>
|
||||
</template>
|
||||
</if>
|
||||
|
||||
<template id="wx_contrib_dll"
|
||||
template="wx_dll_b" template_append="wx_append">
|
||||
<include>$(CONTRIB_HDR_DIR)</include>
|
||||
</template>
|
||||
|
||||
<template id="wx_contrib_headers">
|
||||
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
|
||||
<install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
|
||||
</template>
|
||||
|
||||
<!-- Link against one contrib library. Value must be literal! -->
|
||||
<define-tag name="contrib-lib" rules="exe,dll,module">
|
||||
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
|
||||
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
|
||||
<if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
|
||||
<depends-on-dsp>
|
||||
$(wxwin.makeContribDspDependency(value))
|
||||
</depends-on-dsp>
|
||||
</if>
|
||||
</define-tag>
|
||||
|
||||
</makefile>
|
||||
@ -3,8 +3,6 @@
|
||||
|
||||
<makefile>
|
||||
|
||||
<set var="file_common_samples_included">1</set>
|
||||
|
||||
<if cond="not isdefined('OUT_OF_TREE_MAKEFILES')">
|
||||
<set var="OUT_OF_TREE_MAKEFILES">0</set>
|
||||
</if>
|
||||
|
||||
@ -315,8 +315,6 @@ GTK_DIST: UNIV_DIST
|
||||
mkdir $(DISTDIR)/include/wx/mac/corefoundation
|
||||
$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
|
||||
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
X11_DIST: UNIV_DIST
|
||||
$(CP_P) $(WXDIR)/wxX11.spec $(DISTDIR)
|
||||
$(CP_P) $(INCDIR)/wx/x11/*.h $(DISTDIR)/include/wx/x11
|
||||
@ -331,7 +329,6 @@ X11_DIST: UNIV_DIST
|
||||
mkdir $(DISTDIR)/include/wx/mac
|
||||
mkdir $(DISTDIR)/include/wx/mac/corefoundation
|
||||
$(CP_P) $(WXDIR)/include/wx/mac/corefoundation/*.h $(DISTDIR)/include/wx/mac/corefoundation
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
MOTIF_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(WXDIR)/wxMotif.spec $(DISTDIR)
|
||||
@ -350,7 +347,6 @@ MOTIF_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(X11INC)/pen.h $(X11INC)/brush.h $(X11INC)/privx.h \
|
||||
$(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \
|
||||
$(DISTDIR)/include/wx/x11
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
MACX_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(INCDIR)/*.* $(DISTDIR)/include
|
||||
@ -382,7 +378,6 @@ MACX_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(MACDIR)/carbon/morefilex/*.h $(DISTDIR)/src/mac/carbon/morefilex
|
||||
$(CP_P) $(MACDIR)/carbon/morefilex/*.c $(DISTDIR)/src/mac/carbon/morefilex
|
||||
$(CP_P) $(MACDIR)/carbon/morefilex/*.cpp $(DISTDIR)/src/mac/carbon/morefilex
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
COCOA_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(INCDIR)/wx/cocoa/*.h $(DISTDIR)/include/wx/cocoa
|
||||
@ -396,7 +391,6 @@ COCOA_DIST: ALL_GUI_DIST
|
||||
mkdir $(DISTDIR)/src/mac/carbon
|
||||
$(CP_P) $(MACDIR)/carbon/Info.plist.in $(DISTDIR)/src/mac/carbon
|
||||
$(CP_P) $(MACDIR)/carbon/wxmac.icns $(DISTDIR)/src/mac/carbon
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
MSW_DIST: UNIV_DIST
|
||||
mkdir $(DISTDIR)/include/wx/msw/ole
|
||||
@ -415,7 +409,6 @@ MSW_DIST: UNIV_DIST
|
||||
$(CP_P) $(MSWDIR)/*.c $(DISTDIR)/src/msw
|
||||
$(CP_P) $(MSWDIR)/*.rc $(DISTDIR)/src/msw
|
||||
$(CP_P) $(MSWDIR)/ole/*.cpp $(DISTDIR)/src/msw/ole
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
|
||||
mkdir $(DISTDIR)/include/wx/msw
|
||||
@ -435,7 +428,6 @@ MSW_ZIP_TEXT_DIST: ALL_GUI_DIST
|
||||
$(CP_P) $(MSWDIR)/wince/*.* $(DISTDIR)/src/msw/wince
|
||||
$(CP_P) $(SRCDIR)/*.??? $(DISTDIR)/src
|
||||
$(CP_P) $(SRCDIR)/*.?? $(DISTDIR)/src
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
UNIV_DIST: ALL_GUI_DIST
|
||||
mkdir $(DISTDIR)/include/wx/univ
|
||||
@ -455,7 +447,6 @@ MGL_DIST: UNIV_DIST
|
||||
$(CP_P) $(SRCDIR)/mgl/*.cpp $(DISTDIR)/src/mgl
|
||||
mkdir $(DISTDIR)/src/msdos
|
||||
$(CP_P) $(SRCDIR)/msdos/*.cpp $(DISTDIR)/src/msdos
|
||||
$(CP_PR) $(WXDIR)/contrib $(DISTDIR)/contrib
|
||||
|
||||
DEMOS_DIST: ALL_GUI_DIST
|
||||
mkdir $(DISTDIR)/demos
|
||||
@ -798,7 +789,6 @@ debian-dist: debian-native-dist debian-msw-dirs MSW_DIST
|
||||
@# in other dist targets. Ugly and hardly portable but it
|
||||
@# will run on any Debian box and that's enough for now.
|
||||
|
||||
rm -rf $(DISTDIR)/contrib/build
|
||||
find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" \
|
||||
-o -name "*.dsw" -o -name "*.hh*" -o -name "*.mms" \
|
||||
-o -name "*.mcp" -o -name "*M*.xml" -o -name "*.r" \
|
||||
|
||||
@ -38,7 +38,7 @@ def mk_wxid(id):
|
||||
return wxid
|
||||
|
||||
|
||||
# All libs that are part of the main library (i.e. non-contrib):
|
||||
# All libs that are part of the main library:
|
||||
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
|
||||
'media', 'qa', 'xrc', 'aui', 'richtext', 'stc']
|
||||
# List of library names/ids for categories with different names:
|
||||
@ -83,13 +83,13 @@ def libToLink(wxlibname):
|
||||
For one of main libraries, libToLink('foo') returns '$(WXLIB_FOO)' which
|
||||
must be defined in common.bkl as either nothing (in monolithic build) or
|
||||
mkLibName('foo') (otherwise).
|
||||
For contrib libraries, it returns mkDllName(wxlibname).
|
||||
"""
|
||||
if wxlibname in MAIN_LIBS:
|
||||
return '$(WXLIB_%s)' % wxlibname.upper()
|
||||
else:
|
||||
return mkLibName(wxlibname)
|
||||
|
||||
|
||||
def extraLdflags(wxlibname):
|
||||
if wxlibname in EXTRALIBS:
|
||||
return EXTRALIBS[wxlibname]
|
||||
@ -151,7 +151,3 @@ def headersOnly(files):
|
||||
def makeDspDependency(lib):
|
||||
"""Returns suitable entry for <depends-on-dsp> for main libs."""
|
||||
return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)
|
||||
|
||||
def makeContribDspDependency(lib):
|
||||
"""Returns suitable entry for <depends-on-dsp> for contrib libs."""
|
||||
return '%s:$(nativePaths(WXTOPDIR))contrib\\build\\%s\\%s.dsp' % (lib,lib,lib)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user