From: Eran I. <no...@so...> - 2014-01-11 08:07:29
|
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 beb9047e53c21140e443d55c508d81a3a5b7b78d (commit) from c8fc8a13b854aaa57bb9be3b31f193804aacd54a (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/beb9047e53c21140e443d55c508d81a3a5b7b78d commit beb9047e53c21140e443d55c508d81a3a5b7b78d Author: eran <eran@osx-108.local> Date: Sat Jan 11 02:07:02 2014 -0800 OSX: Better drawing the wxAuiNotebook OSX: Make sure that when dismissing the 'Help' or any dialog, the project settings dialog remains on top diff --git a/LiteEditor.workspace b/LiteEditor.workspace index 5fe354b..86f724d 100644 --- a/LiteEditor.workspace +++ b/LiteEditor.workspace @@ -44,7 +44,7 @@ <Project Name="Tweaks" Path="Tweaks/Tweaks.project" Active="No"/> <Project Name="CMakePlugin" Path="CMakePlugin/CMakePlugin.project" Active="No"/> <BuildMatrix> - <WorkspaceConfiguration Name="Win Release Unicode" Selected="yes"> + <WorkspaceConfiguration Name="Win Release Unicode" Selected="no"> <Project Name="abbreviation" ConfigName="WinReleaseUnicode"/> <Project Name="CallGraph" ConfigName="WinReleaseUnicode"/> <Project Name="CMakePlugin" ConfigName="WinReleaseUnicode"/> @@ -114,7 +114,7 @@ <Project Name="wxsqlite3" ConfigName="WinDebugUnicode"/> <Project Name="ZoomNavigator" ConfigName="WinDebugUnicode"/> </WorkspaceConfiguration> - <WorkspaceConfiguration Name="CMake_Release" Selected="yes"> + <WorkspaceConfiguration Name="CMake_Release" Selected="no"> <Project Name="ZoomNavigator" ConfigName="DebugUnicode"/> <Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/> <Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/> @@ -149,7 +149,7 @@ <Project Name="Tweaks" ConfigName="DebugUnicode"/> <Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/> </WorkspaceConfiguration> - <WorkspaceConfiguration Name="CMake_Debug" Selected="yes"> + <WorkspaceConfiguration Name="CMake_Debug" Selected="no"> <Project Name="ZoomNavigator" ConfigName="WinReleaseUnicode"/> <Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/> <Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/> @@ -184,7 +184,7 @@ <Project Name="abbreviation" ConfigName="WinReleaseUnicode"/> <Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/> </WorkspaceConfiguration> - <WorkspaceConfiguration Name="OSX_Debug" Selected="yes"> + <WorkspaceConfiguration Name="OSX_Debug" Selected="no"> <Project Name="ZoomNavigator" ConfigName="DebugUnicode"/> <Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/> <Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/> @@ -219,5 +219,40 @@ <Project Name="Tweaks" ConfigName="DebugUnicode"/> <Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/> </WorkspaceConfiguration> + <WorkspaceConfiguration Name="OSX_Release" Selected="yes"> + <Project Name="ZoomNavigator" ConfigName="DebugUnicode"/> + <Project Name="wxsqlite3" ConfigName="WinReleaseUnicode"/> + <Project Name="wxshapeframework" ConfigName="WinReleaseUnicode"/> + <Project Name="wxFormBuilder" ConfigName="WinReleaseUnicode"/> + <Project Name="UnitTestPP" ConfigName="WinReleaseUnicode"/> + <Project Name="Tweaks" ConfigName="DebugUnicode"/> + <Project Name="Subversion2" ConfigName="WinReleaseUnicode"/> + <Project Name="sqlite3" ConfigName="Common"/> + <Project Name="snipwiz" ConfigName="WinReleaseUnicode"/> + <Project Name="SFTP" ConfigName="DebugUnicode"/> + <Project Name="QMakePlugin" ConfigName="WinReleaseUnicode"/> + <Project Name="plugin_sdk" ConfigName="WinReleaseUnicode"/> + <Project Name="PCH" ConfigName="Release"/> + <Project Name="Outline" ConfigName="WinDebugUnicode"/> + <Project Name="MacBundler" ConfigName="WinDebugUnicode"/> + <Project Name="LiteEditor" ConfigName="OSX_Release"/> + <Project Name="Interfaces" ConfigName="Common"/> + <Project Name="Gizmos" ConfigName="WinDebugUnicode"/> + <Project Name="git" ConfigName="DebugUnicode"/> + <Project Name="ExternalTools" ConfigName="WinDebugUnicode"/> + <Project Name="DebuggerGDB" ConfigName="WinDebugUnicode"/> + <Project Name="databaselayer_sqlite" ConfigName="DebugUnicode"/> + <Project Name="DatabaseExplorer" ConfigName="DebugUnicode"/> + <Project Name="Cscope" ConfigName="WinDebugUnicode"/> + <Project Name="CppChecker" ConfigName="WinDebugUnicode"/> + <Project Name="Copyright" ConfigName="WinDebugUnicode"/> + <Project Name="ContinuousBuild" ConfigName="WinDebugUnicode"/> + <Project Name="CodeLite" ConfigName="WinDebugUnicode"/> + <Project Name="CodeFormatter" ConfigName="WinDebugUnicode"/> + <Project Name="CodeBeautifier" ConfigName="DebugUnicode"/> + <Project Name="CMakePlugin" ConfigName="WinDebugUnicode"/> + <Project Name="CallGraph" ConfigName="DebugUnicode"/> + <Project Name="abbreviation" ConfigName="WinDebugUnicode"/> + </WorkspaceConfiguration> </BuildMatrix> </CodeLite_Workspace> diff --git a/LiteEditor/LiteEditor.project b/LiteEditor/LiteEditor.project index e3b9e02..0ba880a 100644 --- a/LiteEditor/LiteEditor.project +++ b/LiteEditor/LiteEditor.project @@ -4,6 +4,18 @@ <Plugin Name="qmake"> <![CDATA[00080001N0004Unix0000000000000001N0011Unix_Make_J0000000000000001N0010Unix_Wx_290000000000000001N0015WinDebugUnicode0000000000000001N0011WinDebug_290000000000000001N0017WinReleaseUnicode0000000000000001N0013WinRelease_290000000000000001N0016Win_wxWidgets_29000000000000]]> </Plugin> + <Plugin Name="CMakePlugin"> + <![CDATA[[{ + "name": "OSX_Release", + "enabled": false, + "buildDirectory": "build", + "sourceDirectory": "$(ProjectPath)", + "generator": "", + "buildType": "", + "arguments": [], + "parentProject": "" + }]]]> + </Plugin> </Plugins> <Reconciliation> <Ignorefiles/> @@ -895,6 +907,198 @@ <File Name="reconcileprojectbase.cpp"/> <File Name="reconcileprojectbase.h"/> </VirtualDirectory> + <Dependencies Name="CMake_Debug"> + <Project Name="wxscintilla"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Subversion"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + </Dependencies> + <Dependencies Name="CMake_Debug_DBE_MySQL"> + <Project Name="wxscintilla"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Subversion"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + </Dependencies> + <Dependencies Name="CMake_Debug_Essential"> + <Project Name="wxscintilla"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Subversion"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + </Dependencies> + <Dependencies Name="CMake_Release"> + <Project Name="wxscintilla"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Subversion"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + </Dependencies> + <Dependencies Name="CMake_Release_DBE_MySQL"> + <Project Name="wxscintilla"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Subversion"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + </Dependencies> + <Dependencies Name="CMake_Release_Essential"> + <Project Name="wxscintilla"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Subversion"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + </Dependencies> + <Dependencies Name="OSX_Debug"> + <Project Name="wxscintilla"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Subversion"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + </Dependencies> + <Dependencies Name="WinDebugUnicode"> + <Project Name="PCH"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="databaselayer_sqlite"/> + <Project Name="wxshapeframework"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + <Project Name="ExternalTools"/> + <Project Name="snipwiz"/> + <Project Name="wxFormBuilder"/> + <Project Name="abbreviation"/> + <Project Name="ContinuousBuild"/> + <Project Name="QMakePlugin"/> + <Project Name="CppChecker"/> + <Project Name="Subversion2"/> + <Project Name="Outline"/> + <Project Name="git"/> + <Project Name="DatabaseExplorer"/> + <Project Name="CallGraph"/> + <Project Name="ZoomNavigator"/> + <Project Name="CodeBeautifier"/> + <Project Name="SFTP"/> + <Project Name="Tweaks"/> + </Dependencies> + <Dependencies Name="WinReleaseUnicode"> + <Project Name="PCH"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="databaselayer_sqlite"/> + <Project Name="wxshapeframework"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + <Project Name="ExternalTools"/> + <Project Name="snipwiz"/> + <Project Name="wxFormBuilder"/> + <Project Name="abbreviation"/> + <Project Name="ContinuousBuild"/> + <Project Name="QMakePlugin"/> + <Project Name="CppChecker"/> + <Project Name="Subversion2"/> + <Project Name="Outline"/> + <Project Name="git"/> + <Project Name="DatabaseExplorer"/> + <Project Name="CallGraph"/> + <Project Name="ZoomNavigator"/> + <Project Name="SFTP"/> + <Project Name="Tweaks"/> + <Project Name="CMakePlugin"/> + </Dependencies> + <Dependencies Name="WinDebugUnicode"> + <Project Name="PCH"/> + <Project Name="sqlite3"/> + <Project Name="wxsqlite3"/> + <Project Name="databaselayer_sqlite"/> + <Project Name="wxshapeframework"/> + <Project Name="CodeLite"/> + <Project Name="plugin_sdk"/> + <Project Name="CodeFormatter"/> + <Project Name="DebuggerGDB"/> + <Project Name="Gizmos"/> + <Project Name="Cscope"/> + <Project Name="Copyright"/> + <Project Name="UnitTestPP"/> + <Project Name="ExternalTools"/> + <Project Name="snipwiz"/> + <Project Name="wxFormBuilder"/> + <Project Name="abbreviation"/> + <Project Name="ContinuousBuild"/> + <Project Name="QMakePlugin"/> + <Project Name="CppChecker"/> + <Project Name="Subversion2"/> + <Project Name="Outline"/> + <Project Name="git"/> + <Project Name="DatabaseExplorer"/> + <Project Name="CallGraph"/> + <Project Name="ZoomNavigator"/> + <Project Name="CodeBeautifier"/> + <Project Name="SFTP"/> + <Project Name="Tweaks"/> + <Project Name="CMakePlugin"/> + </Dependencies> <Settings Type="Executable"> <GlobalSettings> <Compiler Options="" C_Options="" Assembler=""> @@ -1219,6 +1423,48 @@ resources.cpp: resources.xrc <SearchPaths/> </Completion> </Configuration> + <Configuration Name="OSX_Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> + <Compiler Options="-g -Wall" C_Options="" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags=""> + <IncludePath Value="."/> + </Compiler> + <Linker Options="-O0" Required="yes"> + <LibraryPath Value="."/> + <LibraryPath Value="Debug"/> + </Linker> + <ResourceCompiler Options="" Required="no"/> + <General OutputFile="" IntermediateDirectory="./Debug" Command="../build-release/pack/codelite.app/Contents/MacOS/codelite" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/> + <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"> + <![CDATA[]]> + </Environment> + <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath=""> + <DebuggerSearchPaths/> + <PostConnectCommands/> + <StartupCommands/> + </Debugger> + <PreBuild/> + <PostBuild/> + <CustomBuild Enabled="yes"> + <Target Name="CMake_Plus_Build">./mac-build.sh --cmake --wxc</Target> + <RebuildCommand>cd build-release && make clean && cd .. && ./mac-build.sh --wxc</RebuildCommand> + <CleanCommand>cd build-release && make clean</CleanCommand> + <BuildCommand>./mac-build.sh --wxc</BuildCommand> + <PreprocessFileCommand/> + <SingleFileCommand/> + <MakefileGenerationCommand/> + <ThirdPartyToolName/> + <WorkingDirectory>$(WorkspacePath)</WorkingDirectory> + </CustomBuild> + <AdditionalRules> + <CustomPostBuild/> + <CustomPreBuild/> + </AdditionalRules> + <Completion EnableCpp11="no"> + <ClangCmpFlagsC/> + <ClangCmpFlags/> + <ClangPP/> + <SearchPaths/> + </Completion> + </Configuration> <Configuration Name="WinDebugUnicode" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> <Compiler Options="-g;-Wall;$(shell wx-config --debug=yes --cxxflags --unicode=yes);-Winvalid-pch" C_Options="-Wall" 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="."/> @@ -1274,8 +1520,7 @@ resources.cpp: resources.xrc wxrc /c /v /o resources.cpp resources.xrc svninfo.cpp: - autorev . -</CustomPreBuild> + autorev .</CustomPreBuild> </AdditionalRules> <Completion EnableCpp11="yes"> <ClangCmpFlagsC/> @@ -1343,196 +1588,4 @@ resources.cpp: resources.xrc </Completion> </Configuration> </Settings> - <Dependencies Name="CMake_Debug"> - <Project Name="wxscintilla"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Subversion"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - </Dependencies> - <Dependencies Name="CMake_Debug_DBE_MySQL"> - <Project Name="wxscintilla"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Subversion"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - </Dependencies> - <Dependencies Name="CMake_Debug_Essential"> - <Project Name="wxscintilla"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Subversion"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - </Dependencies> - <Dependencies Name="CMake_Release"> - <Project Name="wxscintilla"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Subversion"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - </Dependencies> - <Dependencies Name="CMake_Release_DBE_MySQL"> - <Project Name="wxscintilla"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Subversion"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - </Dependencies> - <Dependencies Name="CMake_Release_Essential"> - <Project Name="wxscintilla"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Subversion"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - </Dependencies> - <Dependencies Name="OSX_Debug"> - <Project Name="wxscintilla"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Subversion"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - </Dependencies> - <Dependencies Name="WinDebugUnicode"> - <Project Name="PCH"/> - <Project Name="sqlite3"/> - <Project Name="wxsqlite3"/> - <Project Name="databaselayer_sqlite"/> - <Project Name="wxshapeframework"/> - <Project Name="CodeLite"/> - <Project Name="plugin_sdk"/> - <Project Name="CodeFormatter"/> - <Project Name="DebuggerGDB"/> - <Project Name="Gizmos"/> - <Project Name="Cscope"/> - <Project Name="Copyright"/> - <Project Name="UnitTestPP"/> - <Project Name="ExternalTools"/> - <Project Name="snipwiz"/> - <Project Name="wxFormBuilder"/> - <Project Name="abbreviation"/> - <Project Name="ContinuousBuild"/> ... 1723 lines suppressed ... hooks/post-receive -- codelite |