build.xml update

This pull request contains the changes on build.xml, anyway I see that there are others commits, I think because I realigned my git tree with your at certain point.

If you don't like this I can try to rebase my tree with your and then make another pull request.