[pkg-java] r15523 - in trunk/maven-ant-helper: . debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-12-10 07:29:08 +0000 (Sat, 10 Dec 2011)
New Revision: 15523

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/maven-build.xml
Log:
Better handling of install in local-repo during build.

Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2011-12-10 02:25:57 UTC (rev 15522)
+++ trunk/maven-ant-helper/debian/changelog	2011-12-10 07:29:08 UTC (rev 15523)
@@ -1,3 +1,9 @@
+maven-ant-helper (7.6) UNRELEASED; urgency=low
+
+  * Better handling of install in local-repo during build.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 09 Dec 2011 22:39:40 +0100
+
 maven-ant-helper (7.5) unstable; urgency=low
 
   * Use Java 1.5 for compiling and source level compatibility

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2011-12-10 02:25:57 UTC (rev 15522)
+++ trunk/maven-ant-helper/maven-build.xml	2011-12-10 07:29:08 UTC (rev 15523)
@@ -204,9 +204,12 @@
 
         <pathconvert property="groupPath">
             <path location="${groupId}"/>
-            <filtermapper>
-                <replacestring from="." to="/"/>
-            </filtermapper>
+            <mapper>
+            <chainedmapper>
+                <globmapper from="${basedir}/*" to="*" />
+                <unpackagemapper from="*" to="*"/>
+            </chainedmapper>
+            </mapper>
         </pathconvert>
 
         <echo message="Properties read from the POM file:" />
@@ -389,15 +392,20 @@
     </target>
 
     <target name="local-install" depends="jar">
-        <mkdir dir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${version}" />
-        <copy file="${pom.file}" tofile="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${version}/${artifactId}-${version}.pom" />
+        <mkdir dir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${debianVersion}" />
+        <copy file="${pom.file}" tofile="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${debianVersion}/${artifactId}-${debianVersion}.pom" />
         <c:if>
           <or>
             <equals arg1="${type}" arg2="jar" />
             <equals arg1="${type}" arg2="bundle" />
           </or>
           <then>
-            <copy file="${build.directory}/${artifactId}-${version}.jar" todir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/" />
+              <copy todir="${debian.dir}/.mh/maven-repo/${groupPath}/${artifactId}/${debianVersion}/">
+                <fileset dir="${build.directory}">
+                    <include name="${artifactId}-${version}.jar"/>
+                </fileset>
+                <regexpmapper from="^(.*)-${version}.jar$$" to="\1-${debianVersion}.jar"/>
+              </copy>
           </then>
         </c:if>
     </target>