Merging Code from FYP Branch into Old-Trunk Branch

Last academic year we had 3 Final Year Student projects related to Crackpot. I have started with merging code of these FYP projects from branches/FYP0809 into branches/oldtrunk (finally all these will be merged with the current trunk which has a refactored directory structure).

For merging, Eclipse editor is a good tool. I can compare any two directories using eclipse, merge each separate change from left to right or right to left (left and right are the two documents being compared).

Using CMake

CMake can be used for both generating multiple project files for multiple tests (GUI/Metaplanning/Logistics domain/whatever), as also cross-compilation with linux. I downloaded and installed cmake. After this, I followed the steps listed here in our context. Everything worked as expected. I also got separate project files for each unit test. This is good, and we should continue with CMake.