ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1507621 - in /ant/easyant/plugins/trunk/source-jar: module.ivy src/main/resources/source-jar.ant src/test/antunit/source-jar-test.xml
Date Sat, 27 Jul 2013 09:50:40 GMT
Author: jlboudart
Date: Sat Jul 27 09:50:40 2013
New Revision: 1507621

URL: http://svn.apache.org/r1507621
Log:
Rely on main.sources and test sources properties

Modified:
    ant/easyant/plugins/trunk/source-jar/module.ivy
    ant/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant
    ant/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml

Modified: ant/easyant/plugins/trunk/source-jar/module.ivy
URL: http://svn.apache.org/viewvc/ant/easyant/plugins/trunk/source-jar/module.ivy?rev=1507621&r1=1507620&r2=1507621&view=diff
==============================================================================
--- ant/easyant/plugins/trunk/source-jar/module.ivy (original)
+++ ant/easyant/plugins/trunk/source-jar/module.ivy Sat Jul 27 09:50:40 2013
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <ivy-module version="2.0" xmlns:ea="http://www.easyant.org">
-    <info organisation="org.apache.easyant.plugins" module="source-jar" revision="0.9">
+    <info organisation="org.apache.easyant.plugins" module="source-jar" revision="0.10">
         <extends organisation="org.apache.easyant.plugins" module="parent-plugin" revision="0.1"
location="../parent.ivy" />
         <description>
             <p>This module provides source jar packaging feature.</p>

Modified: ant/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant
URL: http://svn.apache.org/viewvc/ant/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant?rev=1507621&r1=1507620&r2=1507621&view=diff
==============================================================================
--- ant/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant (original)
+++ ant/easyant/plugins/trunk/source-jar/src/main/resources/source-jar.ant Sat Jul 27 09:50:40
2013
@@ -18,15 +18,16 @@
     <ea:core-version requiredrevision="[0.9,+]" />
     <ea:plugin module="abstract-package" revision="0.9" />
 
-    <target name="source-jar:init" depends="abstract-package:init">
-        <ea:parameter property="target.artifacts.main.source.jar.name" default="${module.name}-sources.jar"
+    <target name="source-jar:init" depends="abstract-package:init,abstract-compile:compile-ready">
+    	<ea:parameter property="main.sources" required="true" description="directory where
sources to be compiled are. This property should be reused by other plugins to locate sources."/>
+        <ea:parameter property="test.sources" required="true" description="directory where
test sources to be compiled are. This property should be reused by other plugins to locate
sources."/>
+    	
+    	<ea:parameter property="target.artifacts.main.source.jar.name" default="${module.name}-sources.jar"
             description="main source artifact file name" />
 
         <ea:parameter property="target.artifacts.test.source.jar.name" default="${module.name}-test-sources.jar"
             description="test source artifact file name" />
 
-        <ea:parameter property="src.main.java" default="${basedir}/src/main/java" description="directory
where main java files are stored" />
-        <ea:parameter property="src.test.java" default="${basedir}/src/test/java" description="directory
where test java files are stored" />
         <ea:parameter property="src.main.resources" default="${basedir}/src/main/resources"
             description="directory where main resources files are stored" />
         <ea:parameter property="src.test.resources" default="${basedir}/src/test/resources"
@@ -35,14 +36,14 @@
 
         <condition property="has.src.main">
             <or>
-                <available file="${src.main.java}" />
+                <available file="${main.sources}" />
                 <available file="${src.main.resources}" />
             </or>
         </condition>
 
         <condition property="has.src.test">
             <or>
-                <available file="${src.test.java}" />
+                <available file="${test.sources}" />
                 <available file="${src.test.resources}" />
             </or>
         </condition>
@@ -55,7 +56,7 @@
         <mkdir dir="${target.artifacts}" />
         <jar destfile="${target.artifacts}/${target.artifacts.main.source.jar.name}">
             <fileset dir="${src.main.resources}" erroronmissingdir="false" />
-            <fileset dir="${src.main.java}" erroronmissingdir="false" />
+            <fileset dir="${main.sources}" erroronmissingdir="false" />
         </jar>
         <ea:registerartifact type="source" ext="jar" classifier="sources" settingsRef="${project.ivy.instance}"
             confs="${src.publish.conf}" />
@@ -68,7 +69,7 @@
         <mkdir dir="${target.artifacts}" />
         <jar destfile="${target.artifacts}/${target.artifacts.test.source.jar.name}">
             <fileset dir="${src.test.resources}" erroronmissingdir="false" />
-            <fileset dir="${src.test.java}" erroronmissingdir="false" />
+            <fileset dir="${test.sources}" erroronmissingdir="false" />
         </jar>
         <ea:registerartifact type="test-source" ext="jar" classifier="test-sources" settingsRef="${project.ivy.instance}"
             confs="${src.publish.conf}" />

Modified: ant/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml
URL: http://svn.apache.org/viewvc/ant/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml?rev=1507621&r1=1507620&r2=1507621&view=diff
==============================================================================
--- ant/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml (original)
+++ ant/easyant/plugins/trunk/source-jar/src/test/antunit/source-jar-test.xml Sat Jul 27 09:50:40
2013
@@ -19,7 +19,10 @@
     
     <!-- Import your plugin -->
     <property name="target" value="target/test-antunit" />
-    <!-- configure easyant in current project -->
+    <property name="main.sources" value="${basedir}/src/main/java"/>
+    <property name="test.sources" value="${basedir}/src/test/java"/>
+	
+	<!-- configure easyant in current project -->
     <ea:configure-easyant-ivy-instance />
     <!-- import our local plugin -->
     <ea:import-test-module moduleIvy="../../../module.ivy" sourceDirectory="../../main/resources"
/>
@@ -42,8 +45,6 @@
     <target name="test-source-jar:init" depends="source-jar:init">
         <au:assertPropertyEquals name="target.artifacts.main.source.jar.name" value="${module.name}-sources.jar"
/>
         <au:assertPropertyEquals name="target.artifacts.test.source.jar.name" value="${module.name}-test-sources.jar"
/>
-        <au:assertPropertyEquals name="src.main.java" value="${basedir}/src/main/java"
/>
-        <au:assertPropertyEquals name="src.test.java" value="${basedir}/src/test/java"
/>
         <au:assertPropertyEquals name="src.main.resources" value="${basedir}/src/main/resources"
/>
         <au:assertPropertyEquals name="src.test.resources" value="${basedir}/src/test/resources"
/>
         <au:assertPropertyEquals name="src.publish.conf" value="source" />



Mime
View raw message