Missing resources after merging with xml_ompile branch

[daniloz]

The plugins\compilergcc\resources\compilers\*.xml files are missing, i.e. are not copied to devel/output and codeblocks complains that it cannot found the options_xxx.xml for the compiler.

my fix in src\update.bat

Code Select Expand


diff --git a/src/update.bat b/src/update.bat
index b860d27..6ef494d 100644
--- a/src/update.bat
+++ b/src/update.bat
@@ -22,6 +22,7 @@ if not exist %CB_OUTPUT_RESDIR%\plugins md %CB_OUTPUT_RESDIR%\plugins\
if not exist %CB_OUTPUT_RESDIR%\templates md %CB_OUTPUT_RESDIR%\templates\
if not exist %CB_OUTPUT_RESDIR%\templates\wizard md %CB_OUTPUT_RESDIR%\templates\wizard\
if not exist %CB_OUTPUT_RESDIR%\scripts md %CB_OUTPUT_RESDIR%\scripts\
+if not exist %CB_OUTPUT_RESDIR%\compilers md %CB_OUTPUT_RESDIR%\compilers\
if not exist %CB_OUTPUT_RESDIR%\SpellChecker md %CB_OUTPUT_RESDIR%\SpellChecker\
if not exist devel md devel\
if not exist devel\share md devel\share\
@@ -35,6 +36,7 @@ if not exist %CB_DEVEL_RESDIR%\plugins md %CB_DEVEL_RESDIR%\plugins\
if not exist %CB_DEVEL_RESDIR%\templates md %CB_DEVEL_RESDIR%\templates\
if not exist %CB_DEVEL_RESDIR%\templates\wizard md %CB_DEVEL_RESDIR%\templates\wizard\
if not exist %CB_DEVEL_RESDIR%\scripts md %CB_DEVEL_RESDIR%\scripts\
+if not exist %CB_DEVEL_RESDIR%\compilers md %CB_DEVEL_RESDIR%\compilers\
if not exist %CB_DEVEL_RESDIR%\SpellChecker md %CB_DEVEL_RESDIR%\SpellChecker\

set ZIPCMD=C:\MinGW32\bin\zip
@@ -84,6 +86,8 @@ xcopy /D /y src\resources\images\16x16\*.png %CB_DEVEL_RESDIR%\images\16x16 > nu
xcopy /D /y src\resources\images\16x16\*.png %CB_OUTPUT_RESDIR%\images\16x16 > nul
xcopy /D /y plugins\codecompletion\resources\images\*.png %CB_DEVEL_RESDIR%\images\codecompletion > nul
xcopy /D /y plugins\codecompletion\resources\images\*.png %CB_OUTPUT_RESDIR%\images\codecompletion > nul
+xcopy /D /y plugins\compilergcc\resources\compilers\*.xml %CB_DEVEL_RESDIR%\compilers > nul
+xcopy /D /y plugins\compilergcc\resources\compilers\*.xml %CB_OUTPUT_RESDIR%\compilers > nul
echo Makefile.am > excludes.txt
echo Makefile.in >> excludes.txt
echo \.svn\ >> excludes.txt


Sorry, i don't have time now to produce an svn-compatible diff..... will do later if required. (please let me know...)

[ollydbg]

En, I see the same issue. Thanks for your patch, should be commit to trunk.

[MortenMacFly]

Looking at this file:
http://svn.berlios.de/wsvn/codeblocks/trunk/src/update.bat
...the commands are in place (just after the "lexers" folder). Did you miss an update?

BTW: I've fixed some other stuff anyways.

[Jenna]

Looking at this file:
http://svn.berlios.de/wsvn/codeblocks/trunk/src/update.bat
...the commands are in place (just after the "lexers" folder). Did you miss an update?

It seems, he uses a modified update.bat.
Spellchecker is not in it normally and should not be.
Contrib-plugins have to care for their stuff themselves and should not depend on the core's update-script.

It might be that svn was not able to update the file due to the conflict.