Author: ltheussl
Date: Thu Jan 12 13:42:49 2006
New Revision: 368479
URL: http://svn.apache.org/viewcvs?rev=368479&view=rev
Log:
PR: MPNATIVE-13
Submitted by: baleineca
Jelly tokenize incorrect behaviour
Modified:
maven/maven-1/plugins/trunk/native/plugin.jelly
maven/maven-1/plugins/trunk/native/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/native/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/native/plugin.jelly?rev=368479&r1=368478&r2=368479&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/native/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/native/plugin.jelly Thu Jan 12 13:42:49 2006
@@ -115,21 +115,18 @@
<j:forEach var="lib" items="${pom.artifacts}">
<j:set var="dep" value="${lib.dependency}"/>
- <!-- include sos-->
- <j:if test="${dep.type=='so' or dep.type=='dll'}">
- <j:set var="delim" value="lib"/>
-
- <!-- replace ${delim} in the name -->
- <util:tokenize var="libnameTokenizer" delim="${delim}"
trim="true">${dep.artifactId}</util:tokenize>
- <j:forEach var="libnamePart" items="${libnameTokenizer}"
varStatus="index">
- <j:if test="${index == 0}">
- <j:set var="libname" value="${libnamePart}"/>
- </j:if>
- <j:if test="${index > 0}">
- <j:set var="libname"
value="${libname}${delim}${libnamePart}"/>
- </j:if>
- </j:forEach>
+ <!-- include static and dynamic libraries for various platforms
(so, a, dll, lib) -->
+ <j:if test="${dep.type=='so' or dep.type=='dll' or dep.type=='a'
or dep.type=='lib'}">
+ <j:set var="libname" value="${dep.artifactId}"/>
+
+ <!-- remove ${delim} prefix in the name -->
+ <!-- only 'so' and 'a' type, we could have a
name starting with 'lib'. -->
+ <j:if test="${dep.type=='so' or dep.type=='a'}">
+ <j:set var="delim" value="lib"/>
+ <j:set var="libname"
value="${libname.substring(delim.length())}"/>
+ </j:if>
+
<!-- use syslibst or libset -->
<j:if test="${dep.getProperty('native.syslib') != 'true'}">
<libset dir="${lib.file.parent}"
libs="${libname}-${dep.version}"/>
Modified: maven/maven-1/plugins/trunk/native/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/native/xdocs/changes.xml?rev=368479&r1=368478&r2=368479&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/native/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/native/xdocs/changes.xml Thu Jan 12 13:42:49
2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.2-SNAPSHOT" date="in CVS">
+ <action dev="ltheussl" type="fix" issue="MPNATIVE-13"
due-to="baleineca">Jelly tokenize incorrect behaviour.</action>
<action dev="brett" type="add" due-to="baleineca">Checking for runtime
property and adding it. Default to "dynamic" if not present.</action>
<action dev="brett" type="fix" issue="MPNATIVE-10" due-to="Joachim
Bader">Add DLL support to the plugin</action>
<action dev="brett" type="fix" issue="MPNATIVE-7" due-to="Joachim
Bader">Changed repository location of libraries from <code>so</code> to
<code>sos</code> so Maven can handle them as dependencies</action>
