created wxAdvanced library

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

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 07da5e77892867e5ff6d728d0963fc0affb1f1b6..93af8c706aa9361c3d7ae55739401a8990c576ef 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -7,49 +7,70 @@
 # $Id$
 #
 
 # $Id$
 #
 

-import string, os.path
+import string, os.path, copy

 
 file = open('Makefile', 'wt')
 file.write("""
 # Generated by regenMakefile.py
 
 
 file = open('Makefile', 'wt')
 file.write("""
 # Generated by regenMakefile.py
 

-BAKEFILE = bakefile
-BAKEARGS = -v
+BAKEFILE = bakefile -v

 
 
 
 

+CDEPS = config.bkl common.bkl common_contrib.bkl
+SDEPS = config.bkl common.bkl common_samples.bkl
+MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl wxwin.py
+
+DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
+           -DUSE_OPENGL=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default

 """)
 
 """)
 

-lines = []
+lines = {}

 all = {}
 all = {}

-all['autoconf'] = ['../../configure']
+all['autoconf'] = []
+
+linesCur = None

 
 def addMakefile(bake, makedirs, deps=[], args={}):
     """Adds rules to regenerate native makefile in directory 'makedir' from
        bakefiles 'bake'. 'deps' contains additional dependencies (bakefiles
        other than 'bake'."""
     print 'adding %s...' % bake
 
 def addMakefile(bake, makedirs, deps=[], args={}):
     """Adds rules to regenerate native makefile in directory 'makedir' from
        bakefiles 'bake'. 'deps' contains additional dependencies (bakefiles
        other than 'bake'."""
     print 'adding %s...' % bake

-    lines.append('')
-    lines.append('# from %s' % bake)
+    global linesCur
+    linesCur = ['\n']

 
     def add(bake, makedirs, make, dep, format, args={}):
 
     def add(bake, makedirs, make, dep, format, args={}):

+        global linesCur

         a = ''
         if 'all' in args: a += ' %s' % args['all']
         if format in args: a += ' %s' % args[format]
         a = ''
         if 'all' in args: a += ' %s' % args['all']
         if format in args: a += ' %s' % args[format]

+        if format != 'autoconf' and 'not_autoconf' in args:
+            a += ' %s' % args['not_autoconf']

         if format in makedirs:
             makedir = makedirs[format]
         else:
             makedir = makedirs['all']
         tfile = '%s/%s' % (makedir, make)
         if format in makedirs:
             makedir = makedirs[format]
         else:
             makedir = makedirs['all']
         tfile = '%s/%s' % (makedir, make)

-        lines.append('%s: %s' % (tfile, dep))
-        lines.append('\t$(BAKEFILE) $(BAKEARGS) -f%s -o%s%s %s' % \
-                     (format, tfile, a, bake))
-        lines.append('\ttouch %s' % tfile)
+        linesCur.append('%s: %s' % (tfile, dep))
+        linesCur.append('\t$(BAKEFILE) -f%s -o$@ %s %s' % (format, a, bake))
+        linesCur.append('\ttouch $@')

         if format not in all: all[format] = []
         all[format].append(tfile)
 
     dep = string.join(deps + [bake], ' ')
 
     add(bake, makedirs, 'Makefile.in', dep, 'autoconf', args)
         if format not in all: all[format] = []
         all[format].append(tfile)
 
     dep = string.join(deps + [bake], ' ')
 
     add(bake, makedirs, 'Makefile.in', dep, 'autoconf', args)

+    add(bake, makedirs, 'makefile.bcc', dep, 'borland', args)
+    add(bake, makedirs, 'makefile.vc', dep, 'msvc', args)
+    add(bake, makedirs, 'makefile.gcc', dep, 'mingw', args)
+    add(bake, makedirs, 'makefile.wat', dep, 'watcom', args)
+
+    if 'msvc6prj' in args and args['msvc6prj'] != None:
+        add(bake, makedirs,
+            (bake[1+bake.rfind('/'):]).replace('.bkl','.dsw'),
+            dep, 'msvc6prj', args)
+    
+    lines[bake] = linesCur

 
 
 
 
 
 


@@ -58,58 +79,102 @@ def addMakefile(bake, makedirs, deps=[], args={}):
 # -----------------------------------------------
 
 # main makefile:
 # -----------------------------------------------
 
 # main makefile:

-addMakefile('wx.bkl', {'all':'..','autoconf':'../..'},
-            ['common.bkl', 'config.bkl', 'files.bkl', 'monolithic.bkl',
-             'multilib.bkl', 'wxwin.py'])
+addMakefile('wx.bkl', {'all':'..','autoconf':'../..'}, [ '$(MDEPS)' ],
+            args={
+                'borland':'-DOPTIONS_FILE=config.bcc',
+                'msvc':'-DOPTIONS_FILE=config.vc',
+                'mingw':'-DOPTIONS_FILE=config.gcc',
+                'watcom':'-DOPTIONS_FILE=config.wat',
+                'msvc6prj':'$(DSWFLAGS)',
+            })

 
 # samples main makefile:
 
 # samples main makefile:

-addMakefile('../../samples/samples.bkl', {'all':'../../samples'})
+addMakefile('../../samples/samples.bkl', {'all':'../../samples'},
+            args={
+            'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
+            'borland':'-DOPTIONS_FILE=../build/config.bcc -DWRITE_OPTIONS_FILE=0',
+            'msvc':'-DOPTIONS_FILE=../build/config.vc -DWRITE_OPTIONS_FILE=0',
+            'mingw':'-DOPTIONS_FILE=../build/config.gcc -DWRITE_OPTIONS_FILE=0',
+            'watcom':'-DOPTIONS_FILE=../build/config.wat -DWRITE_OPTIONS_FILE=0',
+            'msvc6prj':None,
+            })

 
 
 CONTRIB_DIR = 1
 
 
 CONTRIB_DIR = 1

+SAMPLES_DIR = 2

 
 def onSubmakefile(type, dirname, names):
     bakes = [x for x in names if x.endswith('.bkl')]
     if len(bakes) == 0: return
 
 def onSubmakefile(type, dirname, names):
     bakes = [x for x in names if x.endswith('.bkl')]
     if len(bakes) == 0: return

+    bakes.sort()
+    dirname = dirname.replace(os.sep, '/')

     depth = dirname.count('/') - 2
     if depth <= 0: return
     depth = dirname.count('/') - 2
     if depth <= 0: return

-    prefix = ''.join(['../' for i in range(0,depth)])
+    
+    if type==SAMPLES_DIR:
+        prefix = ''.join(['../' for i in range(0,depth)])
+        dirflags = '-DWXTOPDIR=%s../' % prefix
+        cfgbase = '%s../build/config.' % prefix
+    elif type==CONTRIB_DIR:
+        dirflags = '-DSRCDIR=../../src/%s' % dirname.split('/')[-1]
+        dirflags += ' -DWXTOPDIR=../../../'
+        cfgbase = '../../../build/config.'

 
     args = {
 
     args = {

-        'all':'-DWXTOPDIR=%s../' % prefix,
+        'not_autoconf':dirflags,

         'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
         'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',

+        'msvc':'-DOPTIONS_FILE='+cfgbase+'vc -DWRITE_OPTIONS_FILE=0',
+        'mingw':'-DOPTIONS_FILE='+cfgbase+'gcc -DWRITE_OPTIONS_FILE=0',
+        'borland':'-DOPTIONS_FILE='+cfgbase+'bcc -DWRITE_OPTIONS_FILE=0',
+        'watcom':'-DOPTIONS_FILE='+cfgbase+'wat -DWRITE_OPTIONS_FILE=0',
+        'msvc6prj':'$(DSWFLAGS)',

     }
     }

-    
+

     for bake in bakes:
     for bake in bakes:

+        if bake.endswith('_samples.bkl'):
+            args['msvc6prj'] = None

         if type==CONTRIB_DIR:
             acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
         if type==CONTRIB_DIR:
             acdir = '../../contrib/src/%s' % dirname.split('/')[-1]

-            ruledep = 'common_contrib.bkl'
+            ruledep = '$(CDEPS)'

         else:
             acdir = dirname
         else:
             acdir = dirname

-            ruledep = 'common_samples.bkl'
+            ruledep = '$(SDEPS)'

         addMakefile('%s/%s' % (dirname, bake),
         addMakefile('%s/%s' % (dirname, bake),

-                    {'all':dirname,'autoconf':acdir},
-                    deps=['common.bkl',ruledep,'config.bkl'],
+                    {'all':dirname,'autoconf':acdir}, deps=[ruledep],

                     args=args)
 
                     args=args)
 

-os.path.walk('../../samples', onSubmakefile, None)
-os.path.walk('../../contrib/build', onSubmakefile, CONTRIB_DIR)
+os.path.walk(os.path.join('..','..','samples'),
+             onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','contrib','build'),
+             onSubmakefile, CONTRIB_DIR)
+os.path.walk(os.path.join('..','..','contrib','samples'),
+             onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','contrib','utils'),
+             onSubmakefile, SAMPLES_DIR)

 
 
 cleanCmds = ''
 
 
 cleanCmds = ''

-for f in all:
+allK = all.keys()
+allK.sort()
+cleanList = []
+
+for f in allK:
+    all[f].sort()
+
+for f in allK:

     for i in all[f]:
     for i in all[f]:

-        cleanCmds += '\trm -f %s\n' % i
+        cleanList.append('\trm -f %s\n' % i)
+    cleanCmds = ''.join(cleanList)

 
 

-for f in all:
+for f in allK:

     var = '%s_ALL' % f.upper()
     var = '%s_ALL' % f.upper()

-    file.write('%s = %s\n' % (var,' '.join(all[f])))
+    file.write('%s = \\\n\t%s\n' % (var,' \\\n\t'.join(all[f])))

 
 file.write('all:')
 
 file.write('all:')

-for f in all:
+for f in allK:

     file.write(' %s' % f)
 file.write('\n\n')
     file.write(' %s' % f)
 file.write('\n\n')

-for f in all:
+for f in allK:

     file.write('%s: $(%s_ALL)\n' % (f, f.upper()))
 
 file.write("""
     file.write('%s: $(%s_ALL)\n' % (f, f.upper()))
 
 file.write("""


@@ -117,9 +182,9 @@ clean:
 \trm -f ../../autoconf_inc.m4
 %s
 
 \trm -f ../../autoconf_inc.m4
 %s
 

+library: ../../Makefile.in ../makefile.bcc ../makefile.vc ../makefile.wat ../makefile.gcc
+

 ../../autoconf_inc.m4: ../../Makefile.in
 ../../autoconf_inc.m4: ../../Makefile.in

-../../configure: ../../autoconf_inc.m4
-\t(cd ../.. ; aclocal && autoconf)

 
 Makefile: regenMakefile.py
 \t./regenMakefile.py
 
 Makefile: regenMakefile.py
 \t./regenMakefile.py


@@ -130,6 +195,9 @@ Makefile: regenMakefile.py
 \t@echo
 \t@exit 1
 """ % cleanCmds)
 \t@echo
 \t@exit 1
 """ % cleanCmds)

-for l in lines:
-    file.write('%s\n' % l)
+linesK = lines.keys()
+linesK.sort()
+for lk in linesK:
+    for l in lines[lk]:
+        file.write('%s\n' % l)

 file.close()
 file.close()