Removed empty wxCocoa taskbar files and broken files.bkl commit.

[wxWidgets.git] / build / bakefiles / wxwin.py

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index 9496dcb052d7c027e0747a0e3b7968ccf036479a..6fc33904385b1c610faa46b7fee1b159e6b7d499 100644 (file)
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -1,5 +1,5 @@
 #
 #

-# Helper functions for wxWindows bakefiles
+# Helper functions for wxWidgets bakefiles

 #
 # $Id$
 #
 #
 # $Id$
 #


@@ -11,13 +11,23 @@ import utils
 # register a substitution function for it that provides additional knowledge
 # about the option (in this case that it does not contain dir separators and
 # so utils.nativePaths() doesn't have to do anything with it):
 # register a substitution function for it that provides additional knowledge
 # about the option (in this case that it does not contain dir separators and
 # so utils.nativePaths() doesn't have to do anything with it):

-def __noopSubst(func, opt):
-    return '$(%s)' % opt.name
+
+try:
+    # this fails in 0.1.4 and 0.1.5 has different subst.callbacks signature:
+    utils.checkBakefileVersion('0.1.5') 
+    def __noopSubst(name, func, caller):
+        return '$(%s)' % name
+except AttributeError:
+    def __noopSubst(func, name):
+        return '$(%s)' % name

 utils.addSubstituteCallback('CFG', __noopSubst)
 utils.addSubstituteCallback('CFG', __noopSubst)

+utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)
+utils.addSubstituteCallback('SETUPHDIR', __noopSubst)
+utils.addSubstituteCallback('OBJS', __noopSubst)

 
 
 def mk_wxid(id):
 
 
 def mk_wxid(id):

-    """Creates wxWindows library identifier from bakefile target ID that
+    """Creates wxWidgets library identifier from bakefile target ID that

        follows this convention: DLLs end with 'dll', static libraries
        end with 'lib'. If withPrefix=1, then _wxid is returned instead
        of wxid."""
        follows this convention: DLLs end with 'dll', static libraries
        end with 'lib'. If withPrefix=1, then _wxid is returned instead
        of wxid."""


@@ -29,10 +39,19 @@ def mk_wxid(id):
 
 
 # All libs that are part of the main library (i.e. non-contrib):
 
 
 # All libs that are part of the main library (i.e. non-contrib):

-MAIN_LIBS = ['mono', 'base', 'core', 'html']
+MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',
+             'odbc', 'dbgrid', 'xrc']

 # List of library names/ids for categories with different names:
 # List of library names/ids for categories with different names:

-LIBS_NOGUI = ['']
-LIBS_GUI   = ['core', 'html']
+LIBS_NOGUI = ['xml', 'net', 'odbc']
+LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'dbgrid', 'xrc']
+# Additional libraries that must be linked in:
+EXTRALIBS = {
+    'gl' : '$(EXTRALIBS_OPENGL)',
+    'xml' : '$(EXTRALIBS_XML)',
+    'html' : '$(EXTRALIBS_HTML)',
+    'odbc' : '$(EXTRALIBS_ODBC)',
+    'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
+}

 
 def mkLibName(wxid):
     """Returns string that can be used as library name, including name
 
 def mkLibName(wxid):
     """Returns string that can be used as library name, including name


@@ -71,12 +90,17 @@ def libToLink(wxlibname):
     else:
         return mkLibName(wxlibname)
 
     else:
         return mkLibName(wxlibname)
 

+def extraLdflags(wxlibname):
+    if wxlibname in EXTRALIBS:
+        return EXTRALIBS[wxlibname]
+    else:
+        return ''

 
 wxVersion = None
 VERSION_FILE = '../../include/wx/version.h'
 
 def getVersion():
 
 wxVersion = None
 VERSION_FILE = '../../include/wx/version.h'
 
 def getVersion():

-    """Returns wxWindows version as a tuple: (major,minor,release)."""
+    """Returns wxWidgets version as a tuple: (major,minor,release)."""

     global wxVersion
     if wxVersion == None:
         f = open(VERSION_FILE, 'rt')
     global wxVersion
     if wxVersion == None:
         f = open(VERSION_FILE, 'rt')


@@ -105,3 +129,25 @@ def getVersionMinor():
     return getVersion()[1]
 def getVersionRelease():
     return getVersion()[2]
     return getVersion()[1]
 def getVersionRelease():
     return getVersion()[2]

+
+
+def headersOnly(files):
+    """Filters 'files' so that only headers are left. Used with
+       <msvc-project-files> to add headers to VC++ projects but not files such
+       as arrimpl.cpp."""
+    
+    def callback(cond, sources):
+        prf = suf = ''
+        if sources[0].isspace(): prf=' '
+        if sources[-1].isspace(): suf=' '
+        retval = []
+        for s in sources.split():
+            if s.endswith('.h'):
+                retval.append(s)
+        return '%s%s%s' % (prf, ' '.join(retval), suf)
+    return utils.substitute2(files, callback)
+
+
+def makeDspDependency(lib):
+    """Returns suitable entry for <depends-on-dsp> for main libs."""
+    return '%s:$(nativePaths(WXTOPDIR))build\\msw\\wx_%s.dsp' % (lib,lib)