upgrade to bakefile-0.1.4

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

diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 3965e4681a8d97b33f56c9d45fc58ba49651da75..f8c6a1082eb112876762b366cd725e5b9c58672a 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -3,11 +3,7 @@
 
 <makefile>
 
 
 <makefile>
 

-    <requires version="0.1.3"/>
-    <!-- FIXME: remove this kludge when upgraded to 0.1.4: -->
-    <if cond="BAKEFILE_VERSION=='0.1.3'">
-        <define-tag name="pic" rules="exe,dll,lib,module"/>
-    </if>
+    <requires version="0.1.4"/>

     
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>
     
     <!-- bakefile modules we need: -->
     <using module="datafiles"/>


@@ -305,15 +301,6 @@ InputPath=..\include\wx\msw\$(vc_setup_h)
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             </set>
 "$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
 $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
             </set>

-            <!-- FIXME: temporary kludge! remove after upgrade to 0.1.4 -->
-            <if cond="FORMAT=='msvc6prj'">
-                <set var="__custom_build_files">
-                    $(_custom_build_files)
-                </set>
-                <set var="__custom_build_include_wx_msw_setup_h">
-                    $(_custom_build_include_wx_msw_setup_h)
-                </set>
-            </if>

         </if>
     </define-tag>
 
         </if>
     </define-tag>
 

diff --git a/build/bakefiles/formats/__fake.bkl b/build/bakefiles/formats/__fake.bkl
deleted file mode 100644 (file)
index 2a77d90..0000000
--- a/build/bakefiles/formats/__fake.bkl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<!--
-Contains rule definitions that Bakefile requires in every format, implemented
-as empty stubs. This is used by our private formats that don't generate real
-makefiles, e.g. wx24dsp or rpmspec ones.
--->
-
-<makefile>
-
-    <include file="win32.bkl"/>
-
-    <set var="CC">cc</set>
-    <set var="CXX">c++</set>
-    <set var="CPPFLAGS"/>
-    <set var="CFLAGS"/>
-    <set var="CXXFLAGS"/>
-    <set var="LDFLAGS"/>
-
-    <define-rule name="__fake">
-        <template>
-            <__fake_hook/>
-        </template>
-    
-        <define-tag name="app-type"/>
-        <define-tag name="sources"/>
-        <define-tag name="libname"/>
-        <define-tag name="dllname"/>
-        <define-tag name="dirname"/>
-        <define-tag name="dependency-of"/>
-        <define-tag name="debug-info"/>
-        <define-tag name="debug-runtime-libs"/>
-        <define-tag name="runtime-libs"/>
-        <define-tag name="optimize"/>
-        <define-tag name="warnings"/>
-        <define-tag name="threading"/>
-        <define-tag name="cxx-rtti"/>
-        <define-tag name="cxx-exceptions"/>
-        <define-tag name="cppflags"/>
-        <define-tag name="cflags"/>
-        <define-tag name="cxxflags"/>
-        <define-tag name="ldflags"/>
-        <define-tag name="ldlibs"/>
-        <define-tag name="define"/>
-        <define-tag name="include"/>
-        <define-tag name="install-to"/>
-        <define-tag name="install-if"/>
-        <define-tag name="installable"/>
-        <define-tag name="dir"/>
-        <define-tag name="lib-path"/>
-        <define-tag name="precomp-headers"/>
-        <define-tag name="precomp-headers-gen"/>
-        <define-tag name="precomp-headers-header"/>        
-        <define-tag name="precomp-headers-file"/>
-        <define-tag name="precomp-headers-exclude"/>
-        <define-tag name="version"/>
-        <define-tag name="so_version"/>
-        <define-tag name="mac_version"/>
-        <define-tag name="depends"/>
-        <define-tag name="objects-depend"/>
-        <define-tag name="sys-lib"/>
-        <define-tag name="library"/>
-        <define-tag name="command"/>
-        <define-tag name="mac-res"/>
-        <define-tag name="win32-res"/>
-        <define-tag name="is-phony"/>
-
-        <define-tag name="__fake_hook"/>
-    </define-rule>
-
-    <define-rule name="exe" extends="__fake"/>
-    <define-rule name="dll" extends="__fake"/>
-    <define-rule name="module" extends="__fake"/>
-    <define-rule name="lib" extends="__fake"/>
-    <define-rule name="action" extends="__fake"/>
-    <define-rule name="phony" extends="__fake"/>
-    <define-rule name="subproject" extends="__fake"/>
-    
-</makefile>

diff --git a/build/bakefiles/formats/cbx_unix.bkl b/build/bakefiles/formats/cbx_unix.bkl
index 6707e61a043cec47052317b8fe50ec97f3e9a6fb..535901ff2b07e3d429f18bbcc5bc459305cac52f 100644 (file)
--- a/build/bakefiles/formats/cbx_unix.bkl
+++ b/build/bakefiles/formats/cbx_unix.bkl
@@ -3,7 +3,7 @@
 
 <makefile>
     
 
 <makefile>
     

-    <include file="__fake.bkl"/>
+    <include file="presets/fake.bkl"/>

     <set var="COMPILER">vc</set>
 
 
     <set var="COMPILER">vc</set>
 
 

diff --git a/build/bakefiles/formats/rpmspec.bkl b/build/bakefiles/formats/rpmspec.bkl
index 054901adb48073932ce7b25fbef44759a12294e0..fd9e9830b3f288f7b69762b50e0365d638f8848b 100644 (file)
--- a/build/bakefiles/formats/rpmspec.bkl
+++ b/build/bakefiles/formats/rpmspec.bkl
@@ -3,7 +3,7 @@
 
 <makefile>
 
 
 <makefile>
 

-    <include file="__fake.bkl"/>
+    <include file="presets/fake.bkl"/>

     <set var="COMPILER">gcc</set>
 
     <set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
     <set var="COMPILER">gcc</set>
 
     <set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>

diff --git a/build/bakefiles/formats/wx24dsp.bkl b/build/bakefiles/formats/wx24dsp.bkl
index a41ae3d7de723647199eacbe8c8eb6fa5262e5b6..34a7d4fca72f3cf4633d549fc030883431d1f440 100644 (file)
--- a/build/bakefiles/formats/wx24dsp.bkl
+++ b/build/bakefiles/formats/wx24dsp.bkl
@@ -5,7 +5,7 @@
 
     <include file="win32.bkl"/>
     <set var="COMPILER">vc</set>
 
     <include file="win32.bkl"/>
     <set var="COMPILER">vc</set>

-    <include file="__fake.bkl"/>
+    <include file="presets/fake.bkl"/>

 
     <set var="ALL_SOURCES" eval="0">
         $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
 
     <set var="ALL_SOURCES" eval="0">
         $(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)