Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR: MPNATIVE-13

Browse Source 
Submitted by: baleineca
Jelly tokenize incorrect behaviour


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@368479 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-01-12 21:42:49 +00:00
parent dd22ab9f22
commit bfec9260d2
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
native/plugin.jelly
View File

@ -115,20 +115,17 @@
<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"/>
<!-- 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'}">
<!-- 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>
<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'}">

1
native/xdocs/changes.xml
View File

@ -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>