[Qt-jambi-interest] [PATCH 0/5] community-port-to-4_6: build merged into master - rationale

[Francis Galiegue]

Following two discussions (one dating back to a few months, another, recently,
with Helge Fredriksen), it seemed that the only obstacle to merging the build
branch into master was really ant-contrib, and the murky legal grounds around
it.

I have therefore decided to lift that limitation with a simple fact:

* ant-contrib cannot be bundled, in binary form, into qt-jambi;
* but we can as well download it and source it: nothing prevents us from doing
  this.

This has allowed me to kill two birds with one stone:

* it lifts the license limitations: ant-contrib is still not part of the
  repository;
* the (now former) build branch gets much more exposure.

I'm all the more confident that the merges with the master branch went smoothly
enough, since the changes were orthogonal: Helge and Eskil touched the type
system, I touched the build system - no conflicts.

So there, the community repository, by the time you get this mail, will have
undergone quite a few changes, so remember to:

$ git pull

on the appropriate tracking branch, start playing with it and give feedback.

This patch series merely shows the five commits that led me to think, "now is
the time".

Francis Galiegue (5):
  New file antcontrib.properties
  Source antcontrib.properties from setenv.xml
  Move the <dotimestamp> macro definition from build.xml to setenv.xml
  setenv.xml: create targets check.antcontrib, get.antcontrib,
    source.antcontrib
  Don't require ant-contrib.jar to be in the classpath anymore

 antcontrib.properties |   14 +++++++++
 build.xml             |   14 +--------
 setenv.xml            |   76 +++++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 85 insertions(+), 19 deletions(-)
 create mode 100644 antcontrib.properties