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

PR: MPNATIVE-14

Browse Source 
Submitted by: Marcus Crafter
Add dependency classpath to call to javah


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

13
native/plugin.jelly
View File

@ -232,6 +232,17 @@
</j:forEach> </j:forEach>
</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'}"> <j:if test="${compileJNI == 'true'}">
<ant:echo>Running Javah on java classes</ant:echo> <ant:echo>Running Javah on java classes</ant:echo>
<mkdir dir="${maven.build.dir}/native/jni"/> <mkdir dir="${maven.build.dir}/native/jni"/>
@ -260,7 +271,7 @@
<property environment="env"/> <property environment="env"/>
<exec executable="${env.JAVA_HOME}/bin/javah"> <exec executable="${env.JAVA_HOME}/bin/javah">
<arg line="-d ${maven.build.dir}/native/jni"/> <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:forEach var="file" items="${classFiles.iterator()}">
<j:set var="isNative" value="false"/> <j:set var="isNative" value="false"/>

1
native/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.2-SNAPSHOT" date="in CVS"> <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="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="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-10" due-to="Joachim Bader">Add DLL support to the plugin</action>