Author: ltheussl
Date: Thu Jan 12 13:54:47 2006
New Revision: 368484
URL: http://svn.apache.org/viewcvs?rev=368484&view=rev
Log:
PR: MPNATIVE-14
Submitted by: Marcus Crafter
Add dependency classpath to call to javah
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=368484&r1=368483&r2=368484&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/native/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/native/plugin.jelly Thu Jan 12 13:54:47 2006
@@ -232,6 +232,17 @@
</j:forEach>
</j:forEach>
+ <!-- Determine classpath to pass to javah -->
+ <j:set var="depclasspath" value=""/>
+ <j:forEach var="lib" items="${pom.artifacts}">
+ <j:set var="dep" value="${lib.dependency}"/>
+ <j:if test="${dep.getProperty('native.ignorejniheader')!='false'}">
+ <j:if test="${dep.type =='jar'}">
+ <j:set var="depclasspath"
value="${depclasspath}${systemScope.getProperty('path.separator')}${lib.path}"/>
+ </j:if>
+ </j:if>
+ </j:forEach>
+
<j:if test="${compileJNI == 'true'}">
<ant:echo>Running Javah on java classes</ant:echo>
<mkdir dir="${maven.build.dir}/native/jni"/>
@@ -260,7 +271,7 @@
<property environment="env"/>
<exec executable="${env.JAVA_HOME}/bin/javah">
<arg line="-d ${maven.build.dir}/native/jni"/>
- <arg line="-classpath ${maven.build.dest}"/>
+ <arg line="-classpath ${maven.build.dest}${depclasspath}"/>
<j:forEach var="file" items="${classFiles.iterator()}">
<j:set var="isNative" value="false"/>
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=368484&r1=368483&r2=368484&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:54:47
2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.2-SNAPSHOT" date="in CVS">
+ <action dev="ltheussl" type="fix" issue="MPNATIVE-14" due-to="Marcus
Crafter">Add dependency classpath to call to javah.</action>
<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>
