brett 2004/05/12 06:12:53
Modified: native plugin.jelly
native/xdocs changes.xml
Log:
PR: MPNATIVE-4
Submitted by: Joachim Bader
Add configurable linker and compiler arguments
Revision Changes Path
1.11 +30 -0 maven-plugins/native/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/native/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 10 May 2004 23:38:03 -0000 1.10
+++ plugin.jelly 12 May 2004 13:12:53 -0000 1.11
@@ -50,9 +50,39 @@
<cc outfile="${maven.build.dir}/native/_" link="${maven.native.link}"
debug="${maven.native.debug}">
<compiler name="${maven.native.compiler.name}">
<compilerparam name="target" value="${maven.native.compiler.target}"/>
+
+ <util:tokenize var="argumentList" delim=" "
trim="true">${maven.native.compiler.arg.start}</util:tokenize>
+ <j:forEach var="arg" items="${argumentList}">
+ <compilerarg location="start" value="${arg}"/>
+ </j:forEach>
+
+ <util:tokenize var="argumentList" delim=" "
trim="true">${maven.native.compiler.arg.mid}</util:tokenize>
+ <j:forEach var="arg" items="${argumentList}">
+ <compilerarg location="mid" value="${arg}"/>
+ </j:forEach>
+
+ <util:tokenize var="argumentList" delim=" "
trim="true">${maven.native.compiler.arg.end}</util:tokenize>
+ <j:forEach var="arg" items="${argumentList}">
+ <compilerarg location="end" value="${arg}"/>
+ </j:forEach>
</compiler>
<linker name="${maven.native.linker.name}">
<linkerparam name="target" value="${maven.native.linker.target}"/>
+
+ <util:tokenize var="argumentList" delim=" "
trim="true">${maven.native.linker.arg.start}</util:tokenize>
+ <j:forEach var="arg" items="${argumentList}">
+ <linkerarg location="start" value="${arg}"/>
+ </j:forEach>
+
+ <util:tokenize var="argumentList" delim=" "
trim="true">${maven.native.linker.arg.mid}</util:tokenize>
+ <j:forEach var="arg" items="${argumentList}">
+ <linkerarg location="mid" value="${arg}"/>
+ </j:forEach>
+
+ <util:tokenize var="argumentList" delim=" "
trim="true">${maven.native.linker.arg.end}</util:tokenize>
+ <j:forEach var="arg" items="${argumentList}">
+ <linkerarg location="end" value="${arg}"/>
+ </j:forEach>
</linker>
<fileset dir="${maven.native.src}"
includes="${maven.native.src.includes}" excludes="${maven.native.src.excludes}"/>
<j:if test="${jniFilesPresent == 'true'}">
1.3 +4 -2 maven-plugins/native/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/native/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 25 Apr 2004 02:34:08 -0000 1.2
+++ changes.xml 12 May 2004 13:12:53 -0000 1.3
@@ -25,8 +25,10 @@
</properties>
<body>
<release version="1.1-SNAPSHOT" date="in CVS">
- <action dev="brett" type="fix" issue="MPNATIVE-3" due-to="Joachim Bader">Use
properties more</action>
- <action dev="brett" type="fix" issue="MPNATIVE-1" due-to="Joachim Bader">Help
javah work on all JDK features</action>
+ <action dev="brett" type="add" issue="MPNATIVE-5" due-to="Joachim Bader">add
src includes/excludes.</action>
+ <action dev="brett" type="add" issue="MPNATIVE-4" due-to="Joachim
Bader">Linker and compiler argument passing.</action>
+ <action dev="brett" type="add" issue="MPNATIVE-3" due-to="Joachim Bader">Use
properties more.</action>
+ <action dev="brett" type="fix" issue="MPNATIVE-1" due-to="Joachim Bader">Help
javah work on all JDK features.</action>
</release>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
