Patches to CB Workspaces and Projects.

[stahta01]

Patches to fix some of the minor issues I have found.

The first changes the WorkSpaces to depend on "wxContribItems" instead of "lib_finder".
The second patch removes wxscintilla_cb and wxpropgrid from several CB projects that do NOT use either.

The attachments are the same as the code pasted below; was not sure which way was the best for whoever want to apply them.

Code Select Expand


From c382e7b709ef11fbf093508265a1872044c10812 Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Tue, 1 Dec 2015 11:46:14 -0500
Subject: [PATCH 1/4] - Workspace: Replaced "lib_finder" project dependency
with "wxContribItems". (Thanks stahta01)

---
src/CodeBlocks-unix.workspace          | 2 +-
src/CodeBlocks.workspace               | 2 +-
src/CodeBlocks_wx30-unix.workspace     | 2 +-
src/CodeBlocks_wx30.workspace          | 2 +-
src/CodeBlocks_wx30_64.workspace       | 2 +-
src/ContribPlugins-unix.workspace      | 2 +-
src/ContribPlugins.workspace           | 2 +-
src/ContribPlugins_wx30-unix.workspace | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/CodeBlocks-unix.workspace b/src/CodeBlocks-unix.workspace
index b428613..0d90e1b 100644
--- a/src/CodeBlocks-unix.workspace
+++ b/src/CodeBlocks-unix.workspace
@@ -8,7 +8,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems-unix.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith-unix.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems-unix.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder-unix.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems-unix.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith-unix.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui.cbp">
diff --git a/src/CodeBlocks.workspace b/src/CodeBlocks.workspace
index 3a71550..f755993 100644
--- a/src/CodeBlocks.workspace
+++ b/src/CodeBlocks.workspace
@@ -10,7 +10,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui.cbp">
diff --git a/src/CodeBlocks_wx30-unix.workspace b/src/CodeBlocks_wx30-unix.workspace
index de4cf1a..2f6b021 100644
--- a/src/CodeBlocks_wx30-unix.workspace
+++ b/src/CodeBlocks_wx30-unix.workspace
@@ -7,7 +7,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems_wx30-unix.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith_wx30-unix.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems_wx30-unix.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder_wx30-unix.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems_wx30-unix.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith_wx30-unix.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui_wx30.cbp">
diff --git a/src/CodeBlocks_wx30.workspace b/src/CodeBlocks_wx30.workspace
index 9479545..83a80f5 100644
--- a/src/CodeBlocks_wx30.workspace
+++ b/src/CodeBlocks_wx30.workspace
@@ -10,7 +10,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems_wx30.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith_wx30.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems_wx30.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder_wx30.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems_wx30.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith_wx30.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui_wx30.cbp">
diff --git a/src/CodeBlocks_wx30_64.workspace b/src/CodeBlocks_wx30_64.workspace
index 396b18b..9adae78 100644
--- a/src/CodeBlocks_wx30_64.workspace
+++ b/src/CodeBlocks_wx30_64.workspace
@@ -11,7 +11,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems_wx30_64.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith_wx30_64.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems_wx30_64.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder_wx30_64.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems_wx30_64.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith_wx30_64.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui_wx30_64.cbp">
diff --git a/src/ContribPlugins-unix.workspace b/src/ContribPlugins-unix.workspace
index 54ff3af..9872b37 100644
--- a/src/ContribPlugins-unix.workspace
+++ b/src/ContribPlugins-unix.workspace
@@ -6,7 +6,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems-unix.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith-unix.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems-unix.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder-unix.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems-unix.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith-unix.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui.cbp">
diff --git a/src/ContribPlugins.workspace b/src/ContribPlugins.workspace
index c1d9eaa..a0920a1 100644
--- a/src/ContribPlugins.workspace
+++ b/src/ContribPlugins.workspace
@@ -8,7 +8,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui.cbp">
diff --git a/src/ContribPlugins_wx30-unix.workspace b/src/ContribPlugins_wx30-unix.workspace
index 7fc84e3..42b742b 100644
--- a/src/ContribPlugins_wx30-unix.workspace
+++ b/src/ContribPlugins_wx30-unix.workspace
@@ -6,7 +6,7 @@
<Project filename="plugins/contrib/wxContribItems/wxContribItems_wx30-unix.cbp" />
<Project filename="plugins/contrib/wxSmith/wxSmith_wx30-unix.cbp" />
<Project filename="plugins/contrib/wxSmithContribItems/wxSmithContribItems_wx30-unix.cbp">
- <Depends filename="plugins/contrib/lib_finder/lib_finder_wx30-unix.cbp" />
+ <Depends filename="plugins/contrib/wxContribItems/wxContribItems_wx30-unix.cbp" />
<Depends filename="plugins/contrib/wxSmith/wxSmith_wx30-unix.cbp" />
</Project>
<Project filename="plugins/contrib/wxSmithAui/wxSmithAui_wx30.cbp">
--
2.7.0.windows.1



Code Select Expand


From ae148e9021ff5d58ed5abdba688c1f41415df901 Mon Sep 17 00:00:00 2001
From: Tim S <stahta01@users.sourceforge.net>
Date: Wed, 2 Dec 2015 01:15:15 -0500
Subject: [PATCH 4/4] - cbp: Remove mistakes from CB Projects. (Thanks
stahta01)

Removed unneeded wxscintilla_cb and wxpropgrid from library list.
And, Removed wxscintilla_cb from ext. depends.
---
src/plugins/contrib/ToolsPlus/ToolsPlus.cbp            | 1 -
src/plugins/contrib/cb_koders/cb_koders-unix.cbp       | 1 -
src/plugins/contrib/cb_koders/cb_koders.cbp            | 2 +-
src/plugins/contrib/cb_koders/cb_koders_wx30_64.cbp    | 2 +-
src/plugins/contrib/codesnippets/codesnippets-unix.cbp | 1 -
src/tools/cb_share_config/cb_share_config-unix.cbp     | 1 -
6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/plugins/contrib/ToolsPlus/ToolsPlus.cbp b/src/plugins/contrib/ToolsPlus/ToolsPlus.cbp
index 8a7c33a..03c7c20 100644
--- a/src/plugins/contrib/ToolsPlus/ToolsPlus.cbp
+++ b/src/plugins/contrib/ToolsPlus/ToolsPlus.cbp
@@ -18,7 +18,6 @@
</Compiler>
<Linker>
<Add library="codeblocks" />
- <Add library="wxscintilla_cb" />
<Add library="wxmsw28$(WX_SUFFIX)" />
<Add library="gdi32" />
<Add directory="..\..\..\devel" />
diff --git a/src/plugins/contrib/cb_koders/cb_koders-unix.cbp b/src/plugins/contrib/cb_koders/cb_koders-unix.cbp
index 39eb9d5..eb38f71 100644
--- a/src/plugins/contrib/cb_koders/cb_koders-unix.cbp
+++ b/src/plugins/contrib/cb_koders/cb_koders-unix.cbp
@@ -9,7 +9,6 @@
<Target title="default">
<Option output="../../../devel/share/codeblocks/plugins/libcb_koders" prefix_auto="0" extension_auto="1" />
<Option object_output="../../../.objs/plugins/contrib/cb_koders" />
- <Option external_deps="../../../devel/libwxscintilla_cb.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option parameters="--debug-log --multiple-instance -ns -ni -p debug" />
diff --git a/src/plugins/contrib/cb_koders/cb_koders.cbp b/src/plugins/contrib/cb_koders/cb_koders.cbp
index ef561b0..d3333cb 100644
--- a/src/plugins/contrib/cb_koders/cb_koders.cbp
+++ b/src/plugins/contrib/cb_koders/cb_koders.cbp
@@ -10,7 +10,7 @@
<Target title="default">
<Option output="../../../devel/share/CodeBlocks/plugins/cb_koders.dll" prefix_auto="0" extension_auto="0" />
<Option object_output="../../../.objs/plugins/contrib/cb_koders" />
- <Option external_deps="../../../devel/libcodeblocks.a;../../../devel/libwxscintilla_cb.a;" />
+ <Option external_deps="../../../devel/libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option parameters="--debug-log --multiple-instance -na -ns -nd -p debug" />
diff --git a/src/plugins/contrib/cb_koders/cb_koders_wx30_64.cbp b/src/plugins/contrib/cb_koders/cb_koders_wx30_64.cbp
index 09baa8b..a00ee06 100644
--- a/src/plugins/contrib/cb_koders/cb_koders_wx30_64.cbp
+++ b/src/plugins/contrib/cb_koders/cb_koders_wx30_64.cbp
@@ -9,7 +9,7 @@
<Target title="default">
<Option output="../../../devel30_64/share/CodeBlocks/plugins/cb_koders.dll" prefix_auto="0" extension_auto="0" />
<Option object_output="../../../.objs30_64/plugins/contrib/cb_koders" />
- <Option external_deps="../../../devel30_64/libcodeblocks.a;../../../devel30_64/libwxscintilla_cb.a;" />
+ <Option external_deps="../../../devel30_64/libcodeblocks.a;" />
<Option type="3" />
<Option compiler="gcc" />
<Option parameters="--debug-log --multiple-instance -na -ns -nd -p debug" />
diff --git a/src/plugins/contrib/codesnippets/codesnippets-unix.cbp b/src/plugins/contrib/codesnippets/codesnippets-unix.cbp
index 2f28d99..0da5923 100644
--- a/src/plugins/contrib/codesnippets/codesnippets-unix.cbp
+++ b/src/plugins/contrib/codesnippets/codesnippets-unix.cbp
@@ -44,7 +44,6 @@
<Add option="`wx-config --version=2.8 --libs`" />
<Add option="-Wl,--no-undefined" />
<Add library="codeblocks" />
- <Add library="wxpropgrid" />
<Add directory="../../../devel" />
<Add directory="../../../base/tinyxml" />
</Linker>
diff --git a/src/tools/cb_share_config/cb_share_config-unix.cbp b/src/tools/cb_share_config/cb_share_config-unix.cbp
index 39d4df7..53d1a44 100644
--- a/src/tools/cb_share_config/cb_share_config-unix.cbp
+++ b/src/tools/cb_share_config/cb_share_config-unix.cbp
@@ -37,7 +37,6 @@
<Add option="-Wl,--no-undefined" />
<Add option="`pkg-config glib-2.0 --libs`" />
<Add library="txml" />
- <Add library="wxpropgrid" />
<Add directory="../../base/tinyxml" />
<Add directory="../../devel" />
</Linker>
--
2.7.0.windows.1



Tim S.

[MortenMacFly]

Applied in SVN. Thank you!