added support for Bakefile's upcoming msvs2005prj format (not enabled by default...

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

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index f1584efc5149a66268375abd245bbcfa21c74292..f3b730f2d70125f535ef43e4752e87dea3fee0c2 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -54,22 +54,22 @@
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">
     </add-formats>
 
     <del-formats files="../../samples/*.bkl">

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

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

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

     </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,msvs2005prj,cbuilderx,cbx_unix

     </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,msvs2005prj,cbuilderx,cbx_unix

     </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,msvs2005prj,cbuilderx,cbx_unix

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

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

     </del-formats>
 
     <!-- WinCE can't have console apps: -->
     </del-formats>
 
     <!-- WinCE can't have console apps: -->


@@ -81,7 +81,7 @@
 
     <!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
     <del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
 
     <!-- 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,msvs2005prj,watcom,cbuilderx,cbx_unix

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


@@ -114,6 +114,9 @@
     <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="msvs2005prj">
+        -o../msw/wx.sln
+    </add-flags>

     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>
     <add-flags files="wx.bkl" formats="msevc4prj">
         -o../wince/wx.vcw
     </add-flags>


@@ -131,7 +134,7 @@
         -o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
     </add-flags>
     <add-flags files="../../contrib/build/*/*.bkl"
         -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">
+               formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj,msvs2005prj">

         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 
         -DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
     </add-flags>
 

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index 0364cb33fbb4de6ee746a34ea2fe79ca1c606192..d767f78ab4f7236007250c045e1d43376fbc9de7 100644 (file)
--- a/build/bakefiles/build_cfg.bkl
+++ b/build/bakefiles/build_cfg.bkl
@@ -8,7 +8,7 @@
     the library.
     -->
 
     the library.
     -->
 

-    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj','cbuilderx'] and

               TOOLKIT in ['PM','MSW','MGL','MOTIF']">
 
         <set var="BUILD_CFG_FILE" make_var="1">
               TOOLKIT in ['PM','MSW','MGL','MOTIF']">
 
         <set var="BUILD_CFG_FILE" make_var="1">

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 52c0c287cdfad98ebef35c850560cd94a82577a3..c990853e8912cf39431b101a58bbe26683dee985 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -347,7 +347,9 @@
 
     <!-- deal with the need to copy setup.h here: -->
 
 
     <!-- deal with the need to copy setup.h here: -->
 

-    <set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
+    <set var="IS_MSVC_PRJ">
+        $(FORMAT in ['msvc6prj','msevc4prj','msvs2005prj'])
+    </set>

 
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">
 
     <define-tag name="msvc-headers" rules="dll,lib">
         <if cond="IS_MSVC_PRJ">

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 76dec90722d40c5957adf8a1a0ef94316421d19d..06949d8c058bc453b0eec0ff8fd7b5e63f51bd0a 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -98,8 +98,8 @@ Accepted values: AMD64, IA64.
     <!-- FIXME: restore this once bakefile is fixed to not use
                 /Gm /GZ (incompatible with /O2) w/ debug-info -->
     <set var="DEBUG_INFO_DEFAULT">
     <!-- FIXME: restore this once bakefile is fixed to not use
                 /Gm /GZ (incompatible with /O2) w/ debug-info -->
     <set var="DEBUG_INFO_DEFAULT">

-        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj','msvs2005prj']">default</if>

     </set>
     -->
     <set var="DEBUG_INFO_DEFAULT">default</set>
     </set>
     -->
     <set var="DEBUG_INFO_DEFAULT">default</set>


@@ -231,8 +231,8 @@ Acts according to BUILD by default.
 
     <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
     <set var="USE_QA_DEFAULT">
 
     <!-- currently only VC++ can compile wxDebugReport which is in QA lib -->
     <set var="USE_QA_DEFAULT">

-        <if cond="FORMAT in ['msvc','msvc6prj']">1</if>
-        <if cond="FORMAT not in ['msvc','msvc6prj']">0</if>
+        <if cond="FORMAT in ['msvc','msvc6prj','msvs2005prj']">1</if>
+        <if cond="FORMAT not in ['msvc','msvc6prj','msvs2005prj']">0</if>

     </set>
     <option name="USE_QA">
         <values>0,1</values>
     </set>
     <option name="USE_QA">
         <values>0,1</values>

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 4e5c0177135355a1e8af86a14a5210592d3517c7..c52b47caca4ae59efd4f4b967476e66d06a06bef 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -24,7 +24,7 @@
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 
     <!-- ...and when there are multiple libraries: -->
     <include file="multilib.bkl"/>
 

-    <if cond="FORMAT in ['msvc6prj','msevc4prj']">
+    <if cond="FORMAT in ['msvc6prj','msevc4prj','msvs2005prj']">

         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>
         <set var="MSVC6PRJ_MERGED_TARGETS">
             <if cond="MONOLITHIC=='0'">$(MSVC6PRJ_MERGED_TARGETS_MULTILIB)</if>
             <if cond="MONOLITHIC=='1'">$(MSVC6PRJ_MERGED_TARGETS_MONOLIB)</if>