Code::Blocks Forums

Developer forums (C::B DEVELOPMENT STRICTLY!) => Development => Topic started by: mandrav on February 13, 2007, 12:54:09 pm

Title: Directories layout changed
Post by: mandrav on February 13, 2007, 12:54:09 pm
As you may have already noticed, there has been a restructuring of the directories layout. This was planned for a long time and it finally happened.
Here's an overview of what has changed under the top-level directory (trunk/src/):



I have succesfully tested building C::B (rev3600) in linux using autotools as well as using C::B itself.
If any problems are still left, they probably have to do with the windows project files (which is what I 'm testing now). Succesfully verified windows projects too.

If you notice any other problems, please tell me about them.
Title: Re: Directories layout changed
Post by: stahta01 on February 13, 2007, 02:13:45 pm
Needed to patch splashscreen.cpp after deleting and recreating sdk folder under windows.
Tim S

I have gotten Windows Unicode build to work with these patches.
Code
Index: src/src/splashscreen.cpp
===================================================================
--- src/src/splashscreen.cpp	(revision 3600)
+++ src/src/splashscreen.cpp	(working copy)
@@ -9,7 +9,7 @@
 #include <wx/dcclient.h>
 #include <wx/dcmemory.h>
 #include <wx/dcscreen.h>
-#include "../sdk/autorevision.h"
+#include "autorevision.h"
 #include "appglobals.h"

 namespace
Index: src/plugins/contrib/lib_finder/lib_finder.cbp
===================================================================
--- src/plugins/contrib/lib_finder/lib_finder.cbp	(revision 3600)
+++ src/plugins/contrib/lib_finder/lib_finder.cbp	(working copy)
@@ -58,7 +58,7 @@
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)" />
 			<Add directory="$(#CB.lib)" />
 			<Add directory="$(#CB)\devel" />
-			<Add directory="$(#CB)\sdk\tinyxml" />
+			<Add directory="$(#CB)\base\tinyxml" />
 		</Linker>
 		<ExtraCommands>
 			<Add after="update.bat" />
Index: src/plugins/contrib/codesnippets/codesnippets.cbp
===================================================================
--- src/plugins/contrib/codesnippets/codesnippets.cbp	(revision 3600)
+++ src/plugins/contrib/codesnippets/codesnippets.cbp	(working copy)
@@ -58,7 +58,7 @@
 			<Add library="txml" />
 			<Add library="codeblocks" />
 			<Add directory="$(#cb)\devel" />
-			<Add directory="$(#cb)\sdk\tinyxml" />
+			<Add directory="$(#cb)\base\tinyxml" />
 			<Add directory="$(#wx.lib)\gcc_dll$(WX_CFG)" />
 		</Linker>
 		<ExtraCommands>
Index: src/plugins/contrib/wxSmith/wxSmith.cbp
===================================================================
--- src/plugins/contrib/wxSmith/wxSmith.cbp	(revision 3600)
+++ src/plugins/contrib/wxSmith/wxSmith.cbp	(working copy)
@@ -61,7 +61,7 @@
 			<Add option="-Wl,--add-stdcall-alias" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)" />
 			<Add directory="$(#CB)\devel" />
-			<Add directory="$(#CB)\sdk\tinyxml" />
+			<Add directory="$(#CB)\base\tinyxml" />
 			<Add directory="$(#CB)\sdk\propgrid" />
 			<Add directory="$(#CB.lib)" />
 			<Add directory="$(#CB.lib)\tinyxml" />
Index: src/tools/cb_share_config/cb_share_config.cbp
===================================================================
--- src/tools/cb_share_config/cb_share_config.cbp	(revision 3601)
+++ src/tools/cb_share_config/cb_share_config.cbp	(working copy)
@@ -46,7 +46,7 @@
 			<Add library="txml" />
 			<Add library="wxmsw26$(WX_SUFFIX)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)" />
-			<Add directory="..\..\sdk\tinyxml" />
+			<Add directory="..\..\base\tinyxml" />
 		</Linker>
 		<Unit filename="app.cpp" />
 		<Unit filename="app.h" />
Title: Re: Directories layout changed
Post by: stahta01 on February 13, 2007, 06:39:32 pm
New ANSI patch file. src/ANSI_BUILD_cb-projectfiles.patch

Code
Index: CodeBlocks.cbp
===================================================================
--- CodeBlocks.cbp	(revision 3601)
+++ CodeBlocks.cbp	(working copy)
@@ -447,7 +447,7 @@
 				</Linker>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+                <Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -471,7 +471,6 @@
 			<Add option="-DTIXML_USE_STL" />
 			<Add option="-DCB_PRECOMP" />
 			<Add option="-DWX_PRECOMP" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#WX.include)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
 			<Add directory="include\wxscintilla\include" />
Index: plugins/contrib/byogames/byogames.cbp
===================================================================
--- plugins/contrib/byogames/byogames.cbp	(revision 3601)
+++ plugins/contrib/byogames/byogames.cbp	(working copy)
@@ -12,7 +12,7 @@
 				<Option host_application="..\..\..\devel\codeblocks.exe" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -34,7 +34,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DTIXML_USE_STL" />
 			<Add option="-DWX_PRECOMP" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add option="-DBUILDING_PLUGIN" />
 			<Add directory="$(#WX.include)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
Index: plugins/contrib/cb_koders/cb_koders.cbp
===================================================================
--- plugins/contrib/cb_koders/cb_koders.cbp	(revision 3601)
+++ plugins/contrib/cb_koders/cb_koders.cbp	(working copy)
@@ -16,7 +16,7 @@
 				<Option projectResourceIncludeDirsRelation="0" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -38,7 +38,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DTIXML_USE_STL" />
 			<Add option="-DWX_PRECOMP" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add option="-DBUILDING_PLUGIN" />
 			<Add directory="$(#WX.include)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
Index: plugins/contrib/codesnippets/codesnippets.cbp
===================================================================
--- plugins/contrib/codesnippets/codesnippets.cbp	(revision 3601)
+++ plugins/contrib/codesnippets/codesnippets.cbp	(working copy)
@@ -24,7 +24,7 @@
 				<Option compiler="gcc" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -46,7 +46,6 @@
 			<Add option="-DcbDEBUG" />
 			<Add option="-DCB_PRECOMP" />
 			<Add option="-DWX_PRECOMP" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#cb.include)" />
			<Add directory="$(#cb.include)\\wxscintilla\include" />
 			<Add directory="$(#wx.include)" />
Index: plugins/contrib/codestat/codestat.cbp
===================================================================
--- plugins/contrib/codestat/codestat.cbp	(revision 3601)
+++ plugins/contrib/codestat/codestat.cbp	(working copy)
@@ -14,7 +14,7 @@
 				<Option projectCompilerOptionsRelation="0" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -36,7 +36,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DcbDEBUG" />
 			<Add option="-DTIXML_USE_STL" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#CB.INCLUDE)" />
 			<Add directory="$(#CB.INCLUDE)\wxscintilla\include" />
 			<Add directory="$(#WX.INCLUDE)" />
Index: plugins/contrib/copystrings/copystrings.cbp
===================================================================
--- plugins/contrib/copystrings/copystrings.cbp	(revision 3601)
+++ plugins/contrib/copystrings/copystrings.cbp	(working copy)
@@ -11,7 +11,7 @@
 				<Option compiler="gcc" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -34,7 +34,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DcbDEBUG" />
 			<Add option="-DTIXML_USE_STL" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#WX.include)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
 			<Add directory="$(#WX)\contrib\include" />
Index: plugins/contrib/devpak_plugin/DevPakPlugin.cbp
===================================================================
--- plugins/contrib/devpak_plugin/DevPakPlugin.cbp	(revision 3601)
+++ plugins/contrib/devpak_plugin/DevPakPlugin.cbp	(working copy)
@@ -35,7 +35,6 @@
 					<Add option="-DWXUSINGDLL" />
 					<Add option="-DcbDEBUG" />
 					<Add option="-DTIXML_USE_STL" />
-					<Add option="-DwxUSE_UNICODE" />
 					<Add directory="..\..\..\include" />
 					<Add directory="..\..\..\include\wxscintilla\include" />
 				</Compiler>
@@ -49,7 +48,7 @@
 				</ExtraCommands>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
Index: plugins/contrib/dragscroll/DragScroll.cbp
===================================================================
--- plugins/contrib/dragscroll/DragScroll.cbp	(revision 3601)
+++ plugins/contrib/dragscroll/DragScroll.cbp	(working copy)
@@ -13,7 +13,7 @@
 				<Option host_application="..\..\..\devel\codeblocks.exe" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -37,7 +37,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DcbDEBUG" />
 			<Add option="-DTIXML_USE_STL" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#WX.include)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
 			<Add directory="$(#WX)\contrib\include" />
Index: plugins/contrib/envvars/envvars.cbp
===================================================================
--- plugins/contrib/envvars/envvars.cbp	(revision 3601)
+++ plugins/contrib/envvars/envvars.cbp	(working copy)
@@ -13,7 +13,7 @@
 				<Option host_application="..\..\..\devel\codeblocks.exe" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -35,7 +35,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DcbDEBUG" />
 			<Add option="-DTIXML_USE_STL" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#CB.INCLUDE)" />
 			<Add directory="$(#CB.INCLUDE)\wxscintilla\include" />
 			<Add directory="$(#WX.INCLUDE)" />
Index: plugins/contrib/help_plugin/help-plugin.cbp
===================================================================
--- plugins/contrib/help_plugin/help-plugin.cbp	(revision 3601)
+++ plugins/contrib/help_plugin/help-plugin.cbp	(working copy)
@@ -28,7 +28,6 @@
 					<Add option="-DWXUSINGDLL" />
 					<Add option="-DcbDEBUG" />
 					<Add option="-DTIXML_USE_STL" />
-					<Add option="-DwxUSE_UNICODE" />
 					<Add directory="$(#WX.include)" />
 					<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
 					<Add directory="$(#WX)\contrib\include" />
@@ -54,7 +53,7 @@
 				</ExtraCommands>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
Index: plugins/contrib/keybinder/keybinder.cbp
===================================================================
--- plugins/contrib/keybinder/keybinder.cbp	(revision 3601)
+++ plugins/contrib/keybinder/keybinder.cbp	(working copy)
@@ -26,11 +26,10 @@
 					<Add option="-DWXUSINGDLL" />
 					<Add option="-DcbDEBUG" />
 					<Add option="-DTIXML_USE_STL" />
-					<Add option="-DwxUSE_UNICODE" />
 				</Compiler>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
Index: plugins/contrib/lib_finder/lib_finder.cbp
===================================================================
--- plugins/contrib/lib_finder/lib_finder.cbp	(revision 3601)
+++ plugins/contrib/lib_finder/lib_finder.cbp	(working copy)
@@ -16,7 +16,7 @@
 				<Option projectResourceIncludeDirsRelation="0" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -39,7 +39,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DTIXML_USE_STL" />
 			<Add option="-DWX_PRECOMP" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add option="-DBUILDING_PLUGIN" />
 			<Add directory="$(#WX.include)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
Index: plugins/contrib/profiler/cbprofiler.cbp
===================================================================
--- plugins/contrib/profiler/cbprofiler.cbp	(revision 3601)
+++ plugins/contrib/profiler/cbprofiler.cbp	(working copy)
@@ -13,7 +13,7 @@
 				<Option host_application="..\..\..\devel\codeblocks.exe" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -35,7 +35,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DcbDEBUG" />
 			<Add option="-DTIXML_USE_STL" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#CB.include)" />
 			<Add directory="$(#CB.include)\wxscintilla\include" />
 			<Add directory="$(#WX.include)" />
Index: plugins/contrib/regex_testbed/RegExTestbed.cbp
===================================================================
--- plugins/contrib/regex_testbed/RegExTestbed.cbp	(revision 3601)
+++ plugins/contrib/regex_testbed/RegExTestbed.cbp	(working copy)
@@ -22,7 +22,7 @@
 				</ExtraCommands>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -42,7 +42,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DTIXML_USE_STL" />
 			<Add option="-DWX_PRECOMP" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add option="-DBUILDING_PLUGIN" />
 			<Add option="-DSUPPORT_UTF8" />
 			<Add directory="$(#WX.include)" />
Index: plugins/contrib/source_exporter/Exporter.cbp
===================================================================
--- plugins/contrib/source_exporter/Exporter.cbp	(revision 3601)
+++ plugins/contrib/source_exporter/Exporter.cbp	(working copy)
@@ -31,7 +31,7 @@
 				</ExtraCommands>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -53,7 +53,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DcbDEBUG" />
 			<Add option="-DTIXML_USE_STL" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#WX.include)" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
 			<Add directory="$(#CB.include)" />
Index: plugins/contrib/symtab/symtab.cbp
===================================================================
--- plugins/contrib/symtab/symtab.cbp	(revision 3601)
+++ plugins/contrib/symtab/symtab.cbp	(working copy)
@@ -19,7 +19,7 @@
 				</Compiler>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -41,7 +41,6 @@
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DcbDEBUG" />
 			<Add option="-DTIXML_USE_STL" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#CB.include)" />
 			<Add directory="$(#CB.include)\wxscintilla\include" />
 			<Add directory="$(#WX.include)" />
Index: plugins/contrib/wxSmith/wxSmith.cbp
===================================================================
--- plugins/contrib/wxSmith/wxSmith.cbp	(revision 3601)
+++ plugins/contrib/wxSmith/wxSmith.cbp	(working copy)
@@ -20,7 +20,7 @@
 				</Linker>
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -44,7 +44,6 @@
 			<Add option="-DCB_PRECOMP" />
 			<Add option="-DWX_PRECOMP" />
 			<Add option="-DBUILDING_PLUGIN" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
 			<Add directory="$(#CB.include)" />
 			<Add directory="$(#CB.include)\wxscintilla\include" />
Index: tools/cb_share_config/cb_share_config.cbp
===================================================================
--- tools/cb_share_config/cb_share_config.cbp	(revision 3601)
+++ tools/cb_share_config/cb_share_config.cbp	(working copy)
@@ -13,7 +13,7 @@
 				<Option compiler="gcc" />
 			</Target>
 			<Environment>
-				<Variable name="WX_SUFFIX" value="u" />
+				<Variable name="WX_SUFFIX" value="" />
 				<Variable name="WX_CFG" value="" />
 			</Environment>
 		</Build>
@@ -31,7 +31,6 @@
 			<Add option="-D__GNUWIN32__" />
 			<Add option="-D__WXMSW__" />
 			<Add option="-DHAVE_W32API_H" />
-			<Add option="-DwxUSE_UNICODE" />
 			<Add option="-DWXUSINGDLL" />
 			<Add option="-DTIXML_USE_STL" />
 			<Add directory="$(#WX.include)" />
Title: Re: Directories layout changed
Post by: mandrav on February 13, 2007, 07:34:44 pm
Admittedly I didn't rebuild the windows projects today so I missed these. Thanks for pointing it out.
As for the ANSI version patch, I 'm not touching it until Tiwag or Seth sees it (they 're working with it). I don't even know if it is up to date...
Title: Re: Directories layout changed
Post by: stahta01 on February 13, 2007, 08:06:39 pm
Quote from: mandrav on February 13, 2007, 07:34:44 pm
Admittedly I didn't rebuild the windows projects today so I missed these. Thanks for pointing it out.
As for the ANSI version patch, I 'm not touching it until Tiwag or Seth sees it (they 're working with it). I don't even know if it is up to date...

It was NOT up to date, two or three projects were not being patched.

I uploaded my updated patch file to Berlios
[ Patch #1884 ] Updated ANSI build patch file ANSI_BUILD_cb-projectfiles.pat
https://developer.berlios.de/patch/?func=detailpatch&patch_id=1884&group_id=5358

Tim S
Title: Re: Directories layout changed
Post by: mandrav on February 13, 2007, 10:18:12 pm
Quote
It was NOT up to date, two or three projects were not being patched.

You missed my point: I 'm certain that this ANSI patch won't work because it references files in their old location.
Title: Re: Directories layout changed
Post by: stahta01 on February 13, 2007, 11:02:20 pm
Some files that may need fixed.

Code
Index: src/tools/cb_share_config/cb_share_config-unix.cbp
===================================================================
--- src/tools/cb_share_config/cb_share_config-unix.cbp	(revision 3601)
+++ src/tools/cb_share_config/cb_share_config-unix.cbp	(working copy)
@@ -26,10 +26,10 @@
 		<Linker>
 			<Add option="`wx-config --libs`" />
 			<Add library="txml" />
-			<Add directory="../../sdk/tinyxml" />
+			<Add directory="../../base/tinyxml" />
 		</Linker>
-		<Unit filename="../../sdk/tinyxml/tinywxuni.cpp" />
-		<Unit filename="../../sdk/tinyxml/tinywxuni.h" />
+		<Unit filename="../../base/tinyxml/tinywxuni.cpp" />
+		<Unit filename="../../base/tinyxml/tinywxuni.h" />
 		<Unit filename="app.cpp" />
 		<Unit filename="app.h" />
 		<Unit filename="mainframe.cpp" />
Index: src/tools/cb_share_config/Makefile.am
===================================================================
--- src/tools/cb_share_config/Makefile.am	(revision 3601)
+++ src/tools/cb_share_config/Makefile.am	(working copy)
@@ -4,9 +4,9 @@
 			-I$(top_srcdir)/src/include \
 			-I$(top_srcdir)/src/include/tinyxml
 
-cb_share_config_LDFLAGS = 
+cb_share_config_LDFLAGS =
 
-cb_share_config_LDADD =  -L../../sdk/tinyxml -ltinyxml \
+cb_share_config_LDADD =  -L../../base/tinyxml -ltinyxml \
 			$(WX_LIBS)
 
 cb_share_config_SOURCES = app.cpp \
Index: src/build_tools/scrooge/scrooge.cpp
===================================================================
--- src/build_tools/scrooge/scrooge.cpp	(revision 3602)
+++ src/build_tools/scrooge/scrooge.cpp	(working copy)
@@ -15,8 +15,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "../../sdk/tinyxml/tinystr.h"
-#include "../../sdk/tinyxml/tinyxml.h"
+#include "../../base/tinyxml/tinystr.h"
+#include "../../base/tinyxml/tinyxml.h"
 
 
 void ProcessFile(const char* fileName);
Title: Re: Directories layout changed
Post by: stahta01 on February 13, 2007, 11:04:08 pm
Quote from: mandrav on February 13, 2007, 10:18:12 pm
Quote
It was NOT up to date, two or three projects were not being patched.

You missed my point: I 'm certain that this ANSI patch won't work because it references files in their old location.

I just used my updated patch to make an ANSI Code::Blocks, so I am not sure what you mean.

Tim S
Title: Re: Directories layout changed
Post by: mandrav on February 13, 2007, 11:18:07 pm
Quote
I just used my updated patch to make an ANSI Code::Blocks, so I am not sure what you mean.

The ANSI projects patch is not maintained by me so I won't patch it.
And when I 'm saying it's not up-to-date anyway, I mean that it references the files in their old locations (before the restructuring). It's not only about tinyxml's dir but all the header files which used to be in sdk/ (and moved to include/) etc.
Title: Re: Directories layout changed
Post by: Biplab on February 14, 2007, 09:58:02 am
C::B Plugin Wizard has been updated to conform with latest directory layout changes.  :)

In Revision 3604.
Title: Re: Directories layout changed
Post by: mandrav on February 14, 2007, 01:54:59 pm
Quote from: Biplab on February 14, 2007, 09:58:02 am
C::B Plugin Wizard has been updated to conform with latest directory layout changes.  :)

In Revision 3604.

Ah, thanks :) (it was on my todo list).
Title: Re: Directories layout changed
Post by: Biplab on February 14, 2007, 01:55:43 pm
sdk.doxy file needs to patched. Patch file is attached with this post.  :)

Code
Index: src/sdk.doxy
===================================================================
--- src/sdk.doxy	(revision 3605)
+++ src/sdk.doxy	(working copy)
@@ -82,7 +82,7 @@
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ./sdk
+INPUT                  = ./include
 FILE_PATTERNS          = *.c \
                          *.cc \
                          *.cxx \
@@ -94,16 +94,16 @@
                          *.hpp \
                          *.h++
 RECURSIVE              = YES
-EXCLUDE                = ./sdk/tinyxml/ \
-                         ./sdk/wxscintilla/ \
-                         ./sdk/wxFlatNotebook/ \
-                         ./sdk/propgrid/ \
-                         ./sdk/as/ \
-                         ./sdk/scripting/include/ \
-                         ./sdk/scripting/lib/ \
-                         ./sdk/scripting/sqplus/ \
-                         ./sdk/scripting/sqstdlib/ \
-                         ./sdk/scripting/squirrel/
+EXCLUDE                = ./include/tinyxml/ \
+                         ./include/wxscintilla/ \
+                         ./include/wxFlatNotebook/ \
+                         ./include/propgrid/ \
+                         ./include/as/ \
+                         ./include/scripting/include/ \
+                         ./include/scripting/lib/ \
+                         ./include/scripting/sqplus/ \
+                         ./include/scripting/sqstdlib/ \
+                         ./include/scripting/squirrel/
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           =

There are two more problems I'm facing.

I have compiled Rev 3604 successfully with GCC-3.4.5 but didn't face the first problem.

[attachment deleted by admin]
Title: Re: Directories layout changed
Post by: mandrav on February 14, 2007, 02:52:19 pm
Quote
While compiling with GCC-4.1.1 the compilations stops at src/sdk/filemanager.cpp. Earlier I have compiled C::B several times with GCC-4.1.1 and never faced such problems.

Nothing to do with gcc. Manually delete sdk/*.gch (and sdk/autorevision.h) and then rebuild.

Quote
Autorevision is not working properly. Generating autorevision.h without Revision number.

The autorevision code has changed to use xml output from svn. Thomas knows better on what could be wrong with your setup but it works fine here.
Title: Re: Directories layout changed
Post by: tiwag on February 14, 2007, 03:27:04 pm
Quote from: mandrav on February 13, 2007, 07:34:44 pm
As for the ANSI version patch, I 'm not touching it until Tiwag or Seth sees it (they 're working with it)...

Quote from: stahta01 on February 13, 2007, 08:06:39 pm
I uploaded my updated patch file to Berlios
[ Patch #1884 ] Updated ANSI build patch file ANSI_BUILD_cb-projectfiles.pat
https://developer.berlios.de/patch/?func=detailpatch&patch_id=1884&group_id=5358

thanks tim !

since i sent my notebook with Win98 into retirement at end of 2006
i don't have any 16bit WinOS for testing ansi builds ....

should we delete the ansi patch file from svn ?
or is anyone working with it and still does provide ansi builds ?

thx --tiwag
Title: Re: Directories layout changed
Post by: killerbot on February 14, 2007, 03:42:53 pm
seth does provide from time to time an ansi build
Title: Re: Directories layout changed
Post by: stahta01 on February 14, 2007, 04:14:37 pm
Quote from: tiwag on February 14, 2007, 03:27:04 pm
Quote from: mandrav on February 13, 2007, 07:34:44 pm
As for the ANSI version patch, I 'm not touching it until Tiwag or Seth sees it (they 're working with it)...

Quote from: stahta01 on February 13, 2007, 08:06:39 pm
I uploaded my updated patch file to Berlios
[ Patch #1884 ] Updated ANSI build patch file ANSI_BUILD_cb-projectfiles.pat
https://developer.berlios.de/patch/?func=detailpatch&patch_id=1884&group_id=5358

thanks tim !

since i sent my notebook with Win98 into retirement at end of 2006
i don't have any 16bit WinOS for testing ansi builds ....

should we delete the ansi patch file from svn ?
or is anyone working with it and still does provide ansi builds ?

thx --tiwag

Removing it from SVN makes sense to me, I think we should create a wiki page with the information on it instead.

Tim S
Title: Re: Directories layout changed
Post by: tiwag on February 14, 2007, 04:33:26 pm
Quote from: stahta01 on February 14, 2007, 04:14:37 pm
Removing it from SVN makes sense to me, I think we should create a wiki page with the information on it instead.

ok, removed the ANSI_BUILD_cb-projectfiles.patch from svn

my latest patchfile vs. svn rev 3605 is attached here

--tiwag


[attachment deleted by admin]
Title: Re: Directories layout changed
Post by: MortenMacFly on February 14, 2007, 04:39:02 pm
Quote from: Biplab on February 14, 2007, 01:55:43 pm
sdk.doxy file needs to patched. Patch file is attached with this post.  :)
Applied that (with slightly modifications) in SVN. Thanks.
Have also uploaded another revision of the SDK docs (codeblocks_sdk_doc_r3605.chm). SDK hasn't changed which would be relevant to the docs... but I had done it anyway for testing... ;-)
Wit regards, Morten.
Ps.: @Yiannis: Would you move the chm to the usual position, please?!
Title: Re: Directories layout changed
Post by: Biplab on February 14, 2007, 04:50:11 pm
@Morten,

Thanks for the update.  :)

Today I've compiled the SDK Manual. It's now 4MB+ in size. But it lacks detailed graphs. ;)
Title: Re: Directories layout changed
Post by: sethjackson on February 14, 2007, 07:49:55 pm
Quote from: killerbot on February 14, 2007, 03:42:53 pm
seth does provide from time to time an ansi build

Yeah I haven't done one in awhile though.....

Maybe I should make one more often....
Title: Re: Directories layout changed
Post by: MortenMacFly on February 14, 2007, 08:08:35 pm
Quote from: Biplab on February 14, 2007, 04:50:11 pm
Today I've compiled the SDK Manual. It's now 4MB+ in size. But it lacks detailed graphs. ;)
I know. This is one of the modification I held back until now. IMHO you don't really need the call- and caller-graphs. At least I'm well without and it saves quite a lot of band-width. In the end if someone really needs them (s)he can compile her/himself. If people request them urgently back... they will return. No problem. ;-)
With regards, Morten.
Title: Re: Directories layout changed
Post by: jfpjr on February 15, 2007, 01:00:51 am
Where can I get the SDK Manual.
Title: Re: Directories layout changed
Post by: stahta01 on February 15, 2007, 01:13:43 am
Quote from: jfpjr on February 15, 2007, 01:00:51 am
Where can I get the SDK Manual.

http://developer.berlios.de/project/showfiles.php?group_id=5358

http://prdownload.berlios.de/codeblocks/codeblocks_sdk_doc_r3605.chm

Tim S
Title: Re: Directories layout changed
Post by: Biplab on February 15, 2007, 02:32:55 pm
I've compiled C::B with GCC-4.1.1 in Windows. I deleted the sdk folder and then downloaded again from svn. That solved the problem.

SVN number problem is solved. But there is one more issue. In the start page the the SVN date is wrongly printed. Please look at the following line which I'm getting in the Start Page.

Quote
svn build  rev 3607 (2007-02-14T15:36:18.174745Z)   gcc 4.1.1 Windows/unicode

svn info --xml --non-interactive command returns date as-
Quote
<date>2007-02-14T15:36:18.174745Z</date>

It needs to be parsed properly by autorevision.exe before it generates autorevision.h file. I'm using the following patch to solve the problem.

Code
Index: src/build_tools/autorevision/autorevision.cpp
===================================================================
--- src/build_tools/autorevision/autorevision.cpp	(revision 3607)
+++ src/build_tools/autorevision/autorevision.cpp	(working copy)
@@ -123,7 +123,11 @@
             revision = e->Attribute("revision") ? e->Attribute("revision") : "";
             TiXmlElement *d = e->FirstChildElement("date");
             if(d && d->GetText())
+            {
                 date = d->GetText();
+                date = date.substr(0, date.find_first_of('T')) + " "
+                    + date.substr(date.find_first_of('T') + 1, date.find_first_of('.') - date.find_first_of('T') - 1);
+            }
 
             return 1;
         }

Regards,

Biplab :D
Title: Re: Directories layout changed
Post by: killerbot on February 16, 2007, 05:17:43 pm
also onlinux there's such a problem :

Quote
svn build rev 3609 (2007-02-15T15:43:11.509615Z) gcc 4.1.2 Linux/unicode