Add non-template wxWeakRef<T> constructor from T*.

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

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index bf8b2cd09214f152444f61dce71ca3889188d975..8f5cb31f8a7393ee432474f7a19671e6c8b29ccd 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,15 +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, name):
-    return '$(%s)' % 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('LIBDIRNAME', __noopSubst)
 utils.addSubstituteCallback('CFG', __noopSubst)
 utils.addSubstituteCallback('LIBDIRNAME', __noopSubst)

+utils.addSubstituteCallback('SETUPHDIR', __noopSubst)

 utils.addSubstituteCallback('OBJS', __noopSubst)
 
 
 def mk_wxid(id):
 utils.addSubstituteCallback('OBJS', __noopSubst)
 
 
 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."""


@@ -30,12 +38,21 @@ def mk_wxid(id):
     return wxid
 
 
     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',
 MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net',

-             'odbc', 'dbgrid']
+             'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc']

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

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

 
 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


@@ -67,7 +84,6 @@ 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 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()
        """
     if wxlibname in MAIN_LIBS:
         return '$(WXLIB_%s)' % wxlibname.upper()


@@ -75,11 +91,17 @@ def libToLink(wxlibname):
         return mkLibName(wxlibname)
 
 
         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')


@@ -88,11 +110,11 @@ def getVersion():
         major = minor = release = None
         for l in lines:
             if not l.startswith('#define'): continue
         major = minor = release = None
         for l in lines:
             if not l.startswith('#define'): continue

-            splitted = l.strip().split()
-            if splitted[0] != '#define': continue
-            if len(splitted) < 3: continue
-            name = splitted[1]
-            value = splitted[2]
+            splitline = l.strip().split()
+            if splitline[0] != '#define': continue
+            if len(splitline) < 3: continue
+            name = splitline[1]
+            value = splitline[2]

             if value == None: continue
             if name == 'wxMAJOR_VERSION': major = int(value)
             if name == 'wxMINOR_VERSION': minor = int(value)
             if value == None: continue
             if name == 'wxMAJOR_VERSION': major = int(value)
             if name == 'wxMINOR_VERSION': minor = int(value)


@@ -117,11 +139,16 @@ def headersOnly(files):
     
     def callback(cond, sources):
         prf = suf = ''
     
     def callback(cond, sources):
         prf = suf = ''

-        if sources[0].isspace(): prefix=' '
-        if sources[-1].isspace(): suffix=' '
+        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)
         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)