diff --git a/.gitignore b/.gitignore index f75d588..459a53e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ codeblocks-10.05-src.tar.bz2 +/codeblocks_12.11-1.tar.gz diff --git a/codeblocks-10.05-D.patch b/codeblocks-10.05-D.patch deleted file mode 100644 index 5fe439a..0000000 --- a/codeblocks-10.05-D.patch +++ /dev/null @@ -1,482 +0,0 @@ -From d4a53449abd8759d7935c6b97d0e527d3c87fc8b Mon Sep 17 00:00:00 2001 -From: afb -Date: Sat, 28 Aug 2010 13:36:34 +0000 -Subject: [PATCH 1/4] * allow running DMD on all platforms - -git-svn-id: svn://svn.berlios.de/codeblocks/trunk@6553 98b59c6a-2706-0410-b7d6-d2fa1a1880c9 ---- - src/plugins/compilergcc/compilerDMD.cpp | 5 ----- - src/plugins/compilergcc/compilerDMD.h | 5 ----- - src/plugins/compilergcc/compilergcc.cpp | 2 +- - 3 files changed, 1 insertions(+), 11 deletions(-) - -diff --git a/src/plugins/compilergcc/compilerDMD.cpp b/src/plugins/compilergcc/compilerDMD.cpp -index 538db2c..3e23aae 100644 ---- a/src/plugins/compilergcc/compilerDMD.cpp -+++ b/src/plugins/compilergcc/compilerDMD.cpp -@@ -7,9 +7,6 @@ - * $HeadURL: svn+ssh://jenslody@svn.berlios.de/svnroot/repos/codeblocks/trunk/src/plugins/compilergcc/compilerDMD.cpp $ - */ - --#if defined(_WIN32) || defined(__linux__) --// this compiler is valid only in windows and linux -- - #include - #include - #include -@@ -182,5 +179,3 @@ AutoDetectResult CompilerDMD::AutoDetectInstallationDir() - - return wxFileExists(m_MasterPath + sep + _T("bin") + sep + m_Programs.C) ? adrDetected : adrGuessed; - } -- --#endif // _WIN32 || linux -diff --git a/src/plugins/compilergcc/compilerDMD.h b/src/plugins/compilergcc/compilerDMD.h -index 0f5a431..5e0eab4 100644 ---- a/src/plugins/compilergcc/compilerDMD.h -+++ b/src/plugins/compilergcc/compilerDMD.h -@@ -3,9 +3,6 @@ - * http://www.gnu.org/licenses/gpl-3.0.html - */ - --#if defined(_WIN32) || defined(__linux__) --// this compiler is valid only in windows and linux -- - #ifndef COMPILERDMD_H - #define COMPILERDMD_H - -@@ -25,5 +22,3 @@ class CompilerDMD : public Compiler - }; - - #endif // COMPILERDMD_H -- --#endif // _WIN32 || linux -diff --git a/src/plugins/compilergcc/compilergcc.cpp b/src/plugins/compilergcc/compilergcc.cpp -index c9964fc..be44e72 100644 ---- a/src/plugins/compilergcc/compilergcc.cpp -+++ b/src/plugins/compilergcc/compilergcc.cpp -@@ -394,8 +394,8 @@ void CompilerGCC::OnAttach() - CompilerFactory::RegisterCompiler(new CompilerSDCC); - CompilerFactory::RegisterCompiler(new CompilerTcc); - CompilerFactory::RegisterCompiler(new CompilerGDC); --#if defined(__WIN32__) || defined(__linux__) - CompilerFactory::RegisterCompiler(new CompilerDMD); -+#if defined(__WIN32__) || defined(__linux__) - CompilerFactory::RegisterCompiler(new CompilerGNUARM); - CompilerFactory::RegisterCompiler(new CompilerGNUAVR); - CompilerFactory::RegisterCompiler(new CompilerGNUPOWERPC); --- -1.7.2.2 - - -From eb7ef89d0b01eb11f742a899f75bb0b0284d40fd Mon Sep 17 00:00:00 2001 -From: afb -Date: Sat, 28 Aug 2010 13:41:07 +0000 -Subject: [PATCH 2/4] * add LDC compiler, LLVM backend / D1 language / Tango library - -git-svn-id: svn://svn.berlios.de/codeblocks/trunk@6554 98b59c6a-2706-0410-b7d6-d2fa1a1880c9 ---- - src/CodeBlocks-unix.cbp | 6 ++ - src/CodeBlocks.cbp | 6 ++ - src/plugins/compilergcc/Makefile.am | 4 +- - src/plugins/compilergcc/compilerLDC.cpp | 142 +++++++++++++++++++++++++++++++ - src/plugins/compilergcc/compilerLDC.h | 24 +++++ - src/plugins/compilergcc/compilergcc.cpp | 2 + - 6 files changed, 183 insertions(+), 1 deletions(-) - create mode 100644 src/plugins/compilergcc/compilerLDC.cpp - create mode 100644 src/plugins/compilergcc/compilerLDC.h - -diff --git a/src/CodeBlocks-unix.cbp b/src/CodeBlocks-unix.cbp -index eb2d9da..c3c8585 100644 ---- a/src/CodeBlocks-unix.cbp -+++ b/src/CodeBlocks-unix.cbp -@@ -1144,6 +1144,12 @@ - - -+ -+ -+ -+ - - -diff --git a/src/CodeBlocks.cbp b/src/CodeBlocks.cbp -index 47a2196..5a7b2bf 100644 ---- a/src/CodeBlocks.cbp -+++ b/src/CodeBlocks.cbp -@@ -1244,6 +1244,12 @@ - - -+ -+ -+ -+ - - -diff --git a/src/plugins/compilergcc/Makefile.am b/src/plugins/compilergcc/Makefile.am -index 8efa5bf..fe4b245 100644 ---- a/src/plugins/compilergcc/Makefile.am -+++ b/src/plugins/compilergcc/Makefile.am -@@ -27,6 +27,7 @@ libcompiler_la_SOURCES = advancedcompileroptionsdlg.cpp \ - compilererrors.cpp \ - compilergcc.cpp \ - compilerGDC.cpp \ -+ compilerLDC.cpp \ - compilerICC.cpp \ - compilerLCC.cpp \ - compilermessages.cpp \ -@@ -55,6 +56,7 @@ noinst_HEADERS = advancedcompileroptionsdlg.h \ - compilererrors.h \ - compilergcc.h \ - compilerGDC.h \ -+ compilerLDC.h \ - compilerICC.h \ - compilerLCC.h \ - compilermessages.h \ -@@ -75,4 +77,4 @@ noinst_HEADERS = advancedcompileroptionsdlg.h \ - makefilegenerator.h - - EXTRA_DIST = compilerMSVC8.h \ -- compilerMSVC8.cpp -\ No newline at end of file -+ compilerMSVC8.cpp -diff --git a/src/plugins/compilergcc/compilerLDC.cpp b/src/plugins/compilergcc/compilerLDC.cpp -new file mode 100644 -index 0000000..ab60488 ---- /dev/null -+++ b/src/plugins/compilergcc/compilerLDC.cpp -@@ -0,0 +1,142 @@ -+/* -+ * 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 -+ * -+ * $Revision: 5929 $ -+ * $Id: compilerLDC.cpp $ -+ * $HeadURL: svn://svn.berlios.de/codeblocks/trunk/src/plugins/compilergcc/compilerLDC.cpp $ -+ */ -+ -+#include -+#include -+#include "compilerLDC.h" -+#include -+#include -+#include -+#include -+#include -+#include "manager.h" -+#include "logmanager.h" -+ -+#include -+ -+CompilerLDC::CompilerLDC() -+ : Compiler(_("LLVM D Compiler"), _T("ldc")) -+{ -+ Reset(); -+} -+ -+CompilerLDC::~CompilerLDC() -+{ -+ //dtor -+} -+ -+Compiler * CompilerLDC::CreateCopy() -+{ -+ Compiler* c = new CompilerLDC(*this); -+ c->SetExtraPaths(m_ExtraPaths); // wxArrayString doesn't seem to be copied with the default copy ctor... -+ return c; -+} -+ -+void CompilerLDC::Reset() -+{ -+ m_Programs.C = _T("ldc"); -+ m_Programs.CPP = _T("ldc"); -+ m_Programs.LD = _T("ldc"); -+ m_Programs.DBG = _T("gdb"); -+ m_Programs.LIB = _T("ar"); -+ m_Programs.WINDRES = _T(""); -+ m_Programs.MAKE = _T("make"); -+ -+ m_Switches.includeDirs = _T("-I"); -+ m_Switches.libDirs = _T("-L"); -+ m_Switches.linkLibs = _T("-l"); -+ m_Switches.defines = _T("-d-version="); -+ m_Switches.genericSwitch = _T("-"); -+ m_Switches.objectExtension = _T("o"); -+ m_Switches.needDependencies = true; -+ m_Switches.forceCompilerUseQuotes = false; -+ m_Switches.forceLinkerUseQuotes = false; -+ m_Switches.logging = clogSimple; -+ m_Switches.libPrefix = _T("lib"); -+ m_Switches.libExtension = _T("a"); -+ m_Switches.linkerNeedsLibPrefix = false; -+ m_Switches.linkerNeedsLibExtension = false; -+ -+ m_Options.ClearOptions(); -+ m_Options.AddOption(_("Produce debugging symbols"), -+ _T("-g"), -+ _("Debugging"), -+ _T(""), -+ true, -+ _T("-O1 -O2 -O3"), -+ _("You have optimizations enabled. This is Not A Good Thing(tm) when producing debugging symbols...")); -+ -+ wxString category = _("Warnings"); -+ -+ // warnings -+ m_Options.AddOption(_("Enable warnings"), _T("-w"), category); -+ // D features -+ category = _("D"); -+ m_Options.AddOption(_("allow deprecated features"), _T("-d"), category); -+ m_Options.AddOption(_("inline expand functions"), _T("-enable-inlining"), category); -+ m_Options.AddOption(_("enable array bounds checks"), _T("-enable-boundscheck"), category); -+ m_Options.AddOption(_("enable contracts"), _T("-enable-contracts"), category); -+ m_Options.AddOption(_("enable assertions"), _T("-enable-asserts"), category); -+ m_Options.AddOption(_("enable invariants"), _T("-enable-invariants"), category); -+ -+ // optimization -+ category = _("Optimization"); -+ m_Options.AddOption(_("No optimization"), _T("-O0"), category); -+ m_Options.AddOption(_("Simple optimizations"), _T("-O1"), category); -+ m_Options.AddOption(_("Good optimizations"), _T("-O2"), category); -+ m_Options.AddOption(_("Aggressive optimizations"), _T("-O3"), category); -+ // machine dependent options - cpu arch -+ category = _("CPU architecture tuning (choose none, or only one of these)"); -+ m_Options.AddOption(_("32-bit X86: Pentium-Pro and above"), _T("-march=x86"), category); -+ m_Options.AddOption(_("64-bit X86: EM64T and AMD64"), _T("-march=x86-64"), category); -+ -+ m_Commands[(int)ctCompileObjectCmd].push_back(CompilerTool(_T("$compiler $options $includes -c $file -of=$object"))); -+ m_Commands[(int)ctGenDependenciesCmd].push_back(CompilerTool(_T("$compiler $options -deps=$dep_object $includes $file"))); -+ m_Commands[(int)ctCompileResourceCmd].push_back(CompilerTool(_T("$rescomp -i $file -J rc -o $resource_output -O coff $res_includes"))); -+ m_Commands[(int)ctLinkConsoleExeCmd].push_back(CompilerTool(_T("$linker $libdirs -of=$exe_output $link_objects $link_resobjects $link_options $libs"))); -+ m_Commands[(int)ctLinkExeCmd] = m_Commands[(int)ctLinkConsoleExeCmd]; // no -mwindows -+ m_Commands[(int)ctLinkDynamicCmd].push_back(CompilerTool(_T("$linker -shared $libdirs $link_objects $link_resobjects -o $exe_output $link_options $libs"))); -+ m_Commands[(int)ctLinkStaticCmd].push_back(CompilerTool(_T("$lib_linker -r $static_output $link_objects\nranlib $static_output"))); -+ m_Commands[(int)ctLinkNativeCmd] = m_Commands[(int)ctLinkConsoleExeCmd]; // unsupported currently -+ -+ LoadDefaultRegExArray(); -+ -+ m_CompilerOptions.Clear(); -+ m_LinkerOptions.Clear(); -+ m_LinkLibs.Clear(); -+ m_CmdsBefore.Clear(); -+ m_CmdsAfter.Clear(); -+} -+ -+void CompilerLDC::LoadDefaultRegExArray() -+{ -+ m_RegExes.Clear(); -+ m_RegExes.Add(RegExStruct(_("Fatal error"), cltError, _T("FATAL:[ \t]*(.*)"), 1)); -+ m_RegExes.Add(RegExStruct(_("'Instantiated from here' info"), cltNormal, _T("(") + FilePathWithSpaces + _T("):([0-9]+):[ \t]+([iI]nstantiated from here.*)"), 3, 1, 2)); m_RegExes.Add(RegExStruct(_("Resource compiler error"), cltError, _T("windres.exe:[ \t](") + FilePathWithSpaces + _T("):([0-9]+):[ \t](.*)"), 3, 1, 2)); -+ m_RegExes.Add(RegExStruct(_("Resource compiler error"), cltError, _T("windres.exe:[ \t](") + FilePathWithSpaces + _T("):([0-9]+):[ \t](.*)"), 3, 1, 2)); -+ m_RegExes.Add(RegExStruct(_("Resource compiler error (2)"), cltError, _T("windres.exe:[ \t](.*)"), 1)); -+ m_RegExes.Add(RegExStruct(_("Compiler warning"), cltWarning, _T("(") + FilePathWithSpaces + _T(")\\(([0-9]+)\\):[ \t]([Ww]arning:[ \t].*)"), 3, 1, 2)); -+ m_RegExes.Add(RegExStruct(_("Compiler error"), cltError, _T("(") + FilePathWithSpaces + _T(")\\(([0-9]+)\\):[ \t](.*)"), 3, 1, 2)); -+ m_RegExes.Add(RegExStruct(_("Linker error"), cltError, _T("(") + FilePathWithSpaces + _T("):([0-9]+):[0-9]+:[ \t](.*)"), 3, 1, 2)); -+ m_RegExes.Add(RegExStruct(_("Linker error (2)"), cltError, FilePathWithSpaces + _T("\\(.text\\+[0-9A-Za-z]+\\):([ \tA-Za-z0-9_:+/\\.-]+):[ \t](.*)"), 2, 1)); -+ m_RegExes.Add(RegExStruct(_("Linker error (lib not found)"), cltError, _T(".*(ld.*):[ \t](cannot find.*)"), 2, 1)); -+ m_RegExes.Add(RegExStruct(_("Undefined reference"), cltError, _T("(") + FilePathWithSpaces + _T("):[ \t](undefined reference.*)"), 2, 1)); -+ m_RegExes.Add(RegExStruct(_("General warning"), cltWarning, _T("([Ww]arning:[ \t].*)"), 1)); -+} -+ -+AutoDetectResult CompilerLDC::AutoDetectInstallationDir() -+{ -+ wxString sep = wxFileName::GetPathSeparator(); -+ m_MasterPath = wxFileExists(_T("/usr/local/bin/ldc")) ? _T("/usr/local") : _T("/usr"); -+ -+ AddIncludeDir(m_MasterPath + sep + _T("import")); -+ AddLibDir(m_MasterPath + sep + _T("lib")); -+ -+ return wxFileExists(m_MasterPath + sep + _T("bin") + sep + m_Programs.C) ? adrDetected : adrGuessed; -+} -diff --git a/src/plugins/compilergcc/compilerLDC.h b/src/plugins/compilergcc/compilerLDC.h -new file mode 100644 -index 0000000..e540dd6 ---- /dev/null -+++ b/src/plugins/compilergcc/compilerLDC.h -@@ -0,0 +1,24 @@ -+/* -+ * 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_LDC_H -+#define COMPILER_LDC_H -+ -+#include -+ -+class CompilerLDC : public Compiler -+{ -+ public: -+ CompilerLDC(); -+ virtual ~CompilerLDC(); -+ virtual void Reset(); -+ virtual void LoadDefaultRegExArray(); -+ virtual AutoDetectResult AutoDetectInstallationDir(); -+ protected: -+ virtual Compiler* CreateCopy(); -+ private: -+}; -+ -+#endif // COMPILER_LDC_H -diff --git a/src/plugins/compilergcc/compilergcc.cpp b/src/plugins/compilergcc/compilergcc.cpp -index be44e72..1ffa63b 100644 ---- a/src/plugins/compilergcc/compilergcc.cpp -+++ b/src/plugins/compilergcc/compilergcc.cpp -@@ -67,6 +67,7 @@ - #include "compilerSDCC.h" - #include "compilerTcc.h" - #include "compilerGDC.h" -+#include "compilerLDC.h" - #include "compilerGNUPOWERPC.h" - #include "compilerGNUTRICORE.h" - -@@ -394,6 +395,7 @@ void CompilerGCC::OnAttach() - CompilerFactory::RegisterCompiler(new CompilerSDCC); - CompilerFactory::RegisterCompiler(new CompilerTcc); - CompilerFactory::RegisterCompiler(new CompilerGDC); -+ CompilerFactory::RegisterCompiler(new CompilerLDC); - CompilerFactory::RegisterCompiler(new CompilerDMD); - #if defined(__WIN32__) || defined(__linux__) - CompilerFactory::RegisterCompiler(new CompilerGNUARM); --- -1.7.2.2 - - -From 17eb9968e9d7aaa663b5fe2486c3ddfc69558f3e Mon Sep 17 00:00:00 2001 -From: afb -Date: Sat, 28 Aug 2010 13:48:25 +0000 -Subject: [PATCH 3/4] - add LDC to D console wizard - -git-svn-id: svn://svn.berlios.de/codeblocks/trunk@6555 98b59c6a-2706-0410-b7d6-d2fa1a1880c9 ---- - .../resources/common_functions.script | 7 +++++-- - .../scriptedwizard/resources/d/wizard.script | 2 +- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/scriptedwizard/resources/common_functions.script b/src/plugins/scriptedwizard/resources/common_functions.script -index 3f18fc0..c0ebd95 100644 ---- a/src/plugins/scriptedwizard/resources/common_functions.script -+++ b/src/plugins/scriptedwizard/resources/common_functions.script -@@ -31,7 +31,8 @@ function WarningsOn(base, compilerID) - base.AddCompilerOption(_T("-Wall")); - } - else if ( GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("bcc*")) -- || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("dmd")) ) -+ || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("dmd")) -+ || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("ldc")) ) - { - base.AddCompilerOption(_T("-w")); - } -@@ -68,6 +69,7 @@ function DebugSymbolsOn(base, compilerID) - || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("dmd")) - || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("gcc")) - || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("gdc")) -+ || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("ldc")) - || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("tcc")) ) - { - base.AddCompilerOption(_T("-g")); -@@ -115,7 +117,8 @@ function OptimizationsOn(base, compilerID) - || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("gcc")) - || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("tricore*")) - || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("ppc*")) -- || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("gdc")) ) -+ || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("gdc")) -+ || GetCompilerFactory().CompilerInheritsFrom(compilerID, _T("ldc")) ) - { - base.AddCompilerOption(_T("-O2")); - -diff --git a/src/plugins/scriptedwizard/resources/d/wizard.script b/src/plugins/scriptedwizard/resources/d/wizard.script -index 3eb18a9..c5deac1 100644 ---- a/src/plugins/scriptedwizard/resources/d/wizard.script -+++ b/src/plugins/scriptedwizard/resources/d/wizard.script -@@ -17,7 +17,7 @@ function BeginWizard() - // add builtin pages - Wizard.AddInfoPage(_T("DIntro"), intro_msg); // intro - Wizard.AddProjectPathPage(); // select project name and path -- Wizard.AddCompilerPage(_T(""), _T("dmd;gdc"), true, true); // select compiler and configurations -+ Wizard.AddCompilerPage(_T(""), _T("dmd;gdc;ldc"), true, true); // select compiler and configurations - // nothing more needs to be done here - } - --- -1.7.2.2 - - -From 3367d355dc95f3afb2fa43b3097879ee096e320e Mon Sep 17 00:00:00 2001 -From: afb -Date: Sat, 28 Aug 2010 13:50:09 +0000 -Subject: [PATCH 4/4] - codecompletion: add D icon for D keywords - -git-svn-id: svn://svn.berlios.de/codeblocks/trunk@6556 98b59c6a-2706-0410-b7d6-d2fa1a1880c9 ---- - src/plugins/codecompletion/codecompletion.cpp | 39 ++++++++++++++++++++++++- - 1 files changed, 38 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/codecompletion/codecompletion.cpp b/src/plugins/codecompletion/codecompletion.cpp -index 4fe676b..dda8cd2 100644 ---- a/src/plugins/codecompletion/codecompletion.cpp -+++ b/src/plugins/codecompletion/codecompletion.cpp -@@ -79,6 +79,36 @@ static const char * cpp_keyword_xpm[] = { - " ....... ", - " "}; - -+// bitmap for use as D keywords icon in code-completion list -+/* XPM */ -+static const char *d_keyword_xpm[] = { -+/* width height num_colors chars_per_pixel */ -+" 14 14 6 1", -+/* colors */ -+" c none", -+". c #fefefe", -+"# c #e43a3a", -+"a c #e40000", -+"b c #e48f8f", -+"c c #8f0000", -+/* pixels */ -+" ", -+" ", -+" .#aaaa#b. ", -+" baabb#aa# ", -+" ba# baa# ", -+" ba# bcab ", -+" ba# #a# ", -+" ba# bac ", -+" ba# ba# ", -+" ba# bc# ", -+" ba# #cb ", -+" bcc ac# ", -+" #aa###ac# ", -+" cccccc#b " -+}; -+ -+ - // bitmap for other-than-C++ keywords - // it's pretty nice actually :) - /* XPM */ -@@ -614,9 +644,16 @@ int CodeCompletion::CodeComplete() - wxString lastSearch = m_NativeParser.LastAIGlobalSearch().Lower(); - int iidx = ilist->GetImageCount(); - bool isC = ft == ftHeader || ft == ftSource; -- ed->GetControl()->RegisterImage(iidx, wxBitmap(isC ? cpp_keyword_xpm : unknown_keyword_xpm)); - // theme keywords - HighlightLanguage lang = theme->GetLanguageForFilename(_T(".")+wxFileName(ed->GetFilename()).GetExt()); -+ wxString strLang = theme->GetLanguageName(lang); -+ // if its sourcecode/header file and a known fileformat, show the corresponding icon -+ if (isC && strLang==_T("C/C++")) -+ ed->GetControl()->RegisterImage(iidx, wxBitmap(cpp_keyword_xpm)); -+ else if (isC && strLang==_T("D")) -+ ed->GetControl()->RegisterImage(iidx, wxBitmap(d_keyword_xpm)); -+ else -+ ed->GetControl()->RegisterImage(iidx, wxBitmap(unknown_keyword_xpm)); - // the first two keyword sets are the primary and secondary keywords (for most lexers at least) - // but this is now configurable in global settings - for (int i = 0; i <= wxSCI_KEYWORDSET_MAX; ++i) --- -1.7.2.2 - diff --git a/codeblocks-autorev.patch b/codeblocks-autorev.patch new file mode 100644 index 0000000..5b1cbce --- /dev/null +++ b/codeblocks-autorev.patch @@ -0,0 +1,43 @@ +From 691468b112193bd6577059a08511a529e233c386 Mon Sep 17 00:00:00 2001 +From: Dan Horak +Date: Mon, 19 Jan 2009 11:40:00 +0100 +Subject: [PATCH] use pregenerated revision.m4 + +--- + bootstrap | 9 --------- + src/Makefile.am | 2 +- + 2 files changed, 1 insertions(+), 10 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 8c08bec..e8d3312 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -6,15 +6,6 @@ + # - automake 1.7+, 1.9+ for make dist + # - libtool 1.4+ + +-# Touch revision.m4 +-if [ -f ./update_revision.sh ]; then +- ./update_revision.sh; +-elif [ ! -f ./revision.m4 ]; then +- echo "m4_define([SVN_REV], 0)" > ./revision.m4; +- echo "m4_define([SVN_REVISION], trunk-r0)" >> ./revision.m4; +- echo "m4_define([SVN_DATE], )" >> ./revision.m4; +-fi +- + # Deal with some gentoo-specific issues + WANT_AUTOMAKE='1.9 1.8 1.7' #latest of these is chosen or default if none hits + export WANT_AUTOMAKE +diff --git a/src/Makefile.am b/src/Makefile.am +index 776b136..9a661f4 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = include base build_tools mime sdk src plugins tools templates scripts wxsmith ++SUBDIRS = include base mime sdk src plugins tools templates scripts wxsmith + + dist_pkgdata_DATA = tips.txt + +-- +1.7.4.4 + diff --git a/codeblocks-dso.patch b/codeblocks-dso.patch deleted file mode 100644 index ca3c660..0000000 --- a/codeblocks-dso.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/plugins/contrib/codesnippets/Makefile.am b/src/plugins/contrib/codesnippets/Makefile.am -index 220912a..3da33a8 100644 ---- a/src/plugins/contrib/codesnippets/Makefile.am -+++ b/src/plugins/contrib/codesnippets/Makefile.am -@@ -13,7 +13,7 @@ pluginlibdir = $(pkglibdir)/plugins - - pluginlib_LTLIBRARIES = libcodesnippets.la - --libcodesnippets_la_LDFLAGS = $(WX_GTK2_LIBS) -module -version-info 0:1:0 -shared -no-undefined -avoid-version -+libcodesnippets_la_LDFLAGS = $(WX_GTK2_LIBS) -lX11 -module -version-info 0:1:0 -shared -no-undefined -avoid-version - - libcodesnippets_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la - -diff --git a/src/plugins/contrib/codesnippets/resources/Makefile.am b/src/plugins/contrib/codesnippets/resources/Makefile.am -index a83a6bb..3710602 100644 ---- a/src/plugins/contrib/codesnippets/resources/Makefile.am -+++ b/src/plugins/contrib/codesnippets/resources/Makefile.am -@@ -18,7 +18,7 @@ codesnippets_LDFLAGS = $(WX_GTK2_LIBS) - ##codesnippets_LDADD = $(PLUGIN_WX_LIBS) ../../../../sdk/libcodeblocks.la - codesnippets_LDADD = -ltinyxml \ - -L../../../../sdk ../../../../sdk/libcodeblocks.la \ -- $(PLUGIN_WX_LIBS) $(WX_LIBS) -+ $(PLUGIN_WX_LIBS) $(WX_LIBS) -lX11 - - if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml diff --git a/codeblocks-gcc47.patch b/codeblocks-gcc47.patch deleted file mode 100644 index f85f650..0000000 --- a/codeblocks-gcc47.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/defs.h.gcc47 codeblocks-10.05-release/src/plugins/contrib/help_plugin/defs.h ---- codeblocks-10.05-release/src/plugins/contrib/help_plugin/defs.h.gcc47 2010-05-22 12:29:35.000000000 +0200 -+++ codeblocks-10.05-release/src/plugins/contrib/help_plugin/defs.h 2012-05-22 08:39:51.319145391 +0200 -@@ -289,7 +289,7 @@ class QMap : public std::map - - if (i.second == false && overwrite) - { -- find(k)->second = t; -+ this->find(k)->second = t; - } - - return i.first; -@@ -297,7 +297,7 @@ class QMap : public std::map - - int remove(const Key &k) - { -- return erase(k); -+ return this->erase(k); - } - }; - -diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/man2html.cpp.gcc47 codeblocks-10.05-release/src/plugins/contrib/help_plugin/man2html.cpp ---- codeblocks-10.05-release/src/plugins/contrib/help_plugin/man2html.cpp.gcc47 2010-05-22 12:29:35.000000000 +0200 -+++ codeblocks-10.05-release/src/plugins/contrib/help_plugin/man2html.cpp 2012-05-22 08:43:06.370504504 +0200 -@@ -123,7 +123,7 @@ - - #include - --//#include -+#include - #include - - #include diff --git a/codeblocks-squirrel.patch b/codeblocks-squirrel.patch index faae6a0..74e9ecf 100644 --- a/codeblocks-squirrel.patch +++ b/codeblocks-squirrel.patch @@ -1,7 +1,17 @@ -diff -up codeblocks-10.05-release/configure.in.squirrel codeblocks-10.05-release/configure.in ---- codeblocks-10.05-release/configure.in.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/configure.in 2012-01-15 11:01:47.000000000 +0100 -@@ -62,11 +62,19 @@ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML +From 780fd5112ef72573c0075ef7ab12d63fad9cbbb9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 17:35:30 +0100 +Subject: [PATCH 1/6] add check for squirrel to configure.in + +--- + configure.in | 10 +++++++++- + 1 files changed, 9 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 50097b2..bbe7b32 100644 +--- a/configure.in ++++ b/configure.in +@@ -64,11 +64,19 @@ AC_CHECK_HEADER(tinyxml.h, [HAVE_TINYXML=yes], [HAVE_TINYXML=no]) CC=$save_CC CPP=$save_CPP @@ -22,9 +32,49 @@ diff -up codeblocks-10.05-release/configure.in.squirrel codeblocks-10.05-release dnl versioning info for libtool dnl Note this is the ABI version which is not the same as our actual library version CODEBLOCKS_CURRENT=0 -diff -up codeblocks-10.05-release/src/include/Makefile.am.squirrel codeblocks-10.05-release/src/include/Makefile.am ---- codeblocks-10.05-release/src/include/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/include/Makefile.am 2012-01-15 11:01:47.000000000 +0100 +-- +1.7.7.6 + + +From e8f27ca532788640482fc416f34b2420bcaf7860 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:28:16 +0100 +Subject: [PATCH 2/6] disable unicode for squirrel + +--- + src/include/scripting/sqplus/sqplus.h | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/include/scripting/sqplus/sqplus.h b/src/include/scripting/sqplus/sqplus.h +index c114ccc..a0df415 100644 +--- a/src/include/scripting/sqplus/sqplus.h ++++ b/src/include/scripting/sqplus/sqplus.h +@@ -47,6 +47,7 @@ + #define SQ_CALL_RAISE_ERROR SQFalse + #endif + ++#undef _UNICODE + #include "squirrel.h" + + // C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types +-- +1.7.7.6 + + +From 5f2ad259400f0acdd9e20e246cde9a3574bacd77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:33:13 +0100 +Subject: [PATCH 3/6] convert includes to system squirrel + +--- + src/include/Makefile.am | 7 ++++++- + src/include/scripting/Makefile.am | 5 ++++- + 2 files changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/include/Makefile.am b/src/include/Makefile.am +index 4783386..1dd5411 100644 +--- a/src/include/Makefile.am ++++ b/src/include/Makefile.am @@ -10,7 +10,6 @@ endif INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ @@ -46,29 +96,202 @@ diff -up codeblocks-10.05-release/src/include/Makefile.am.squirrel codeblocks-10 # Because we are not generating any programs/libraries with this makefile, # $(CXXCOMPILE) is empty. # Create the basic one here: -diff -up codeblocks-10.05-release/src/include/scripting/Makefile.am.squirrel codeblocks-10.05-release/src/include/scripting/Makefile.am ---- codeblocks-10.05-release/src/include/scripting/Makefile.am.squirrel 2010-05-22 12:32:39.000000000 +0200 -+++ codeblocks-10.05-release/src/include/scripting/Makefile.am 2012-01-15 11:01:47.000000000 +0100 +diff --git a/src/include/scripting/Makefile.am b/src/include/scripting/Makefile.am +index 39ea807..36adf08 100644 +--- a/src/include/scripting/Makefile.am ++++ b/src/include/scripting/Makefile.am @@ -1 +1,4 @@ -SUBDIRS = squirrel sqstdlib sqplus bindings include +SUBDIRS = sqplus bindings +if ! HAVE_SQUIRREL +SUBDIRS += squirrel sqstdlib include +endif -diff -up codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h.squirrel codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h ---- codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h.squirrel 2010-05-22 12:32:39.000000000 +0200 -+++ codeblocks-10.05-release/src/include/scripting/sqplus/sqplus.h 2012-01-15 11:01:47.000000000 +0100 -@@ -47,6 +47,7 @@ - #define SQ_CALL_RAISE_ERROR SQFalse - #endif +-- +1.7.7.6 + + +From 4d5570557c4ba8a936b3edcb5876b63d9324b3f4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:34:17 +0100 +Subject: [PATCH 4/6] convert sdk to system squirrel + +--- + src/sdk/Makefile.am | 11 ++++++++--- + src/sdk/scripting/Makefile.am | 6 +++++- + src/sdk/scripting/bindings/Makefile.am | 8 +++++++- + src/sdk/scripting/sqplus/Makefile.am | 9 +++++++-- + 4 files changed, 27 insertions(+), 7 deletions(-) + +diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am +index eefb3d8..4bc90ec 100644 +--- a/src/sdk/Makefile.am ++++ b/src/sdk/Makefile.am +@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/mozilla_chardet +@@ -16,8 +15,6 @@ libcodeblocks_la_LDFLAGS = -version-info @CODEBLOCKS_VERSION_INFO@ + libcodeblocks_la_LIBADD = $(WX_LIBS) \ + scripting/bindings/libsqbindings.la \ + scripting/sqplus/libsqplus.la \ +- scripting/sqstdlib/libsqstdlib.la \ +- scripting/squirrel/libsquirrel.la \ + wxscintilla/libwxscintilla.la \ + $(WXPROPGRID_LIB) -+#undef _UNICODE - #include "squirrel.h" +@@ -28,6 +25,14 @@ else + libcodeblocks_la_LIBADD += -ltinyxml + endif - // C::B patch: so it builds on 64bit, ecapsulate bool/int/float using Squirrel types -diff -up codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am ---- codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am 2012-01-15 11:02:00.000000000 +0100 ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la ++endif ++ + libcodeblocks_la_SOURCES = annoyingdialog.cpp \ + autodetectcompilers.cpp \ + base64.cpp \ +diff --git a/src/sdk/scripting/Makefile.am b/src/sdk/scripting/Makefile.am +index f2bff06..f1a5d1c 100644 +--- a/src/sdk/scripting/Makefile.am ++++ b/src/sdk/scripting/Makefile.am +@@ -1 +1,5 @@ +-SUBDIRS = squirrel sqstdlib sqplus bindings ++SUBDIRS = sqplus bindings ++if ! HAVE_SQUIRREL ++SUBDIRS += squirrel sqstdlib ++endif ++ +diff --git a/src/sdk/scripting/bindings/Makefile.am b/src/sdk/scripting/bindings/Makefile.am +index ecf1fc8..0e632d5 100644 +--- a/src/sdk/scripting/bindings/Makefile.am ++++ b/src/sdk/scripting/bindings/Makefile.am +@@ -1,10 +1,16 @@ + INCLUDES = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/include/scripting/sqplus + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ ++ + noinst_LTLIBRARIES = libsqbindings.la + + libsqbindings_la_SOURCES = scriptbindings.cpp \ +diff --git a/src/sdk/scripting/sqplus/Makefile.am b/src/sdk/scripting/sqplus/Makefile.am +index deb87f3..fbf351b 100644 +--- a/src/sdk/scripting/sqplus/Makefile.am ++++ b/src/sdk/scripting/sqplus/Makefile.am +@@ -1,5 +1,10 @@ +-INCLUDES = -I$(top_srcdir)/src/include/scripting/include \ +- -I$(top_srcdir)/src/include/scripting/sqplus ++if HAVE_SQUIRREL ++INCLUDES = $(SQUIRREL_CFLAGS) ++else ++INCLUDES = -I$(top_srcdir)/src/include/scripting/include ++endif ++ ++INCLUDES += -I$(top_srcdir)/src/include/scripting/sqplus + + noinst_LTLIBRARIES = libsqplus.la + +-- +1.7.7.6 + + +From 94bfad10d512a0314f28a9db5b03ab3a189daaad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:34:53 +0100 +Subject: [PATCH 5/6] convert main to system squirrel + +--- + src/src/Makefile.am | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/src/src/Makefile.am b/src/src/Makefile.am +index f1f79fb..02bcfcb 100644 +--- a/src/src/Makefile.am ++++ b/src/src/Makefile.am +@@ -4,7 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ + -I$(top_srcdir)/src/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/mozilla_chardet + +@@ -12,6 +11,13 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ ++ + if GTK_NOTEBOOK + GTK_NOTEBOOK_FLAGS = -DUSE_GTK_NOTEBOOK + endif +-- +1.7.7.6 + + +From 796368d5adfe62f8c96fa8bc93ddab458a692304 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20Hor=C3=A1k?= +Date: Sat, 14 Jan 2012 23:35:32 +0100 +Subject: [PATCH 6/6] convert plugins to system squirrel + +--- + src/plugins/abbreviations/Makefile.am | 6 +++++- + src/plugins/compilergcc/Makefile.am | 7 ++++++- + src/plugins/contrib/envvars/Makefile.am | 7 ++++++- + src/plugins/contrib/help_plugin/Makefile.am | 10 +++++++++- + src/plugins/contrib/lib_finder/Makefile.am | 8 ++++++-- + src/plugins/contrib/wxSmith/Makefile.am | 8 ++++++-- + src/plugins/contrib/wxSmith/wxwidgets/Makefile.am | 8 ++++++-- + src/plugins/debuggergdb/Makefile.am | 7 ++++++- + src/plugins/scriptedwizard/Makefile.am | 7 ++++++- + 9 files changed, 56 insertions(+), 12 deletions(-) + +diff --git a/src/plugins/abbreviations/Makefile.am b/src/plugins/abbreviations/Makefile.am +index 0cc25a0..dcf7605 100644 +--- a/src/plugins/abbreviations/Makefile.am ++++ b/src/plugins/abbreviations/Makefile.am +@@ -3,10 +3,14 @@ SUBDIRS = resources + INCLUDES = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/sdk/wxscintilla/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/scripting/bindings + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif + + pluginlibdir = $(pkglibdir)/plugins + +diff --git a/src/plugins/compilergcc/Makefile.am b/src/plugins/compilergcc/Makefile.am +index 470a04a..8c80ce9 100644 +--- a/src/plugins/compilergcc/Makefile.am ++++ b/src/plugins/compilergcc/Makefile.am @@ -3,10 +3,15 @@ SUBDIRS = depslib resources INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ @@ -86,9 +309,34 @@ diff -up codeblocks-10.05-release/src/plugins/compilergcc/Makefile.am.squirrel c AM_CXXFLAGS = -DDEPSLIB_UNIX pluginlibdir = $(pkglibdir)/plugins -diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am ---- codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am 2012-01-15 11:02:00.000000000 +0100 +diff --git a/src/plugins/contrib/envvars/Makefile.am b/src/plugins/contrib/envvars/Makefile.am +index 854498d..f419c87 100644 +--- a/src/plugins/contrib/envvars/Makefile.am ++++ b/src/plugins/contrib/envvars/Makefile.am +@@ -1,6 +1,5 @@ + INCLUDES = $(WX_CXXFLAGS) \ + -I$(top_srcdir)/src/include \ +- -I$(top_srcdir)/src/include/scripting/include \ + -I$(top_srcdir)/src/include/scripting/sqplus \ + -I$(top_srcdir)/src/include/scripting/bindings \ + -I$(top_srcdir)/src/sdk/wxscintilla/include +@@ -9,6 +8,12 @@ if ! HAVE_TINYXML + INCLUDES += -I$(top_srcdir)/src/include/tinyxml + endif + ++if HAVE_SQUIRREL ++INCLUDES += $(SQUIRREL_CFLAGS) ++else ++INCLUDES += -I$(top_srcdir)/src/include/scripting/include ++endif ++ + pluginlibdir = $(pkglibdir)/plugins + pkgdata_DATA = envvars.zip + +diff --git a/src/plugins/contrib/help_plugin/Makefile.am b/src/plugins/contrib/help_plugin/Makefile.am +index 1fbb566..96def6f 100644 +--- a/src/plugins/contrib/help_plugin/Makefile.am ++++ b/src/plugins/contrib/help_plugin/Makefile.am @@ -10,7 +10,6 @@ endif INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ @@ -97,18 +345,7 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.sq -I$(top_srcdir)/src/include/scripting/bindings \ -I$(top_srcdir)/src/include/scripting/sqplus -@@ -23,9 +22,7 @@ libhelp_plugin_la_LDFLAGS = -module -ver - libhelp_plugin_la_LIBADD = $(PLUGIN_WX_LIBS) \ - ../../../sdk/libcodeblocks.la \ - ../../../sdk/scripting/bindings/libsqbindings.la \ -- ../../../sdk/scripting/sqplus/libsqplus.la \ -- ../../../sdk/scripting/sqstdlib/libsqstdlib.la \ -- ../../../sdk/scripting/squirrel/libsquirrel.la -+ ../../../sdk/scripting/sqplus/libsqplus.la - - if ! HAVE_BZIP2 - libhelp_plugin_la_LIBADD += bzip2/libbzip2.la -@@ -44,6 +41,15 @@ if ! HAVE_TINYXML +@@ -40,6 +39,15 @@ if ! HAVE_TINYXML INCLUDES += -I$(top_srcdir)/src/include/tinyxml endif @@ -124,13 +361,14 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/help_plugin/Makefile.am.sq libhelp_plugin_la_SOURCES = help_common.cpp \ HelpConfigDialog.cpp \ help_plugin.cpp \ -diff -up codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am ---- codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am 2012-01-15 11:02:00.000000000 +0100 +diff --git a/src/plugins/contrib/lib_finder/Makefile.am b/src/plugins/contrib/lib_finder/Makefile.am +index 3422f9f..e5de339 100644 +--- a/src/plugins/contrib/lib_finder/Makefile.am ++++ b/src/plugins/contrib/lib_finder/Makefile.am @@ -4,9 +4,7 @@ INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/sdk/wxscintilla/include \ - -I$(srcdir)/../wxSmithContribItems/wxflatnotebook/wxFlatNotebook/include \ + -I$(srcdir)/../wxContribItems/wxFlatNotebook/include \ - -I$(top_srcdir)/src/include/scripting/include \ -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/scripting/squirrel \ @@ -150,19 +388,20 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/lib_finder/Makefile.am.squ pluginlibdir = $(pkglibdir)/plugins pluginlib_LTLIBRARIES = liblib_finder.la -diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am ---- codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am 2012-01-15 11:07:13.000000000 +0100 -@@ -5,8 +5,6 @@ AM_CPPFLAGS = -DWXMAKINGLIB_PROPGRID - INCLUDES = $(WX_CXXFLAGS) \ +diff --git a/src/plugins/contrib/wxSmith/Makefile.am b/src/plugins/contrib/wxSmith/Makefile.am +index 2227929..dbfafc6 100644 +--- a/src/plugins/contrib/wxSmith/Makefile.am ++++ b/src/plugins/contrib/wxSmith/Makefile.am +@@ -4,8 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ - -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/squirrel \ -I$(top_srcdir)/src/include/scripting/sqplus \ -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include \ -@@ -16,6 +14,12 @@ if ! HAVE_TINYXML + -I$(top_srcdir)/src/include/mozilla_chardet +@@ -14,6 +12,12 @@ if ! HAVE_TINYXML INCLUDES += -I$(top_srcdir)/src/include/tinyxml endif @@ -175,19 +414,20 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/Makefile.am.squirr lib_LTLIBRARIES = libwxsmithlib.la libwxsmithlib_la_LDFLAGS = -version-info 0:1:0 -shared -diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am ---- codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am 2012-01-15 11:07:28.000000000 +0100 -@@ -5,8 +5,6 @@ AM_CPPFLAGS = -DWXMAKINGLIB_PROPGRID - INCLUDES = $(WX_CXXFLAGS) \ +diff --git a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +index abbc6a1..331bf10 100644 +--- a/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am ++++ b/src/plugins/contrib/wxSmith/wxwidgets/Makefile.am +@@ -4,8 +4,6 @@ INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/sdk/wxscintilla/include \ + $(WXPROPGRID_INCLUDE) \ - -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/squirrel \ -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/plugins/contrib/wxSmith/propgrid/contrib/include -@@ -15,6 +13,12 @@ if ! HAVE_TINYXML + -I$(top_srcdir)/src/include/scripting/bindings + +@@ -13,6 +11,12 @@ if ! HAVE_TINYXML INCLUDES += -I$(top_srcdir)/src/include/tinyxml endif @@ -200,11 +440,12 @@ diff -up codeblocks-10.05-release/src/plugins/contrib/wxSmith/wxwidgets/Makefile noinst_LTLIBRARIES = libwxsmith_wxwidgets.la libwxsmith_wxwidgets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -diff -up codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am ---- codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel 2010-05-22 12:30:49.000000000 +0200 -+++ codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am 2012-01-15 11:05:13.000000000 +0100 -@@ -4,9 +4,14 @@ INCLUDES = $(WX_CXXFLAGS) \ - $(WX_GTK2_CFLAGS) \ +diff --git a/src/plugins/debuggergdb/Makefile.am b/src/plugins/debuggergdb/Makefile.am +index e0517f2..38cf567 100644 +--- a/src/plugins/debuggergdb/Makefile.am ++++ b/src/plugins/debuggergdb/Makefile.am +@@ -3,9 +3,14 @@ SUBDIRS = resources + INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ -I$(top_srcdir)/src/sdk/wxscintilla/include \ - -I$(top_srcdir)/src/include/scripting/include \ @@ -219,9 +460,10 @@ diff -up codeblocks-10.05-release/src/plugins/debuggergdb/Makefile.am.squirrel c pluginlibdir = $(pkglibdir)/plugins pluginlib_LTLIBRARIES = libdebugger.la -diff -up codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirrel codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am ---- codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am 2012-01-15 11:02:00.000000000 +0100 +diff --git a/src/plugins/scriptedwizard/Makefile.am b/src/plugins/scriptedwizard/Makefile.am +index 5ef7f7a..432ce18 100644 +--- a/src/plugins/scriptedwizard/Makefile.am ++++ b/src/plugins/scriptedwizard/Makefile.am @@ -3,13 +3,18 @@ SUBDIRS = resources INCLUDES = $(WX_CXXFLAGS) \ -I$(top_srcdir)/src/include \ @@ -242,128 +484,6 @@ diff -up codeblocks-10.05-release/src/plugins/scriptedwizard/Makefile.am.squirre pluginlibdir = $(pkglibdir)/plugins pluginlib_LTLIBRARIES = libscriptedwizard.la -diff -up codeblocks-10.05-release/src/sdk/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/Makefile.am ---- codeblocks-10.05-release/src/sdk/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/sdk/Makefile.am 2012-01-15 11:03:23.000000000 +0100 -@@ -3,7 +3,7 @@ SUBDIRS = scripting wxscintilla resource - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ -+ -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/mozilla_chardet - -@@ -14,8 +14,6 @@ libcodeblocks_la_LDFLAGS = -version-info - libcodeblocks_la_LIBADD = $(WX_LIBS) \ - scripting/bindings/libsqbindings.la \ - scripting/sqplus/libsqplus.la \ -- scripting/sqstdlib/libsqstdlib.la \ -- scripting/squirrel/libsquirrel.la \ - wxscintilla/libwxscintilla.la - - if ! HAVE_TINYXML -@@ -25,6 +23,14 @@ else - libcodeblocks_la_LIBADD += -ltinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+libcodeblocks_la_LIBADD += $(SQUIRREL_LIBS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+libcodeblocks_la_LIBADD += scripting/squirrel/libsquirrel.la scripting/sqstdlib/libsqstdlib.la -+endif -+ - libcodeblocks_la_SOURCES = annoyingdialog.cpp \ - autodetectcompilers.cpp \ - base64.cpp \ -diff -up codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am ---- codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am.squirrel 2010-05-22 12:02:34.000000000 +0200 -+++ codeblocks-10.05-release/src/sdk/scripting/bindings/Makefile.am 2012-01-15 11:01:47.000000000 +0100 -@@ -1,10 +1,16 @@ - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/include \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/bindings \ - -I$(top_srcdir)/src/include/scripting/sqplus - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ -+ - noinst_LTLIBRARIES = libsqbindings.la - - libsqbindings_la_SOURCES = scriptbindings.cpp \ -diff -up codeblocks-10.05-release/src/sdk/scripting/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/Makefile.am ---- codeblocks-10.05-release/src/sdk/scripting/Makefile.am.squirrel 2010-05-22 12:02:34.000000000 +0200 -+++ codeblocks-10.05-release/src/sdk/scripting/Makefile.am 2012-01-15 11:01:47.000000000 +0100 -@@ -1 +1,5 @@ --SUBDIRS = squirrel sqstdlib sqplus bindings -+SUBDIRS = sqplus bindings -+if ! HAVE_SQUIRREL -+SUBDIRS += squirrel sqstdlib -+endif -+ -diff -up codeblocks-10.05-release/src/sdk/scriptingmanager.cpp.squirrel codeblocks-10.05-release/src/sdk/scriptingmanager.cpp ---- codeblocks-10.05-release/src/sdk/scriptingmanager.cpp.squirrel 2010-05-22 12:10:05.000000000 +0200 -+++ codeblocks-10.05-release/src/sdk/scriptingmanager.cpp 2012-01-15 11:01:47.000000000 +0100 -@@ -29,10 +29,10 @@ - #include "crc32.h" - #include "menuitemsmanager.h" - #include "genericmultilinenotesdlg.h" --#include "scripting/sqplus/sqplus.h" --#include "scripting/bindings/scriptbindings.h" --#include "scripting/bindings/sc_plugin.h" --#include "scripting/include/sqstdstring.h" -+#include "sqplus.h" -+#include "scriptbindings.h" -+#include "sc_plugin.h" -+#include "sqstdstring.h" - - template<> ScriptingManager* Mgr::instance = 0; - template<> bool Mgr::isShutdown = false; -diff -up codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am.squirrel codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am ---- codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am.squirrel 2010-05-22 12:02:20.000000000 +0200 -+++ codeblocks-10.05-release/src/sdk/scripting/sqplus/Makefile.am 2012-01-15 11:01:47.000000000 +0100 -@@ -1,5 +1,10 @@ --INCLUDES = -I$(top_srcdir)/src/include/scripting/include \ -- -I$(top_srcdir)/src/include/scripting/sqplus -+if HAVE_SQUIRREL -+INCLUDES = $(SQUIRREL_CFLAGS) -+else -+INCLUDES = -I$(top_srcdir)/src/include/scripting/include -+endif -+ -+INCLUDES += -I$(top_srcdir)/src/include/scripting/sqplus - - noinst_LTLIBRARIES = libsqplus.la - -diff -up codeblocks-10.05-release/src/src/Makefile.am.squirrel codeblocks-10.05-release/src/src/Makefile.am ---- codeblocks-10.05-release/src/src/Makefile.am.squirrel 2012-01-15 11:01:47.000000000 +0100 -+++ codeblocks-10.05-release/src/src/Makefile.am 2012-01-15 11:04:29.000000000 +0100 -@@ -3,7 +3,6 @@ SUBDIRS = resources - INCLUDES = $(WX_CXXFLAGS) \ - -I$(top_srcdir)/src/sdk/wxscintilla/include \ - -I$(top_srcdir)/src/include \ -- -I$(top_srcdir)/src/include/scripting/include \ - -I$(top_srcdir)/src/include/scripting/sqplus \ - -I$(top_srcdir)/src/include/mozilla_chardet - -@@ -11,6 +10,12 @@ if ! HAVE_TINYXML - INCLUDES += -I$(top_srcdir)/src/include/tinyxml - endif - -+if HAVE_SQUIRREL -+INCLUDES += $(SQUIRREL_CFLAGS) -+else -+INCLUDES += -I$(top_srcdir)/src/include/scripting/include -+endif -+ - if CODEBLOCKS_LINUX - AM_CPPFLAGS = -DENABLE_BINRELOC -DAPP_PREFIX="\"@prefix@\"" - endif +-- +1.7.7.6 + diff --git a/codeblocks-tinyxml-26.patch b/codeblocks-tinyxml-26.patch deleted file mode 100644 index 8f86903..0000000 --- a/codeblocks-tinyxml-26.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 3d54ab8b5326e4b29167f45c98908fcd1e4325f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Sat, 22 May 2010 16:40:54 +0200 -Subject: [PATCH 23/23] update for tinyxml 2.6 - ---- - src/tools/cb_share_config/mainframe.cpp | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/tools/cb_share_config/mainframe.cpp b/src/tools/cb_share_config/mainframe.cpp -index f43b15c..9e3225c 100644 ---- a/src/tools/cb_share_config/mainframe.cpp -+++ b/src/tools/cb_share_config/mainframe.cpp -@@ -505,7 +505,7 @@ void MainFrame::OfferConfig(TiXmlDocument* config, wxListBox* listbox, - TiXmlNode* child = NULL; - for (child = cfgroot->FirstChild(); child; child = child->NextSibling()) - { -- if (child->Type()==TiXmlNode::ELEMENT) -+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT) - { - OfferNode(&child, listbox, nodes); - } -@@ -524,7 +524,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox, - TiXmlNode* child = NULL; - for (child = (*node)->FirstChild(); child; child = child->NextSibling()) - { -- if (child->Type()==TiXmlNode::ELEMENT) -+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT) - OfferNode(&child, listbox, nodes, wxT("")); // recursive call - } - } -@@ -553,7 +553,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox, - TiXmlNode* child = NULL; - for (child = (*node)->FirstChild(); child; child = child->NextSibling()) - { -- if (child->Type()==TiXmlNode::ELEMENT) -+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT) - OfferNode(&child, listbox, nodes, wxT("")); // recursive call - } - } -@@ -562,7 +562,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox, - TiXmlNode* child = NULL; - for (child = (*node)->FirstChild(); child; child = child->NextSibling()) - { -- if (child->Type()==TiXmlNode::ELEMENT) -+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT) - OfferNode(&child, listbox, nodes, wxT("")); // recursive call - } - } -@@ -571,7 +571,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox, - TiXmlNode* child = NULL; - for (child = (*node)->FirstChild(); child; child = child->NextSibling()) - { -- if (child->Type()==TiXmlNode::ELEMENT) -+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT) - OfferNode(&child, listbox, nodes, wxT("")); // recursive call - } - } -@@ -595,7 +595,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox, - TiXmlNode* child = NULL; - for (child = (*node)->FirstChild(); child; child = child->NextSibling()) - { -- if (child->Type()==TiXmlNode::ELEMENT) -+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT) - OfferNode(&child, listbox, nodes, wxT("")); // recursive call - } - } -@@ -605,7 +605,7 @@ void MainFrame::OfferNode(TiXmlNode** node, wxListBox* listbox, - TiXmlNode* child = NULL; - for (child = (*node)->FirstChild(); child; child = child->NextSibling()) - { -- if (child->Type()==TiXmlNode::ELEMENT) -+ if (child->Type()==TiXmlNode::TINYXML_ELEMENT) - OfferNode(&child, listbox, nodes, wxT("")); // recursive call - } - } --- -1.6.6.1 - diff --git a/codeblocks-tinyxml.patch b/codeblocks-tinyxml.patch index 82ed0e8..1201082 100644 --- a/codeblocks-tinyxml.patch +++ b/codeblocks-tinyxml.patch @@ -1,17 +1,17 @@ -From 91086f2ba50998b9ec286dad6420194806868ab9 Mon Sep 17 00:00:00 2001 +From 2e4212dcfa48ec2f8102eb90e65289517e123902 Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Wed, 13 May 2009 10:21:19 +0200 -Subject: [PATCH 01/22] add check for tinyxml into configure +Subject: [PATCH 01/29] add check for tinyxml into configure --- configure.in | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in -index 17362a0..91f69bc 100644 +index d87be4e..50097b2 100644 --- a/configure.in +++ b/configure.in -@@ -54,9 +54,18 @@ AC_SEARCH_LIBS(gzopen, z, [HAVE_ZLIB=yes], [HAVE_ZLIB=no]) +@@ -56,9 +56,18 @@ AC_SEARCH_LIBS(gzopen, z, [HAVE_ZLIB=yes], [HAVE_ZLIB=no]) LIBS=$save_LIBS AC_SEARCH_LIBS(BZ2_bzopen, bz2, [HAVE_BZIP2=yes], [HAVE_BZIP2=no]) LIBS=$save_LIBS @@ -31,12 +31,13 @@ index 17362a0..91f69bc 100644 dnl versioning info for libtool dnl Note this is the ABI version which is not the same as our actual library version -- -1.6.6.1 +1.7.7.6 -From 3816818f35986a545163228079358adefe62d8ec Mon Sep 17 00:00:00 2001 + +From 9c0c4e8074095be021698e17edec24f8b0ee5f63 Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Wed, 13 May 2009 16:53:29 +0200 -Subject: [PATCH 02/22] move tinywxuni.h header from tinyxml into sdk +Subject: [PATCH 02/29] move tinywxuni.h header from tinyxml into sdk --- src/include/Makefile.am | 1 + @@ -59,10 +60,10 @@ Subject: [PATCH 02/22] move tinywxuni.h header from tinyxml into sdk delete mode 100644 src/include/tinyxml/tinywxuni.h diff --git a/src/include/Makefile.am b/src/include/Makefile.am -index 07658aa..9f754da 100644 +index f093bf9..d510a22 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am -@@ -121,6 +121,7 @@ ALLHEADERS = annoyingdialog.h \ +@@ -124,6 +124,7 @@ ALLHEADERS = annoyingdialog.h \ selecttargetdlg.h \ settings.h \ templatemanager.h \ @@ -72,7 +73,7 @@ index 07658aa..9f754da 100644 virtualbuildtargetsdlg.h \ diff --git a/src/include/tinywxuni.h b/src/include/tinywxuni.h new file mode 100644 -index 0000000..9ebf3a5 +index 0000000..b9433cc --- /dev/null +++ b/src/include/tinywxuni.h @@ -0,0 +1,15 @@ @@ -84,7 +85,7 @@ index 0000000..9ebf3a5 + +namespace TinyXML +{ -+ bool LoadDocument(const wxString& filename, TiXmlDocument *doc); ++ bool LoadDocument(const wxString& filename, TiXmlDocument *doc); + TiXmlDocument* LoadDocument(const wxString& filename); + + bool SaveDocument(const wxString& filename, TiXmlDocument* doc); @@ -102,7 +103,7 @@ index fdfa2c5..c22e938 100644 +sdk_HEADERS = tinystr.h tinyxml.h diff --git a/src/include/tinyxml/tinywxuni.h b/src/include/tinyxml/tinywxuni.h deleted file mode 100644 -index 9ebf3a5..0000000 +index b9433cc..0000000 --- a/src/include/tinyxml/tinywxuni.h +++ /dev/null @@ -1,15 +0,0 @@ @@ -114,7 +115,7 @@ index 9ebf3a5..0000000 - -namespace TinyXML -{ -- bool LoadDocument(const wxString& filename, TiXmlDocument *doc); +- bool LoadDocument(const wxString& filename, TiXmlDocument *doc); - TiXmlDocument* LoadDocument(const wxString& filename); - - bool SaveDocument(const wxString& filename, TiXmlDocument* doc); @@ -122,20 +123,20 @@ index 9ebf3a5..0000000 - -#endif diff --git a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp -index 7eeb514..30f38d4 100644 +index c6358a4..271ba52 100644 --- a/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp +++ b/src/plugins/contrib/BrowseTracker/BrowseTrackerLayout.cpp @@ -47,7 +47,7 @@ - - #include - #include "tinyxml/tinyxml.h" --#include "tinyxml/tinywxuni.h" -+#include "tinywxuni.h" - - #include "BrowseTrackerLayout.h" - #include "BrowseMarks.h" + + #include + #include "tinyxml/tinyxml.h" +-#include "tinyxml/tinywxuni.h" ++#include "tinywxuni.h" + + #include "BrowseTrackerLayout.h" + #include "BrowseMarks.h" diff --git a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp -index db01cf2..b61adf8 100644 +index 886bbb7..a58776f 100644 --- a/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp +++ b/src/plugins/contrib/lib_finder/librarydetectionmanager.cpp @@ -22,7 +22,7 @@ @@ -161,7 +162,7 @@ index b03ceaa..8c2ca85 100644 // TODO: This is same as in wxsproject.h, make one set instead of two namespace diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp -index 77b4e69..d241a5c 100644 +index bd87a9b..51a6cb1 100644 --- a/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp +++ b/src/plugins/contrib/wxSmith/wxwidgets/wxsitemresdata.cpp @@ -31,7 +31,7 @@ @@ -174,7 +175,7 @@ index 77b4e69..d241a5c 100644 #if defined(__WXMSW__) && defined(LoadImage) // Fix Windows winuser.h Header define of LoadImage. diff --git a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp -index 9517cf3..24d5479 100644 +index 065dadf..5525ec8b 100644 --- a/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp +++ b/src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsresfactory.cpp @@ -31,7 +31,7 @@ @@ -187,7 +188,7 @@ index 9517cf3..24d5479 100644 #include diff --git a/src/sdk/configmanager.cpp b/src/sdk/configmanager.cpp -index 2fc8726..c893274 100644 +index ff5b265..77393d3 100644 --- a/src/sdk/configmanager.cpp +++ b/src/sdk/configmanager.cpp @@ -43,7 +43,7 @@ @@ -200,12 +201,12 @@ index 2fc8726..c893274 100644 template<> CfgMgrBldr* Mgr::instance = 0; diff --git a/src/sdk/globals.cpp b/src/sdk/globals.cpp -index 15da26b..cceb1e9 100644 +index 384d6e8..36b797d 100644 --- a/src/sdk/globals.cpp +++ b/src/sdk/globals.cpp -@@ -32,7 +32,7 @@ - #include +@@ -38,7 +38,7 @@ #include + #include "filefilters.h" -#include "tinyxml/tinywxuni.h" +#include "tinywxuni.h" @@ -213,7 +214,7 @@ index 15da26b..cceb1e9 100644 #ifndef __WXMSW__ diff --git a/src/sdk/projectlayoutloader.cpp b/src/sdk/projectlayoutloader.cpp -index 9cb870a..472b053 100644 +index 80f06cb..74a9612 100644 --- a/src/sdk/projectlayoutloader.cpp +++ b/src/sdk/projectlayoutloader.cpp @@ -23,7 +23,7 @@ @@ -226,23 +227,23 @@ index 9cb870a..472b053 100644 ProjectLayoutLoader::ProjectLayoutLoader(cbProject* project) : m_pProject(project), diff --git a/src/sdk/projectloader.cpp b/src/sdk/projectloader.cpp -index bf89f25..aa4f54f 100644 +index 2b70928..162291d 100644 --- a/src/sdk/projectloader.cpp +++ b/src/sdk/projectloader.cpp -@@ -31,7 +31,7 @@ +@@ -35,7 +35,7 @@ #include "projectloader_hooks.h" #include "annoyingdialog.h" #include "configmanager.h" -#include "tinyxml/tinywxuni.h" +#include "tinywxuni.h" + #include "filegroupsandmasks.h" ProjectLoader::ProjectLoader(cbProject* project) - : m_pProject(project), diff --git a/src/sdk/workspaceloader.cpp b/src/sdk/workspaceloader.cpp -index d44b0b4..f2624be 100644 +index 3423c08..9af27ff 100644 --- a/src/sdk/workspaceloader.cpp +++ b/src/sdk/workspaceloader.cpp -@@ -26,7 +26,7 @@ +@@ -28,7 +28,7 @@ #include "tinyxml/tinyxml.h" @@ -252,7 +253,7 @@ index d44b0b4..f2624be 100644 WorkspaceLoader::WorkspaceLoader() { diff --git a/src/tools/cb_share_config/mainframe.cpp b/src/tools/cb_share_config/mainframe.cpp -index 02803b6..f43b15c 100644 +index 335edd1..748e13e 100644 --- a/src/tools/cb_share_config/mainframe.cpp +++ b/src/tools/cb_share_config/mainframe.cpp @@ -24,7 +24,7 @@ @@ -265,19 +266,21 @@ index 02803b6..f43b15c 100644 //*********************************************************************** -- -1.6.6.1 +1.7.7.6 + -From bc052dd162594f68126177d523092f43937d1936 Mon Sep 17 00:00:00 2001 +From 6ae3dd683e0fe6db3da3bad3aa7af897a5a25a62 Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Thu, 14 May 2009 09:42:37 +0200 -Subject: [PATCH 03/22] move tinywxuni.cpp implementation from tinyxml into sdk +Subject: [PATCH 03/29] move tinywxuni.cpp implementation from tinyxml into + sdk --- src/base/tinyxml/Makefile.am | 2 +- - src/base/tinyxml/tinywxuni.cpp | 62 ---------------------------------------- + src/base/tinyxml/tinywxuni.cpp | 56 ---------------------------------------- src/sdk/Makefile.am | 1 + - src/sdk/tinywxuni.cpp | 62 ++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 64 insertions(+), 63 deletions(-) + src/sdk/tinywxuni.cpp | 56 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 58 insertions(+), 57 deletions(-) delete mode 100644 src/base/tinyxml/tinywxuni.cpp create mode 100644 src/sdk/tinywxuni.cpp @@ -293,30 +296,34 @@ index bc3e89d..c480f0c 100644 +libtinyxml_la_SOURCES = tinystr.cpp tinyxml.cpp tinyxmlerror.cpp tinyxmlparser.cpp diff --git a/src/base/tinyxml/tinywxuni.cpp b/src/base/tinyxml/tinywxuni.cpp deleted file mode 100644 -index 5cfc5ee..0000000 +index d156154..0000000 --- a/src/base/tinyxml/tinywxuni.cpp +++ /dev/null -@@ -1,62 +0,0 @@ +@@ -1,56 +0,0 @@ -#include "sdk_precomp.h" - -#ifndef CB_PRECOMP --#include --#include --#include "filemanager.h" --#include "manager.h" +- #include +- #include +- #include "filemanager.h" +- #include "manager.h" -#endif +- -#include "tinywxuni.h" -#include "tinyxml.h" - -bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) -{ - -- if(!doc || !wxFile::Access(filename, wxFile::read)) +- if (!doc || !wxFile::Access(filename, wxFile::read)) - return false; - - wxFile file(filename); - size_t len = file.Length(); - +- if (!len) +- return false; +- - char *input = new char[len+1]; - input[len] = '\0'; - file.Read(input, len); @@ -330,15 +337,11 @@ index 5cfc5ee..0000000 -{ - TiXmlDocument* doc = new TiXmlDocument(); - -- if(TinyXML::LoadDocument(filename, doc)) -- { +- if (TinyXML::LoadDocument(filename, doc)) - return doc; -- } -- else -- { -- delete doc; -- return 0; -- } +- +- delete doc; +- return 0; -} - -bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc) @@ -351,19 +354,13 @@ index 5cfc5ee..0000000 - doc->Accept(&printer); - - return Manager::Get()->GetFileManager()->Save(filename, printer.CStr(), printer.Size()); -- --// wxTempFile file(filename); --// if(file.IsOpened()) --// if(file.Write(Printer.CStr(), Printer.Size()) && file.Commit()) --// return true; --// return false; -} - diff --git a/src/sdk/Makefile.am b/src/sdk/Makefile.am -index 0e84492..66a2620 100644 +index ffb588e..aea1a75 100644 --- a/src/sdk/Makefile.am +++ b/src/sdk/Makefile.am -@@ -101,6 +101,7 @@ libcodeblocks_la_SOURCES = annoyingdialog.cpp \ +@@ -107,6 +107,7 @@ libcodeblocks_la_SOURCES = annoyingdialog.cpp \ searchresultslog.cpp \ selecttargetdlg.cpp \ templatemanager.cpp \ @@ -373,30 +370,34 @@ index 0e84492..66a2620 100644 virtualbuildtargetsdlg.cpp \ diff --git a/src/sdk/tinywxuni.cpp b/src/sdk/tinywxuni.cpp new file mode 100644 -index 0000000..5cfc5ee +index 0000000..d156154 --- /dev/null +++ b/src/sdk/tinywxuni.cpp -@@ -0,0 +1,62 @@ +@@ -0,0 +1,56 @@ +#include "sdk_precomp.h" + +#ifndef CB_PRECOMP -+#include -+#include -+#include "filemanager.h" -+#include "manager.h" ++ #include ++ #include ++ #include "filemanager.h" ++ #include "manager.h" +#endif ++ +#include "tinywxuni.h" +#include "tinyxml.h" + +bool TinyXML::LoadDocument(const wxString& filename, TiXmlDocument *doc) +{ + -+ if(!doc || !wxFile::Access(filename, wxFile::read)) ++ if (!doc || !wxFile::Access(filename, wxFile::read)) + return false; + + wxFile file(filename); + size_t len = file.Length(); + ++ if (!len) ++ return false; ++ + char *input = new char[len+1]; + input[len] = '\0'; + file.Read(input, len); @@ -410,15 +411,11 @@ index 0000000..5cfc5ee +{ + TiXmlDocument* doc = new TiXmlDocument(); + -+ if(TinyXML::LoadDocument(filename, doc)) -+ { ++ if (TinyXML::LoadDocument(filename, doc)) + return doc; -+ } -+ else -+ { -+ delete doc; -+ return 0; -+ } ++ ++ delete doc; ++ return 0; +} + +bool TinyXML::SaveDocument(const wxString& filename, TiXmlDocument* doc) @@ -431,21 +428,16 @@ index 0000000..5cfc5ee + doc->Accept(&printer); + + return Manager::Get()->GetFileManager()->Save(filename, printer.CStr(), printer.Size()); -+ -+// wxTempFile file(filename); -+// if(file.IsOpened()) -+// if(file.Write(Printer.CStr(), Printer.Size()) && file.Commit()) -+// return true; -+// return false; +} + -- -1.6.6.1 +1.7.7.6 + -From 7362315ce2418e4fd00513f966b661463141bb55 Mon Sep 17 00:00:00 2001 +From 79b6d9eddde59cde7b78087afec5a8b9a6e570b6 Mon Sep 17 00:00:00 2001 From: Dan Horak Date: Thu, 14 May 2009 10:04:35 +0200 -Subject: [PATCH 04/22] update C::B projects with new locations of tinywxuni +Subject: [PATCH 04/29] update C::B projects with new locations of tinywxuni --- src/CodeBlocks-unix.cbp | 4 ++-- @@ -453,10 +445,10 @@ Subject: [PATCH 04/22] update C::B projects with new locations of tinywxuni 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CodeBlocks-unix.cbp b/src/CodeBlocks-unix.cbp -index eb2d9da..11ee731 100644 +index 739c24a..ef6ddd1 100644 --- a/src/CodeBlocks-unix.cbp +++ b/src/CodeBlocks-unix.cbp -@@ -400,7 +400,7 @@ +@@ -473,7 +473,7 @@ @@ -465,9 +457,9 @@ index eb2d9da..11ee731 100644