removed C++BuilderX project files, they are broken, not used by anybody and the produ...

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

diff --git a/build/bakefiles/Bakefiles.bkgen b/build/bakefiles/Bakefiles.bkgen
index f3b730f2d70125f535ef43e4752e87dea3fee0c2..3566b49ae824ca8ee17a5e95600ff15bdbb7a023 100644 (file)
--- a/build/bakefiles/Bakefiles.bkgen
+++ b/build/bakefiles/Bakefiles.bkgen
@@ -15,17 +15,11 @@
 
     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: -->
 
 
     <!-- These wildcards match all .bkl files in wxWidgets tree: -->


@@ -50,26 +44,26 @@
 
     <!-- List of output formats to generate: -->
     <add-formats>
 
     <!-- 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,watcom

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -81,7 +75,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,msvs2005prj,watcom,cbuilderx,cbx_unix
+        borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,msvs2005prj,watcom

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


@@ -120,19 +114,9 @@
     <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>

-    <add-flags files="wx.bkl" formats="cbuilderx">
-        -o../../wx.cbx
-    </add-flags>

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

diff --git a/build/bakefiles/build_cfg.bkl b/build/bakefiles/build_cfg.bkl
index d767f78ab4f7236007250c045e1d43376fbc9de7..81f14c9faf1dcb29b5103fec2056741cdda9ff0b 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','msvs2005prj','cbuilderx'] and
+    <if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2005prj'] 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 942756c03eba1bbc49f22d4a94b0e636e48b34d9..837ae13c9425e03473956f6fe4bbf330d476deef 100644 (file)
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -181,12 +181,7 @@
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
         <set var="OBJS" make_var="1">
             $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
         </set>
         <set var="OBJS" make_var="1">

-            <if cond="FORMAT!='cbuilderx'">
-                $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
-            </if>
-            <!-- FIXME: waiting for removal after CBX has better ../ dirs
-                 support -->
-            <if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
+            $(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)

         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>
         </set>
 
         <set var="BUILDDIR">$(OBJS)</set>

diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 06949d8c058bc453b0eec0ff8fd7b5e63f51bd0a..a79734ebcdff660b09bfc4272410ebcc6907d263 100644 (file)
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -425,12 +425,6 @@ Set the version of your Mingw installation here.
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
 
         <set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
     </if>
 

-    <if cond="FORMAT=='cbuilderx'">
-        <set var="EXTRACFLAGS">
-            <if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
-        </set>
-    </if>
-

 
     <!-- ================================================================== -->
     <!--            Project files - hardcode some defaults                  -->
 
     <!-- ================================================================== -->
     <!--            Project files - hardcode some defaults                  -->


@@ -459,19 +453,6 @@ Set the version of your Mingw installation here.
     </if>
 
 
     </if>
 
 

-    <!-- FIXME:
-         C++BuilderX supports only wxMSW, monolithic (sic!) static build
-         and the project can't be put into build/msw and store objects in
-         build/msw/something. This *must* be fixed! -->
-    <if cond="FORMAT=='cbuilderx'">
-        <set var="WXUNIV">0</set>
-        <set var="MONOLITHIC">1</set>
-        <set var="SRCDIR">.</set>
-        <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
-        <set var="SHARED">0</set>
-    </if>
-
-

     <!-- DigitalMars make is braindead, it doesn't have conditional
          processing: -->
     <if cond="FORMAT=='dmars'">
     <!-- DigitalMars make is braindead, it doesn't have conditional
          processing: -->
     <if cond="FORMAT=='dmars'">

diff --git a/build/bakefiles/formats/FORMATS.bkmanifest b/build/bakefiles/formats/FORMATS.bkmanifest
index 83f5ecabe7dd31790f3ac23e89f01cc3d9227e62..fcd84d22d4362b9033a3716df27d70259e7d9a77 100644 (file)
--- a/build/bakefiles/formats/FORMATS.bkmanifest
+++ b/build/bakefiles/formats/FORMATS.bkmanifest
@@ -8,14 +8,5 @@
         </description>
         <default-filename>xxx.spec</default-filename>
     </format>
         </description>
         <default-filename>xxx.spec</default-filename>
     </format>

-
-    <format id="cbx_unix">
-        <description>
-            C++BuilderX projects for Unix (use configure)
-        </description>
-        <default-filename>
-            $(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
-        </default-filename>
-    </format>

     
 </bakefile-manifest>
     
 </bakefile-manifest>

diff --git a/build/bakefiles/formats/README b/build/bakefiles/formats/README
index 7ad77ba45314ef09f646eca911f2f75555206937..053c6fa11274bb7ed5bc0d36128f837e1058a07b 100644 (file)
--- a/build/bakefiles/formats/README
+++ b/build/bakefiles/formats/README
@@ -2,4 +2,3 @@
 This directory contains misc Bakefile backends that are wxWidgets-specific:
 
 rpmspec     - generates part of .spec files with list of wxBase headers
 This directory contains misc Bakefile backends that are wxWidgets-specific:
 
 rpmspec     - generates part of .spec files with list of wxBase headers

-cbx_unix    - Borland C++BuilderX project files for configure-based build

diff --git a/build/bakefiles/formats/cbx_unix.bkl b/build/bakefiles/formats/cbx_unix.bkl
deleted file mode 100644 (file)
index 535901f..0000000
--- a/build/bakefiles/formats/cbx_unix.bkl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" ?>
-<!-- $Id$ -->
-
-<makefile>
-    
-    <include file="presets/fake.bkl"/>
-    <set var="COMPILER">vc</set>
-
-
-    <define-tag name="__fake_hook" rules="__fake">
-        <set var="type" overwrite="0">fake</set>
-    </define-tag>
-    
-    <define-tag name="__fake_hook" rules="exe">
-        <set var="type">exe</set>
-    </define-tag>
-
-    <output file="$(OUTPUT_FILE)" writer="cbx_unix.empy"/>
-    <set var="FORMAT_OUTPUT_VARIABLES">type</set>
- 
-</makefile>

diff --git a/build/bakefiles/formats/cbx_unix.empy b/build/bakefiles/formats/cbx_unix.empy
deleted file mode 100644 (file)
index b9309a1..0000000
--- a/build/bakefiles/formats/cbx_unix.empy
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--C++BuilderX Project-->
-<project>
-  <property category="build.config" name="active" value="0"/>
-  <property category="build.config" name="count" value="1"/>
-  <property category="build.config" name="excludedefaultforzero" value="0"/>
-  <property category="build.config.0" name="builddir" value="Debug"/>
-  <property category="build.config.0" name="key" value="Debug_Build"/>
-  <property category="build.config.0" name="name" value="Debug Build"/>
-  <property category="build.config.0" name="settings.MinGW" value="default;debug"/>
-  <property category="build.config.0" name="settings.gnuc++" value="default;debug"/>
-  <property category="build.config.0" name="settings.intellinia32" value="default;debug"/>
-  <property category="build.config.0" name="settings.mswin32" value="default;debug"/>
-  <property category="build.config.0" name="type" value="Toolset"/>
-  <property category="build.config.1" name="key" value="Release_Build"/>
-  <property category="build.config.1" name="name" value="Release Build"/>
-  <property category="build.config.1" name="settings.MinGW" value="default;release"/>
-  <property category="build.config.1" name="settings.gnuc++" value="default;release"/>
-  <property category="build.config.1" name="settings.intellinia32" value="default;release"/>
-  <property category="build.config.1" name="settings.mswin32" value="default;release"/>
-  <property category="build.config.1" name="type" value="Toolset"/>
-  <property category="build.node" name="type" value="CBMakefileProjectType"/>
-  <property category="build.platform" name="active" value="linux"/>
-  <property category="build.platform" name="linux.Debug_Build.toolset" value="gnuc++"/>
-  <property category="build.platform" name="linux.Release_Build.toolset" value="gnuc++"/>
-  <property category="build.platform" name="linux.default" value="gnuc++"/>
-  <property category="build.platform" name="linux.gnuc++.enabled" value="1"/>
-  <property category="build.platform" name="linux.mswin32.enabled" value="0"/>
-  <property category="build.platform" name="linux.win32b.enabled" value="0"/>
-  <property category="build.platform" name="solaris.default" value="gnuc++"/>
-  <property category="build.platform" name="solaris.enabled" value="0"/>
-  <property category="build.platform" name="win32.default" value="MinGW"/>
-  <property category="build.platform" name="win32.enabled" value="0"/>
-  <property category="cbproject" name="lastnodeid" value="4"/>
-  <property category="cbproject" name="version" value="X.1.0"/>
-  <property category="classbrowser" name="enable" value="0"/>
-  <property category="classbrowser" name="parser.cpp.skip_standard_directories" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.1" value="/usr/include"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.2" value="/usr/include/g++-3"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.MD.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.O0.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.c.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.arg" value="2"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++compile" name="option.o.enabled" value="1"/>
-  <property category="linux.Debug_Build.gnuc++.g++link" name="option.o.enabled" value="1"/>
-  <property category="linux.gnuc++.Debug_Build" name="saved" value="1"/>
-  <property category="makefileproject" name="makefile.ID.1" value="1"/>
-  <property category="makefileproject" name="makefile.list.1" value="Makefile"/>
-  <property category="makefiletarget" name="makefile.1.params" value="-f Makefile"/>
-  <property category="makefiletarget" name="makefile.1.target.list.1" value="all"/>
-  <property category="makefiletarget" name="makefile.1.target.list.2" value="clean"/>
-  <property category="runtime" name="ConfigurationCount" value="@(len([t for t in targets if t.type=='exe'])-1)"/>
-@{
-ALL_EXES = [x for x in targets if x.type=='exe']
-if len(ALL_EXES) == 1:
-    DEFAULT_EXE = 0
-else:
-    DEFAULT_EXE = -1
-}@
-  <property category="runtime" name="DefaultConfiguration" value="@DEFAULT_EXE"/>
-@[for i in range(0,len(ALL_EXES))]@
-  <property category="runtime.@i" name="BuildTargetOnRun" value="com.borland.cbuilder.build.CBProjectBuilder$ProjectBuildAction;make"/>
-  <property category="runtime.@i" name="ConfigurationName" value="@ALL_EXES[i].id"/>
-  <property category="runtime.@i" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>
-  <property category="runtime.@i" name="native.exec.path" value="./@ALL_EXES[i].id"/>
-  <property category="runtime.@i" name="native.startdir.path" value="."/>
-  <property category="runtime.@i" name="native.target.override" value="1"/>
-@[end for]@
-  <property category="unique" name="id" value="4"/>
-  <node name="console" type="NavigationDirectory">
-    <property category="directorynode" name="showSubdirectories" value="1"/>
-    <property category="directorynode" name="url" value="."/>
-    <property category="unique" name="id" value="1"/>
-  </node>
-</project>

diff --git a/build/bakefiles/wxpresets/bakefile_quickstart.txt b/build/bakefiles/wxpresets/bakefile_quickstart.txt
index 1089c06d8425070b7d847e6c5ff02fc34afdb31e..192ee52cab666ffca99c2f8b9532c01332a2daa7 100644 (file)
--- a/build/bakefiles/wxpresets/bakefile_quickstart.txt
+++ b/build/bakefiles/wxpresets/bakefile_quickstart.txt
@@ -112,7 +112,6 @@ would like to build, separated by commas. Valid values are:
 
     autoconf      GNU autoconf Makefile.in files
     borland       Borland C/C++ makefiles
 
     autoconf      GNU autoconf Makefile.in files
     borland       Borland C/C++ makefiles

-    cbuilderx     C++ Builder X project files

     dmars         Digital Mars makefiles
     dmars_smake   Digital Mars makefiles for SMAKE
     gnu           GNU toolchain makefiles (Unix)
     dmars         Digital Mars makefiles
     dmars_smake   Digital Mars makefiles for SMAKE
     gnu           GNU toolchain makefiles (Unix)