|
From: Eran I. <no...@so...> - 2013-12-13 18:56:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "codelite".
The branch, master has been updated
via 390f629e406a49577c3eb50131c5c21a1a0d4401 (commit)
via a8cc50e67fdb01d2f22cd58ad64db25d00360ea4 (commit)
via 63103454cc462ccf2c86ee51b761613886e11b24 (commit)
from bdc7c6f06248814df93ef6138fd56f6c6815b1ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sourceforge.net/p/codelite/codelitegit/ci/390f629e406a49577c3eb50131c5c21a1a0d4401
commit 390f629e406a49577c3eb50131c5c21a1a0d4401
Merge: a8cc50e bdc7c6f
Author: eran <era...@gm...>
Date: Fri Dec 13 20:54:52 2013 +0200
Merge branch 'master' of ssh://git.code.sf.net/p/codelite/codelitegit
# By dghart
# Via dghart
* 'master' of ssh://git.code.sf.net/p/codelite/codelitegit:
When saving and reloading a project file, try to reapply its 'fold' state
Add a new menuitem: View > Toggle All Topmost Folds in Selection
https://sourceforge.net/p/codelite/codelitegit/ci/a8cc50e67fdb01d2f22cd58ad64db25d00360ea4
commit a8cc50e67fdb01d2f22cd58ad64db25d00360ea4
Author: eran <era...@gm...>
Date: Fri Dec 13 20:44:48 2013 +0200
Updated codelite to use GCC/TDM 4.8.1-3
diff --git a/Debugger/DebuggerGDB.project b/Debugger/DebuggerGDB.project
index d79af1c..993d8b8 100644
--- a/Debugger/DebuggerGDB.project
+++ b/Debugger/DebuggerGDB.project
@@ -28,9 +28,11 @@
<Dependencies Name="WinDebug_29"/>
<Dependencies Name="WinRelease_29"/>
<Dependencies Name="Win_wxWidgets_29"/>
+ <Dependencies Name="WinDebugUnicode"/>
+ <Dependencies Name="WinReleaseUnicode"/>
<Settings Type="Dynamic Library">
<GlobalSettings>
- <Compiler Options="" C_Options="">
+ <Compiler Options="" C_Options="" Assembler="">
<IncludePath Value="."/>
<Preprocessor Value="__WX__"/>
<Preprocessor Value="WXUSINGDLL"/>
@@ -43,7 +45,7 @@
<ResourceCompiler Options=""/>
</GlobalSettings>
<Configuration Name="WinDebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
- <Compiler Options="-g;-Wall;$(shell wx-config --cxxflags --debug=yes --unicode=yes);-Winvalid-pch" C_Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes)" Required="yes" PreCompiledHeader="../PCH/precompiled_header_dbg.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --debug=yes --unicode=yes) -g">
+ <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --debug=yes);-Winvalid-pch" C_Options="-g;$(shell wx-config --cxxflags --debug=yes)" Assembler="" Required="yes" PreCompiledHeader="../PCH/precompiled_header_dbg.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --debug=yes --unicode=yes) -g">
<IncludePath Value="."/>
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
@@ -58,7 +60,7 @@
<Library Value="libcodeliteud.dll"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/$(ProjectName)-dbg.dll" IntermediateDirectory="./WinDebugUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="./WinDebugUnicode" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/$(ProjectName)-dbg.dll" IntermediateDirectory="./WinDebugUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="./WinDebugUnicode" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -93,7 +95,7 @@
</Completion>
</Configuration>
<Configuration Name="WinReleaseUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
- <Compiler Options="$(shell wx-config --cxxflags --debug=no --unicode=yes);-O2;-Winvalid-pch" C_Options="$(shell wx-config --cxxflags --debug=no --unicode=yes);-O2" Required="yes" PreCompiledHeader="../PCH/precompiled_header_release.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --unicode=yes --debug=no) -O2">
+ <Compiler Options="$(shell wx-config --cxxflags --debug=no --unicode=yes);-O2;-Winvalid-pch" C_Options="$(shell wx-config --cxxflags --debug=no --unicode=yes);-O2" Assembler="" Required="yes" PreCompiledHeader="../PCH/precompiled_header_release.h" PCHInCommandLine="yes" UseDifferentPCHFlags="yes" PCHFlags="$(shell wx-config --cxxflags --unicode=yes --debug=no) -O2">
<IncludePath Value="."/>
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
@@ -106,7 +108,7 @@
<Library Value="libcodeliteu.dll"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="$(IntermediateDirectory)/$(ProjectName).dll" IntermediateDirectory="./WinReleaseUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/$(ProjectName).dll" IntermediateDirectory="./WinReleaseUnicode" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -141,7 +143,7 @@
</Completion>
</Configuration>
<Configuration Name="Win_wxWidgets_29" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Dynamic Library" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
- <Compiler Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes)" C_Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
+ <Compiler Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes)" C_Options="-g;$(shell wx-config --cxxflags --debug=yes --unicode=yes)" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
<IncludePath Value="."/>
<IncludePath Value="../Interfaces"/>
<IncludePath Value="../CodeLite"/>
@@ -158,7 +160,7 @@
<Library Value="libcodeliteud.dll"/>
</Linker>
<ResourceCompiler Options="" Required="no"/>
- <General OutputFile="../Runtime/debuggers/Debugger.dll" IntermediateDirectory="./WinDbg_29" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="./WinDebugUnicode" PauseExecWhenProcTerminates="yes"/>
+ <General OutputFile="../Runtime/debuggers/Debugger.dll" IntermediateDirectory="./WinDbg_29" Command="" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="./WinDebugUnicode" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>">
<![CDATA[]]>
</Environment>
@@ -191,6 +193,4 @@
</Completion>
</Configuration>
</Settings>
- <Dependencies Name="WinDebugUnicode"/>
- <Dependencies Name="WinReleaseUnicode"/>
</CodeLite_Project>
diff --git a/InnoSetup/codelite_mingw.iss b/InnoSetup/codelite_mingw.iss
index 41e0a67..546e3f1 100644
--- a/InnoSetup/codelite_mingw.iss
+++ b/InnoSetup/codelite_mingw.iss
@@ -11,7 +11,7 @@ DefaultDirName={reg:HKLM\Software\codelite\settings,InstalPath|{pf}\CodeLite}
DefaultGroupName=CodeLite
LicenseFile=license.txt
OutputDir=output
-OutputBaseFilename=codelite-mingw4.7.1
+OutputBaseFilename=codelite-mingw4.8.1
ChangesEnvironment=yes
FlatComponentsList=yes
SetupIconFile=box_software.ico
@@ -25,7 +25,7 @@ Name: "eng"; MessagesFile: "compiler:Default.isl"
[Components]
Name: "Editor"; Description: "codelite IDE (Editor + Plugins)"; Types: full custom;
-Name: "MinGW"; Description: "GCC 4.7.1 (MinGW) full (gcc/g++/gdb/WinAPI)"; Types: full;
+Name: "MinGW"; Description: "GCC 4.8.1-3 (TDM/GCC) full (gcc/g++/gdb/WinAPI)"; Types: full;
Name: "UnitTestPP"; Description: "UnitTest++ 1.3 framework"; Types: full;
[Tasks]
@@ -114,17 +114,17 @@ Source: "..\Runtime\patch.exe"; DestDir: "{app}"; Flags: ignoreversion ; Compone
Source: "..\Runtime\*.html"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
Source: "..\Runtime\images\*"; DestDir: "{app}\images"; Flags: ignoreversion ; Components: Editor
Source: "..\Runtime\*.zip"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\mingwm10.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\libgcc_s_sjlj-1.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\exchndl.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\which.exe"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\rm.exe"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\cscope.exe"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\cygncurses-8.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\cygwin1.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\libintl3.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\bin\pthreadGC2.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
-Source: "C:\MinGW-4.7.1\*"; Excludes: "*.~*,msys\*,mingw-get\*"; DestDir: "{code:GetMinGWInstallDir}"; Flags: recursesubdirs ; Components: MinGW
+Source: "C:\MinGW-4.8.1\bin\mingwm10.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\libgcc_s_sjlj-1.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\exchndl.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\which.exe"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\rm.exe"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\cscope.exe"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\cygncurses-8.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\cygwin1.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\libintl3.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\bin\pthreadGC2.dll"; DestDir: "{app}"; Flags: ignoreversion ; Components: Editor
+Source: "C:\MinGW-4.8.1\*"; Excludes: "*.~*,msys\*,mingw-get\*"; DestDir: "{code:GetMinGWInstallDir}"; Flags: recursesubdirs ; Components: MinGW
Source: "..\UnitTest++\*"; DestDir: "{code:GetUnitTestPPInstallDir}"; Flags: recursesubdirs ; Components: UnitTestPP
Source: "..\Runtime\locale\*"; DestDir: "{app}\locale"; Flags: recursesubdirs ; Components: Editor
Source: "..\Runtime\gdb_printers\*"; DestDir: "{app}\gdb_printers"; Flags: recursesubdirs ; Components: Editor
@@ -160,7 +160,7 @@ begin
MinGW_Page.Add('');
// Set initial value (optional)
- MinGW_Page.Values[0] := ExpandConstant('{sd}\MinGW-4.7.1\');
+ MinGW_Page.Values[0] := ExpandConstant('{sd}\MinGW-4.8.1\');
end;
function GetMinGWInstallDir(Param: String): String;
diff --git a/InnoSetup/wxwidgets.iss b/InnoSetup/wxwidgets.iss
index aabc443..535156f 100644
--- a/InnoSetup/wxwidgets.iss
+++ b/InnoSetup/wxwidgets.iss
@@ -10,7 +10,7 @@ AppUpdatesURL=http://codelite.org
DefaultDirName={sd}\wxWidgets-3.0.0
DefaultGroupName=wxWidgets-3.0.0
OutputDir=.
-OutputBaseFilename=wxwidgets-3.0-tdm-gcc-471-32-devel
+OutputBaseFilename=wxwidgets-3.0-tdm-gcc-481-32-devel
ChangesEnvironment=yes
FlatComponentsList=yes
SetupIconFile=box_software.ico
diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project
index 6c8aff2..f9f9b4c 100644
--- a/LiteEditor/LiteEditor.project
+++ b/LiteEditor/LiteEditor.project
@@ -1325,7 +1325,7 @@ resources.cpp: resources.xrc
<Library Value="liblibclang.dll"/>
</Linker>
<ResourceCompiler Options="$(shell wx-config --rcflags)" Required="yes"/>
- <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b ." UseSeparateDebugArgs="yes" DebugArguments="-b . --with-plugins Tweaks" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
+ <General OutputFile="$(IntermediateDirectory)/codelite-dbg.exe" IntermediateDirectory="./Debug" Command="./codelite-dbg.exe" CommandArguments="-b ." UseSeparateDebugArgs="yes" DebugArguments="-b . --no-plugins" WorkingDirectory="../Runtime " PauseExecWhenProcTerminates="no" IsGUIProgram="no" IsEnabled="yes"/>
<Environment EnvVarSetName="Default" DbgSetName="">
<![CDATA[PATH=../sdk/clang/lib;$(WXWIN)\lib\gcc_dll;$(PATH)]]>
</Environment>
diff --git a/sdk/clang/lib/liblibclang.dll b/sdk/clang/lib/liblibclang.dll
index 165760f..1e3ba0a 100644
Binary files a/sdk/clang/lib/liblibclang.dll and b/sdk/clang/lib/liblibclang.dll differ
https://sourceforge.net/p/codelite/codelitegit/ci/63103454cc462ccf2c86ee51b761613886e11b24
commit 63103454cc462ccf2c86ee51b761613886e11b24
Author: eran <era...@gm...>
Date: Fri Dec 13 18:22:41 2013 +0200
Debugger manager: do not mix between debug and release debugger
diff --git a/Plugin/debuggermanager.cpp b/Plugin/debuggermanager.cpp
index 4a18fdb..1a55158 100644
--- a/Plugin/debuggermanager.cpp
+++ b/Plugin/debuggermanager.cpp
@@ -109,6 +109,18 @@ bool DebuggerMgr::LoadDebuggers()
for(size_t i=0; i<files.GetCount(); i++) {
clDynamicLibrary *dl = new clDynamicLibrary();
wxString fileName(files.Item(i));
+#if defined(__WXMSW__) && !defined(NDEBUG)
+ // Under MSW loading a release plugin while in debug mode will cause a crash
+ if ( !fileName.EndsWith("-dbg.dll") ) {
+ continue;
+ }
+#elif defined(__WXMSW__)
+
+ // filter debug plugins
+ if ( fileName.EndsWith("-dbg.dll") ) {
+ continue;
+ }
+#endif
if(!dl->Load(fileName)) {
wxLogMessage(wxT("Failed to load debugger's dll: ") + fileName);
if (!dl->GetError().IsEmpty()) {
-----------------------------------------------------------------------
Summary of changes:
Debugger/DebuggerGDB.project | 18 +++++++++---------
InnoSetup/codelite_mingw.iss | 28 ++++++++++++++--------------
InnoSetup/wxwidgets.iss | 2 +-
LiteEditor/LiteEditor.project | 2 +-
Plugin/debuggermanager.cpp | 12 ++++++++++++
sdk/clang/lib/liblibclang.dll | Bin 11045902 -> 19355019 bytes
6 files changed, 37 insertions(+), 25 deletions(-)
hooks/post-receive
--
codelite
|