new wxSmith merge to trunk : svn problem

[killerbot]

svn won't update, I always get the following error :

svn: Failed to add directory 'src/plugins/contrib/wxSmith/properties': object of the same name already exists

what's the best way to solve this ??

I was trying this on linux, haven't tried yet on windows.

[straka.milan]

Well, i simply deleted directory wxSmith and did svn update. It worked after that.

[Der Meister]

Just delete that directory. Although svn tries to delete the directory it obviously failed to do so, probably because the directory was not empty (the files generated by the autotools like Makefile. svn does not know about them, thus it doesn't delete them and thus can't delete the directory).

Maybe it is even better to delete the whole wxSmith directory to get rid of old stuff like old Makefiles, etc.. At least I don't want to check out whether keeping this old stuff would generate some problems

[killerbot]

that fixed it for me too  :lol:

[killerbot]

but were you able to build ??

Making all in wxSmith
make[4]: Entering directory `/home/killerbot/Documents/CodeBlocksDev/trunk/src/plugins/contrib/wxSmith'
make[4]: *** No rule to make target `all'.  Stop.
make[4]: Leaving directory `/home/killerbot/Documents/CodeBlocksDev/trunk/src/plugins/contrib/wxSmith'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/home/killerbot/Documents/CodeBlocksDev/trunk/src/plugins/contrib'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/killerbot/Documents/CodeBlocksDev/trunk/src/plugins'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/killerbot/Documents/CodeBlocksDev/trunk/src'
make: *** [all-recursive] Error 1

[killerbot]

hmm , I should do .configure again .. ?

[EDIT] :

config.status: error: cannot find input file: src/plugins/contrib/wxSmith/Makefile.in

[straka.milan]

Yes, you must ./configure --enable-contrib, deleting the directory deleted the generated Makefile.

[straka.milan]

I even had to bootstrap it.

[EDIT]:  :?, bootstrap is not working... :?

[killerbot]

killerbot@thorgal:~/Documents/CodeBlocksDev/trunk> ./bootstrap
configure.in:238: required file `src/plugins/contrib/wxSmith/defwidgets/Makefile.in' not found
configure.in:238: required file `src/plugins/contrib/wxSmith/resources/Makefile.in' not found
configure.in:238: required file `src/plugins/contrib/wxSmith/smithicons/Makefile.in' not found

we need to modify our configure.in at trunk level :-( , calling the Don, calling the Don

[straka.milan]

Well, the configure.in says there are Makefiles in wxSmith/defwidges, properties, resources and smithicons...
When changed the section with wxSmith to

Code Select Expand

  src/plugins/contrib/wxSmith/Makefile
  src/plugins/contrib/wxSmith/properties/Makefile
  src/plugins/contrib/wxSmith/wxwidgets/Makefile
  src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile
  src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile
  src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile
, it bootstrapped. I hope it will compile too )

[Der Meister]

You are right, but I think you missed one directory: src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile

Here is a small patch, that worked for me (bootstrap only, didn't do more):

Code Select Expand


Index: configure.in
===================================================================
--- configure.in        (revision 3522)
+++ configure.in        (working copy)
@@ -218,10 +218,11 @@
        src/plugins/contrib/symtab/resources/Makefile
        src/plugins/contrib/regex_testbed/Makefile
        src/plugins/contrib/wxSmith/Makefile
-       src/plugins/contrib/wxSmith/defwidgets/Makefile
        src/plugins/contrib/wxSmith/properties/Makefile
-       src/plugins/contrib/wxSmith/resources/Makefile
-       src/plugins/contrib/wxSmith/smithicons/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/defitems/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/properties/Makefile
+       src/plugins/contrib/wxSmith/wxwidgets/icons/Makefile
        src/scripts/Makefile   
        src/tools/Makefile     
        src/tools/cb_share_config/Makefile


[killerbot]

hehe, the boss committed :-)

[byo]

Sorry for this inconvenience. I don't have access to root folder so the boss had to do this. And we were little bit out of sync

[straka.milan]

But it doesn't build, there is a mistake in wxSmith/wxwidgets/Makefile. It definitely should not contain references to defwidgets/..., but defitems/... instead!

[EDIT:] Replacing them manually in Makefile helped, so it should be enough to correct it in Makefile.am and bootstrap & configure.

[EDIT2:] Giving up, another error in wxssettings.cpp

Code Select Expand

./wxssettings.cpp: In member function 'void wxsSettings::OnDragTargetColClick(wxCommandEvent&)':
./wxssettings.cpp:249: error: '::wxGetColourFromUser' has not been declared
./wxssettings.cpp: In member function 'void wxsSettings::OnDragParentColClick(wxCommandEvent&)':
./wxssettings.cpp:258: error: '::wxGetColourFromUser' has not been declared
make[5]: *** [wxssettings.lo] Error 1


I am going to bed

[killerbot]

ok, I have a look at that one, probably missing include

#include <wx/colordlg.h>

[edit] committed the include fix, I'll leave the Makefile.am to byo