added bakefile to build all demos

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/bakefiles/Makefile b/build/bakefiles/Makefile
index 4529909e91534675b7e44719de2828a7e1b1de7b..34581b42a99dd2fc792d6e1b6ecdb891ed20a1f5 100644 (file)
--- a/build/bakefiles/Makefile
+++ b/build/bakefiles/Makefile
@@ -46,6 +46,7 @@ AUTOCONF_ALL = \
        ../../contrib/src/svg/Makefile.in \
        ../../contrib/src/xrc/Makefile.in \
        ../../contrib/utils/wxrc/Makefile.in \
+       ../../demos/Makefile.in \
        ../../demos/bombs/Makefile.in \
        ../../demos/dbbrowse/Makefile.in \
        ../../demos/forty/Makefile.in \
@@ -173,6 +174,7 @@ BORLAND_ALL = \
        ../../demos/forty/makefile.bcc \
        ../../demos/fractal/makefile.bcc \
        ../../demos/life/makefile.bcc \
+       ../../demos/makefile.bcc \
        ../../demos/poem/makefile.bcc \
        ../../samples/access/makefile.bcc \
        ../../samples/artprov/makefile.bcc \
@@ -297,6 +299,7 @@ MINGW_ALL = \
        ../../demos/forty/makefile.gcc \
        ../../demos/fractal/makefile.gcc \
        ../../demos/life/makefile.gcc \
+       ../../demos/makefile.gcc \
        ../../demos/poem/makefile.gcc \
        ../../samples/access/makefile.gcc \
        ../../samples/artprov/makefile.gcc \
@@ -421,6 +424,7 @@ MSVC_ALL = \
        ../../demos/forty/makefile.vc \
        ../../demos/fractal/makefile.vc \
        ../../demos/life/makefile.vc \
+       ../../demos/makefile.vc \
        ../../demos/poem/makefile.vc \
        ../../samples/access/makefile.vc \
        ../../samples/artprov/makefile.vc \
@@ -666,6 +670,7 @@ WATCOM_ALL = \
        ../../demos/forty/makefile.wat \
        ../../demos/fractal/makefile.wat \
        ../../demos/life/makefile.wat \
+       ../../demos/makefile.wat \
        ../../demos/poem/makefile.wat \
        ../../samples/access/makefile.wat \
        ../../samples/artprov/makefile.wat \
@@ -798,6 +803,7 @@ clean:
        rm -f ../../contrib/src/svg/Makefile.in
        rm -f ../../contrib/src/xrc/Makefile.in
        rm -f ../../contrib/utils/wxrc/Makefile.in
+       rm -f ../../demos/Makefile.in
        rm -f ../../demos/bombs/Makefile.in
        rm -f ../../demos/dbbrowse/Makefile.in
        rm -f ../../demos/forty/Makefile.in
@@ -924,6 +930,7 @@ clean:
        rm -f ../../demos/forty/makefile.bcc
        rm -f ../../demos/fractal/makefile.bcc
        rm -f ../../demos/life/makefile.bcc
+       rm -f ../../demos/makefile.bcc
        rm -f ../../demos/poem/makefile.bcc
        rm -f ../../samples/access/makefile.bcc
        rm -f ../../samples/artprov/makefile.bcc
@@ -1047,6 +1054,7 @@ clean:
        rm -f ../../demos/forty/makefile.gcc
        rm -f ../../demos/fractal/makefile.gcc
        rm -f ../../demos/life/makefile.gcc
+       rm -f ../../demos/makefile.gcc
        rm -f ../../demos/poem/makefile.gcc
        rm -f ../../samples/access/makefile.gcc
        rm -f ../../samples/artprov/makefile.gcc
@@ -1170,6 +1178,7 @@ clean:
        rm -f ../../demos/forty/makefile.vc
        rm -f ../../demos/fractal/makefile.vc
        rm -f ../../demos/life/makefile.vc
+       rm -f ../../demos/makefile.vc
        rm -f ../../demos/poem/makefile.vc
        rm -f ../../samples/access/makefile.vc
        rm -f ../../samples/artprov/makefile.vc
@@ -1413,6 +1422,7 @@ clean:
        rm -f ../../demos/forty/makefile.wat
        rm -f ../../demos/fractal/makefile.wat
        rm -f ../../demos/life/makefile.wat
+       rm -f ../../demos/makefile.wat
        rm -f ../../demos/poem/makefile.wat
        rm -f ../../samples/access/makefile.wat
        rm -f ../../samples/artprov/makefile.wat
@@ -2167,6 +2177,23 @@ Makefile: regenMakefile.py
        touch $@
 
 
+../../demos/Makefile.in: ../../demos/demos.bkl
+       $(BAKEFILE) -fautoconf -o$@  -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.bcc: ../../demos/demos.bkl
+       $(BAKEFILE) -fborland -o$@  -DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.vc: ../../demos/demos.bkl
+       $(BAKEFILE) -fmsvc -o$@  -DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.gcc: ../../demos/demos.bkl
+       $(BAKEFILE) -fmingw -o$@  -DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+../../demos/makefile.wat: ../../demos/demos.bkl
+       $(BAKEFILE) -fwatcom -o$@  -DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0 ../../demos/demos.bkl
+       touch $@
+
+
 ../../demos/forty/Makefile.in: $(SDEPS) ../../demos/forty/forty.bkl
        $(BAKEFILE) -fautoconf -o$@  -DWXTOPDIR=../../ -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../demos/forty/forty.bkl
        touch $@

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 578f743c1eab4e98ca135524fd37d68615dd29ca..32962e5dba54adf123bc574a251c92ff225c0690 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -13,6 +13,7 @@ import string, os.path, copy
 DONT_GENERATE = [
     '../../samples/Makefile.in',
     '../../samples/samples.dsw',
+    '../../demos/demos.dsw',
     '../../samples/html/html_samples.dsw',
     '../../samples/opengl/opengl_samples.dsw',
 ]
@@ -108,7 +109,14 @@ addMakefile('../../samples/samples.bkl', {'all':'../../samples'},
             'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
             'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
             'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
-            'msvc6prj':None,
+            })
+addMakefile('../../demos/demos.bkl', {'all':'../../demos'},
+            args={
+            'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
+            'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
+            'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
+            'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
+            'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
             })
 
 

diff --git a/demos/demos.bkl b/demos/demos.bkl
new file mode 100644 (file)
index 0000000..1d3c86d
--- /dev/null
+++ b/demos/demos.bkl
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<makefile>
+
+    <include file="../build/bakefiles/config.bkl"/>
+    
+    <template id="sub">
+        <dir>$(id)</dir>
+        <dependency-of>all</dependency-of>
+    </template>
+
+    <subproject id="bombs" template="sub"/>
+    <subproject id="dbbrowse" template="sub"/>
+    <subproject id="forty" template="sub"/>
+    <subproject id="fractal" template="sub"/>
+    <subproject id="life" template="sub"/>
+    <subproject id="poem" template="sub"/>
+
+</makefile>