You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/10/07 13:31:25 UTC
svn commit: r1395297 - in /incubator/easyant/plugins/trunk:
antcontrib-activator/ build-tools/src/main/resources/
build-tools/src/test/antunit/ clean-std/
meta-build-autoactivator/src/main/resources/
meta-build-autoactivator/src/test/antunit/
Author: jlboudart
Date: Sun Oct 7 13:31:24 2012
New Revision: 1395297
URL: http://svn.apache.org/viewvc?rev=1395297&view=rev
Log:
Fix buildtool excludes parttern, do not scan src/ lib/ target/ bin/ directories
Modified:
incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy
incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant
incubator/easyant/plugins/trunk/build-tools/src/test/antunit/build-tools-test.xml
incubator/easyant/plugins/trunk/clean-std/module.ivy
incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant
incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml
Modified: incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy?rev=1395297&r1=1395296&r2=1395297&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy (original)
+++ incubator/easyant/plugins/trunk/antcontrib-activator/module.ivy Sun Oct 7 13:31:24 2012
@@ -20,6 +20,7 @@
This module is in charge to load antcontrib taksdefs.
</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+<ea:plugin module="antunit" revision="0.9"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
Modified: incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant?rev=1395297&r1=1395296&r2=1395297&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant (original)
+++ incubator/easyant/plugins/trunk/build-tools/src/main/resources/build-tools.ant Sun Oct 7 13:31:24 2012
@@ -27,7 +27,7 @@
<ea:parameter property="submodule.dirs" description="pattern or comma-separated list indicating which submodules directories should be included in the build" default="**/*" />
<ea:parameter property="metabuild.root" description="root directory level of a metabuild project" default="${basedir}" />
<ea:parameter property="metabuild.includes" description="Pattern describing modules to include in a metabuild" default="${submodule.dirs}" />
- <ea:parameter property="metabuild.excludes" description="Pattern describing modules to exclude in a metabuild" default="src/ test/ lib/ WEB-INF/ classes/ bin/ module.ivy" />
+ <ea:parameter property="metabuild.excludes" description="Pattern describing modules to exclude in a metabuild" default="**/src/ **/lib/ **/target/ **/bin module.ivy"/>
<ea:parameter property="metabuild.mode" description="defines execution mode of metabuild feature (all,dependents,dependencies)" default="all" />
<fileset id="submodules.fileset" dir="${metabuild.root}" includes="${metabuild.includes}" excludes="${metabuild.excludes}">
Modified: incubator/easyant/plugins/trunk/build-tools/src/test/antunit/build-tools-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/build-tools/src/test/antunit/build-tools-test.xml?rev=1395297&r1=1395296&r2=1395297&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/build-tools/src/test/antunit/build-tools-test.xml (original)
+++ incubator/easyant/plugins/trunk/build-tools/src/test/antunit/build-tools-test.xml Sun Oct 7 13:31:24 2012
@@ -44,7 +44,7 @@
<au:assertPropertyEquals name="submodule.dirs" value="**/*"/>
<au:assertPropertyEquals name="metabuild.root" value="${basedir}"/>
<au:assertPropertyEquals name="metabuild.includes" value="${submodule.dirs}"/>
- <au:assertPropertyEquals name="metabuild.excludes" value="src/ test/ lib/ WEB-INF/ classes/ bin/ module.ivy"/>
+ <au:assertPropertyEquals name="metabuild.excludes" value="**/src/ **/lib/ **/target/ **/bin module.ivy"/>
<au:assertPropertyEquals name="metabuild.mode" value="all"/>
<au:assertReferenceSet refid="submodules.fileset"/>
<au:assertPropertyEquals name="current-module" value="${ivy.module}"/>
Modified: incubator/easyant/plugins/trunk/clean-std/module.ivy
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/clean-std/module.ivy?rev=1395297&r1=1395296&r2=1395297&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/clean-std/module.ivy (original)
+++ incubator/easyant/plugins/trunk/clean-std/module.ivy Sun Oct 7 13:31:24 2012
@@ -18,6 +18,7 @@
<info organisation="org.apache.easyant.plugins" module="clean-std" revision="0.9">
<description>This module provides project cleaning feature.</description>
<ea:build organisation="org.apache.easyant.buildtypes" module="build-std-ant-plugin" revision="0.1"/>
+ <ea:plugin module="antunit" revision="0.9"/>
</info>
<configurations>
<conf name="default" description="runtime dependencies artifact can be used with this conf"/>
Modified: incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant?rev=1395297&r1=1395296&r2=1395297&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant (original)
+++ incubator/easyant/plugins/trunk/meta-build-autoactivator/src/main/resources/meta-build-autoactivator.ant Sun Oct 7 13:31:24 2012
@@ -21,7 +21,7 @@
<ea:core-version requiredrevision="[0.9,+]" />
<ea:parameter property="metabuild.root" description="root directory level of a metabuild project" default="."/>
- <ea:parameter property="metabuild.excludes" description="Pattern describing modules to exclude in a metabuild" default="src/ test/ lib/ WEB-INF/ classes/ bin/ module.ivy" />
+ <ea:parameter property="metabuild.excludes" description="Pattern describing modules to exclude in a metabuild" default="**/src/ **/lib/ **/target/ **/bin module.ivy"/>
<ea:parameter property="metabuild.mode" description="defines execution mode of metabuild feature (all,dependents,dependencies)" default="all"/>
<ac:if>
@@ -56,7 +56,7 @@
</and>
<ac:then>
<echo>Multimodule project detected !</echo>
- <ea:build module="meta-build" revision="0.2"/>
+ <ea:build module="meta-build" revision="0.9"/>
</ac:then>
</ac:if>
Modified: incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml?rev=1395297&r1=1395296&r2=1395297&view=diff
==============================================================================
--- incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml (original)
+++ incubator/easyant/plugins/trunk/meta-build-autoactivator/src/test/antunit/meta-build-autoactivator-test.xml Sun Oct 7 13:31:24 2012
@@ -41,7 +41,7 @@
<target name="test-meta-build-autoactivator">
<au:assertPropertyEquals name="metabuild.root" value="."/>
- <au:assertPropertyEquals name="metabuild.excludes" value="src/ test/ lib/ WEB-INF/ classes/ bin/ module.ivy"/>
+ <au:assertPropertyEquals name="metabuild.excludes" value="**/src/ **/lib/ **/target/ **/bin module.ivy"/>
<au:assertPropertyEquals name="metabuild.mode" value="all"/>
</target>