inside <wx-data> we need to use instead of /

[wxWidgets.git] / build / bakefiles / Bakefiles.bkgen

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index f1584efc5149a66268375abd245bbcfa21c74292..2c2f3caf7d9627c523411d23741871df39e269b6 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 
 <?xml version="1.0" ?>
 <!-- $Id$ -->
 

-<bakefile-gen>
+<bakefile-gen xmlns="http://www.bakefile.org/schema/bakefile-gen">

 
     <!--
     Formats listed here are not generated by default. To enable them, either
 
     <!--
     Formats listed here are not generated by default. To enable them, either


@@ -15,23 +15,16 @@
 
     Reasons why these formats are disabled (and so not in CVS):
 
 
     Reasons why these formats are disabled (and so not in CVS):
 

-    cbuilderx - Generated projects are too bad to be included in CVS. Please
-                *do not* enable this format until FIXMEs in .bkl files related
-                to cbuilderx are addressed. In particular, the project must
-                be placed into build/msw(?) directory and store object files
-                in its subdirectory and it must copy setup.h as others do.
-    cbx_unix  - Doesn't integrate well and won't be used by most Unix people.

     dmars, dmars_smake, msevc4prj - These are generated at release time and
                 we don't want to clutter the source tree with these files.
     -->
 
     dmars, dmars_smake, msevc4prj - These are generated at release time and
                 we don't want to clutter the source tree with these files.
     -->
 

-    <disable-formats>dmars,dmars_smake,msevc4prj,cbx_unix,cbuilderx</disable-formats>
+    <disable-formats>dmars,dmars_smake,msevc4prj</disable-formats>

 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl
 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->
     <input>
         wx.bkl

-        ../../contrib/build/*/*.bkl

         ../../samples/*.bkl
         ../../samples/*/*.bkl
         ../../samples/*/*/*.bkl
         ../../samples/*.bkl
         ../../samples/*/*.bkl
         ../../samples/*/*/*.bkl


@@ -41,47 +34,45 @@
         ../../utils/*.bkl
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl
         ../../utils/*.bkl
         ../../utils/*/*.bkl
         ../../utils/*/*/*.bkl

-        ../../contrib/samples/*.bkl
-        ../../contrib/samples/*/*.bkl
-        ../../contrib/samples/*/*/*.bkl
-        ../../contrib/utils/*/*.bkl

         ../../tests/*.bkl
         ../../tests/*.bkl

+        ../../tests/benchmarks/bench.bkl

     </input>
 
     <!-- List of output formats to generate: -->
     <add-formats>
     </input>
 
     <!-- List of output formats to generate: -->
     <add-formats>

-        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
+        autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,watcom

     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">

-        autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        autoconf,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj

     </del-formats>
     <del-formats files="../../demos/*.bkl">
     </del-formats>
     <del-formats files="../../demos/*.bkl">

-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj

     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/html/html_samples.bkl">

-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj

     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/mobile/mobile_samples.bkl">

-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj

     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">
     </del-formats>
     <del-formats files="../../samples/opengl/opengl_samples.bkl">

-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj

     </del-formats>
     <del-formats files="../../utils/*.bkl">
     </del-formats>
     <del-formats files="../../utils/*.bkl">

-        msvc6prj,msevc4prj,cbuilderx,cbx_unix
+        msvc6prj,msevc4prj,msvs2003prj,msvs2005prj

     </del-formats>
 
     <!-- WinCE can't have console apps: -->
     <del-formats files="../../samples/console/*">msevc4prj</del-formats>
     </del-formats>
 
     <!-- WinCE can't have console apps: -->
     <del-formats files="../../samples/console/*">msevc4prj</del-formats>

+    <del-formats files="../../samples/sockets/*">msevc4prj</del-formats>

     <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
     <del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>

+    <del-formats files="../../utils/ifacecheck/src/*">msevc4prj</del-formats>

     <del-formats files="../../utils/wxrc/*">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) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
     <del-formats files="../../tests/*">msevc4prj</del-formats>
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">

-        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2003prj,msvs2005prj,watcom

     </del-formats>
 
 
     </del-formats>
 
 


@@ -114,25 +105,14 @@
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>
     <add-flags files="wx.bkl" formats="msvc6prj">
         -o../msw/wx.dsw
     </add-flags>

-    <add-flags files="wx.bkl" formats="msevc4prj">
-        -o../wince/wx.vcw
-    </add-flags>
-    <add-flags files="wx.bkl" formats="cbuilderx">
-        -o../../wx.cbx
+    <add-flags files="wx.bkl" formats="msvs2003prj">
+        -o../msw/wx_vc7.sln

     </add-flags>
     </add-flags>

-    <add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
+    <add-flags files="wx.bkl" formats="msvs2005prj">
+        -o../msw/wx_vc8.sln

     </add-flags>
     </add-flags>

-    <add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
-    </add-flags>
-    <!-- FIXME: don't do this once it is possible (new CBX version) -->
-    <add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
-        -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
-    </add-flags>
-    <add-flags files="../../contrib/build/*/*.bkl"
-               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
-        -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
+    <add-flags files="wx.bkl" formats="msevc4prj">
+        -o../wince/wx.vcw

     </add-flags>
 
 
     </add-flags>
 
 


@@ -145,12 +125,25 @@
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 
     <add-formats files="wx.bkl">rpmspec</add-formats>
 
 

+    <!-- Use different names for Visual C++ 2003 project files: -->
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
+               formats="msvs2003prj">
+        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc7.sln
+    </add-flags>
+
+    <!-- Use different names for Visual C++ 2005 project files: -->
+    <add-flags files="../../samples/*/*,../../samples/*/*/*,../../demos/*/*,../../utils/*/*,../../utils/*/*/*,../../tests/*"
+               formats="msvs2005prj">
+        -o$(INPUT_FILE_DIR)/$(INPUT_FILE_BASENAME_NOEXT)_vc8.sln
+    </add-flags>
+

     <!-- Makefile specific settings: -->
 
     <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
         -DWRITE_OPTIONS_FILE=0
     </add-flags>
     <!-- Makefile specific settings: -->
 
     <add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
         -DWRITE_OPTIONS_FILE=0
     </add-flags>

-    <del-flags files="wx.bkl">
+    <del-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom"
+               files="wx.bkl">

         -DWRITE_OPTIONS_FILE=0
     </del-flags>
 
         -DWRITE_OPTIONS_FILE=0
     </del-flags>
 


@@ -251,7 +244,7 @@
         -DOPTIONS_FILE=../../../../build/msw/config.wat
     </add-flags>
 
         -DOPTIONS_FILE=../../../../build/msw/config.wat
     </add-flags>
 

-    
+

     <!-- Makefiles for out-of-tree building of samples on Unix: -->
     <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
         gnu
     <!-- Makefiles for out-of-tree building of samples on Unix: -->
     <add-formats files="../../samples/*/*.bkl,../../samples/*/*/*.bkl">
         gnu