Patch #3178 2011-06-26 03:05

blackoscar

compiler & scriptedwizard - add Catalina C Compiler
Download
3178-compiler_scrip.patch (98.1 KB)
Category
Plugin::FeatureAdd
Status
Out of date
Close date
2013-05-28 01:34
Assigned to
alpha0010
Index: debian/changelog
===================================================================
--- debian/changelog    (revision 7254)
+++ debian/changelog    (working copy)
@@ -1,4 +1,4 @@
-codeblocks (10.05svn6787) unstable; urgency=low
+codeblocks (10.05svn7252) unstable; urgency=low
 
   * New svn revision
 
Index: configure.in
===================================================================
--- configure.in    (revision 7254)
+++ configure.in    (working copy)
@@ -305,6 +305,7 @@
     src/plugins/scriptedwizard/resources/Makefile
     src/plugins/scriptedwizard/resources/arm/Makefile
     src/plugins/scriptedwizard/resources/avr/Makefile
+    src/plugins/scriptedwizard/resources/catalina/Makefile
     src/plugins/scriptedwizard/resources/c_file/Makefile
     src/plugins/scriptedwizard/resources/console/Makefile
     src/plugins/scriptedwizard/resources/d/Makefile
Index: src/plugins/compilergcc/compilerCatalina.h
===================================================================
--- src/plugins/compilergcc/compilerCatalina.h    (revision 0)
+++ src/plugins/compilergcc/compilerCatalina.h    (revision 0)
@@ -0,0 +1,23 @@
+/*
+ * This file is part of the Code::Blocks IDE and licensed under the GNU General Public License, version 3
+ * http://www.gnu.org/licenses/gpl-3.0.html
+ */
+
+#ifndef COMPILER_CATALINA_H
+#define COMPILER_CATALINA_H
+
+#include "compiler.h"
+
+class CompilerCatalina : public Compiler
+{
+    public:
+        CompilerCatalina();
+        virtual ~CompilerCatalina();
+        virtual void Reset();
+        virtual void LoadDefaultRegExArray();
+        virtual AutoDetectResult AutoDetectInstallationDir();
+    protected:
+        virtual Compiler* CreateCopy();
+};
+
+#endif // COMPILER_CATALINA_H
Index: src/plugins/compilergcc/compilergcc.cpp
===================================================================
--- src/plugins/compilergcc/compilergcc.cpp    (revision 7254)
+++ src/plugins/compilergcc/compilergcc.cpp    (working copy)
@@ -8,20 +8,11 @@
  */
 
 #include <sdk.h>
-
+#include <prep.h>
 #include <wx/frame.h> // GetMenuBar
 #include <wx/gauge.h>     // Needs to be before compilergcc.h if NOPCH on wxMSW
 #include <wx/listctrl.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/sizer.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/statline.h>
-#include <wx/ffile.h>
-#include <wx/utils.h>
-#include <wx/uri.h>
-
-#include <prep.h>
+#include "compilergcc.h"
 #include <manager.h>
 #include <sdk_events.h>
 #include <pipedprocess.h>
@@ -36,8 +27,14 @@
 #include <cbeditor.h>
 #include <annoyingdialog.h>
 #include <filefilters.h>
-
-#include "compilergcc.h"
+#include <wx/xrc/xmlres.h>
+#include <wx/sizer.h>
+#include <wx/button.h>
+#include <wx/stattext.h>
+#include <wx/statline.h>
+#include <wx/ffile.h>
+#include <wx/utils.h>
+#include <wx/uri.h>
 #include "makefilegenerator.h"
 #include "compileroptionsdlg.h"
 #include "directcommands.h"
@@ -49,16 +46,17 @@
 #include "compilerMINGW.h"
 #ifdef __WXGTK__
 // TODO (mandrav#1#): Find out which compilers exist for linux and adapt this
+    #include "compilerDMD.h"
     #include "compilerGNUARM.h"
     #include "compilerGNUAVR.h"
 #endif
 #ifdef __WXMSW__
     #include "compilerMSVC.h"
     #include "compilerMSVC8.h"
-    #include "compilerMSVC10.h"
     #include "compilerBCC.h"
     #include "compilerDMC.h"
     #include "compilerOW.h"
+    #include "compilerDMD.h"
     #include "compilerGNUARM.h"
     #include "compilerGNUAVR.h"
     #include "compilerGNUMSP430.h"
@@ -68,9 +66,8 @@
 #include "compilerICC.h"
 #include "compilerSDCC.h"
 #include "compilerTcc.h"
+#include "compilerCatalina.h"
 #include "compilerGDC.h"
-#include "compilerLDC.h"
-#include "compilerDMD.h"
 #include "compilerGNUPOWERPC.h"
 #include "compilerGNUTRICORE.h"
 
@@ -112,7 +109,7 @@
 
         style[caption].SetAlignment(wxTEXT_ALIGNMENT_DEFAULT);
         style[caption].SetFont(style[error].GetFont());
-        style[warning].SetTextColour(BlendTextColour(*wxBLUE));
+        style[warning].SetTextColour(*wxBLUE);
         style[error].SetFont(style[info].GetFont());
     }
 
@@ -194,10 +191,10 @@
 int idMenuRebuild = XRCID("idCompilerMenuRebuild");
 int idMenuRebuildTarget = wxNewId();
 int idMenuRebuildFromProjectManager = wxNewId();
+int idMenuCompileAll = XRCID("idCompilerMenuCompileAll");
+int idMenuRebuildAll = XRCID("idCompilerMenuRebuildAll");
 int idMenuClean = XRCID("idCompilerMenuClean");
-int idMenuBuildWorkspace = XRCID("idCompilerMenuBuildWorkspace");
-int idMenuRebuildWorkspace = XRCID("idCompilerMenuRebuildWorkspace");
-int idMenuCleanWorkspace = XRCID("idCompilerMenuCleanWorkspace");
+int idMenuCleanAll = XRCID("idCompilerMenuCleanAll");
 int idMenuCleanTarget = wxNewId();
 int idMenuCleanFromProjectManager = wxNewId();
 int idMenuCompileAndRun = XRCID("idCompilerMenuCompileAndRun");
@@ -243,10 +240,10 @@
     EVT_UPDATE_UI(idMenuRebuild, CompilerGCC::OnUpdateUI)
     EVT_UPDATE_UI(idMenuRebuildTarget, CompilerGCC::OnUpdateUI)
     EVT_UPD
download for full patch...
blackoscar 2011-06-26 03:08

This patch requires two files to be added to

src/plugins/scriptedwizard/resources/catalina/

These files are available here:

logo.png - http://anyhub.net/file/3ijj-logo.png

wizard.png - http://anyhub.net/file/3ijl-wizard.png

alpha0010 2012-12-25 14:34
alpha0010 2013-05-28 01:34

No response, closing.