« previous next »
Pages: [1] 2  All   Go Down

Author Topic: Directories layout changed  (Read 26281 times)

Offline mandrav

  • Project Leader
  • Administrator
  • Lives here!
  • *****
  • Posts: 4315
    • Code::Blocks IDE
Directories layout changed
« 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/):

  • All SDK header files have moved from sdk/ to include/.
  • TinyXML source files have moved from sdk/tinyxml/ to base/tinyxml/ (here's where libtxml.a is created)
  • sdk/autorevision.h is now generated as include/autorevision.h
  • The PCH files are also generated under include/ now.
  • All project files have been updated (still have to check the windows ones though)


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.
« Last Edit: February 13, 2007, 02:00:11 pm by mandrav »
Logged
Be patient!
This bug will be fixed soon...

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7809
    • My Best Post
Re: Directories layout changed
« Reply #1 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" />
« Last Edit: February 13, 2007, 04:49:15 pm by stahta01 »
Logged
C Programmer working to learn more about C++.
On Windows 10 64 bit and Windows 11 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7809
    • My Best Post
Re: Directories layout changed
« Reply #2 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)" />
Logged
C Programmer working to learn more about C++.
On Windows 10 64 bit and Windows 11 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline mandrav

  • Project Leader
  • Administrator
  • Lives here!
  • *****
  • Posts: 4315
    • Code::Blocks IDE
Re: Directories layout changed
« Reply #3 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...
Logged
Be patient!
This bug will be fixed soon...

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7809
    • My Best Post
Re: Directories layout changed
« Reply #4 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
Logged
C Programmer working to learn more about C++.
On Windows 10 64 bit and Windows 11 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline mandrav

  • Project Leader
  • Administrator
  • Lives here!
  • *****
  • Posts: 4315
    • Code::Blocks IDE
Re: Directories layout changed
« Reply #5 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.
Logged
Be patient!
This bug will be fixed soon...

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7809
    • My Best Post
Re: Directories layout changed
« Reply #6 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);
Logged
C Programmer working to learn more about C++.
On Windows 10 64 bit and Windows 11 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline stahta01

  • Lives here!
  • ****
  • Posts: 7809
    • My Best Post
Re: Directories layout changed
« Reply #7 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
Logged
C Programmer working to learn more about C++.
On Windows 10 64 bit and Windows 11 64 bit.
--
When in doubt, read the CB WiKi FAQ. http://wiki.codeblocks.org

Offline mandrav

  • Project Leader
  • Administrator
  • Lives here!
  • *****
  • Posts: 4315
    • Code::Blocks IDE
Re: Directories layout changed
« Reply #8 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.
Logged
Be patient!
This bug will be fixed soon...

Offline Biplab

  • Developer
  • Lives here!
  • *****
  • Posts: 1874
    • Biplab's Blog
Re: Directories layout changed
« Reply #9 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.
Logged
Be a part of the solution, not a part of the problem.

Offline mandrav

  • Project Leader
  • Administrator
  • Lives here!
  • *****
  • Posts: 4315
    • Code::Blocks IDE
Re: Directories layout changed
« Reply #10 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).
Logged
Be patient!
This bug will be fixed soon...

Offline Biplab

  • Developer
  • Lives here!
  • *****
  • Posts: 1874
    • Biplab's Blog
Re: Directories layout changed
« Reply #11 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.
  • 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.
  • Errors
    • Redefinition of FileManager::FileManager(), already defined in filemanager.h
    • One more error with FileManager::~FileManager()
  • Autorevision is not working properly. Generating autorevision.h without Revision number.

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

[attachment deleted by admin]
Logged
Be a part of the solution, not a part of the problem.

Offline mandrav

  • Project Leader
  • Administrator
  • Lives here!
  • *****
  • Posts: 4315
    • Code::Blocks IDE
Re: Directories layout changed
« Reply #12 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.
Logged
Be patient!
This bug will be fixed soon...

Offline tiwag

  • Developer
  • Lives here!
  • *****
  • Posts: 1196
  • sailing away ...
    • tiwag.cb
Re: Directories layout changed
« Reply #13 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
Logged

Offline killerbot

  • Administrator
  • Lives here!
  • *****
  • Posts: 5537
Re: Directories layout changed
« Reply #14 on: February 14, 2007, 03:42:53 pm »
seth does provide from time to time an ansi build
Logged
Pages: [1] 2  All   Go Up
« previous next »