knielsen 2003/03/27 17:43:33
Modified: src/plugins-build/native plugin.jelly
Added: src/plugins-build/native/samples/helloworld project.xml
maven.xml .cvsignore
src/plugins-build/native/samples/helloworld/src/unix
HelloWorldImp.c
src/plugins-build/native/samples/helloworld/src/java/org/apache/maven/natives/sample/helloworld
HelloWorld.java
Log:
actually getting something to compile and run
Revision Changes Path
1.1 maven/src/plugins-build/native/samples/helloworld/project.xml
Index: project.xml
===================================================================
<?xml version="1.0"?>
<project>
<id>native-helloworld</id>
<name>Native Hello World</name>
<currentVersion>1.0</currentVersion>
<package>org.apache.maven.natives.sample.helloworld</package>
<!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
<build>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
</build>
</project>
1.1 maven/src/plugins-build/native/samples/helloworld/maven.xml
Index: maven.xml
===================================================================
<project default="java:jar"
xmlns:j="jelly:core"
xmlns:u="jelly:util"
xmlns:ant="jelly:ant"
xmlns:maven="jelly:maven"
xmlns:m="maven">
<goal name="runsample" description="run sample" prereqs="native:compile">
<java classname="org.apache.maven.natives.sample.helloworld.HelloWorld"
fork="yes">
<sysproperty key="java.library.path" value="${maven.build.dir}/native"/>
<classpath>
<pathelement path="${maven.build.dest}"/>
</classpath>
</java>
</goal>
</project>
1.1 maven/src/plugins-build/native/samples/helloworld/.cvsignore
Index: .cvsignore
===================================================================
target
.classpath
.project
build.xml
maven.log
1.1
maven/src/plugins-build/native/samples/helloworld/src/unix/HelloWorldImp.c
Index: HelloWorldImp.c
===================================================================
#include <stdio.h>
#include <stdlib.h>
#include <jni.h>
#include "org_apache_maven_natives_sample_helloworld_HelloWorld.h"
JNIEXPORT void JNICALL
Java_org_apache_maven_natives_sample_helloworld_HelloWorld_displayHelloWorld(JNIEnv
*env, jobject obj)
{
char *home;
printf("Helloworld from Java JNI\n");
home = getenv ("HOME");
printf("HOME = %s\n", (home) ? home : "(NULL)");
return;
}
1.1
maven/src/plugins-build/native/samples/helloworld/src/java/org/apache/maven/natives/sample/helloworld/HelloWorld.java
Index: HelloWorld.java
===================================================================
package org.apache.maven.natives.sample.helloworld;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Maven" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Maven", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
/**
* @author Kasper Nielsen
*
*/
public class HelloWorld {
public native void displayHelloWorld();
static {
//System.loadLibrary("native-helloworld-1.0");
}
public static void main(String args[])
{
System.out.println("trying");
HelloWorld ff=new HelloWorld();
System.loadLibrary("native-helloworld-1.0");
ff.displayHelloWorld();
System.out.println("done");
}
}
1.2 +43 -12 maven/src/plugins-build/native/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/native/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 26 Mar 2003 19:32:13 -0000 1.1
+++ plugin.jelly 28 Mar 2003 01:43:33 -0000 1.2
@@ -1,21 +1,52 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:util="jelly:util">
+<project xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
<!--==================================================================-->
<!-- Compile all source code -->
<!--==================================================================-->
- <goal name="native" description="NAtive compiler" prereqs="native:compile"/>
-
- <goal name="native:compile" description="Compile the native compiler">
- <echo>a</echo>
+ <goal name="native" description="Native compiler" prereqs="native:compile"/>
+ <goal name="native:compile" description="Compile the native compiler"
prereqs="native:jniheader">
<taskdef name="cc" classname="net.sf.antcontrib.cpptasks.CCTask"/>
<typedef name="linker"
classname="net.sf.antcontrib.cpptasks.LinkerDef"/>
<typedef name="compiler"
classname="net.sf.antcontrib.cpptasks.CompilerDef"/>
- <echo>b</echo>
- <compiler id="gcc" name="gcc" if="use-gcc">
- <compilerarg value="-O" unless="is-debug"/>
- </compiler>
+ <ant:echo> Real Java Home = '${java.home}/..'
+ artifactId = '${pom.artifactId}' </ant:echo>
+ <mkdir dir="${maven.build.dir}/native"/>
+ <!-- for some reason '.' aren't allow as parameter for outfile-->
+ <cc outfile="${maven.build.dir}/native/_" link="shared" debug="true">
+ <compiler name="gcc"/>
+
+ <fileset dir="src/unix"/>
+ <includepath location="${java.home}/../include"/>
+ <includepath location="${java.home}/../include/linux"/>
+ <includepath location="${java.home}/../include/linux"/>
+ <includepath location="${maven.build.dir}/native/jni"/>
+ </cc>
+ <!-- just copy the file don't move because we don't want the compiler
to compile if for no reason -->
+ <ant:copy file="${maven.build.dir}/native/lib_.so"
+
tofile="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so"
overwrite="true"/>
+
+
+ </goal>
+ <!-- ================================================================== -->
+ <!-- I N S T A L L J A R -->
+ <!-- ================================================================== -->
+ <goal name="native:install" prereqs="native:compile" description="Install the
lib in the local repository">
+ <ant:echo>
+ id = '${pom.artifactId}'
+ groupId = '${pom.groupId}'
+ artifactDirectory = '${pom.artifactDirectory}'
+ </ant:echo>
+ <ant:property name="libdir__"
value="${maven.repo.local}/${pom.artifactDirectory}/so"/>
+ <ant:mkdir dir="${libdir__}"/>
+ <ant:copy
file="${maven.build.dir}/native/lib${pom.artifactId}-${pom.currentVersion}.so"
tofile="${libdir__}/lib${pom.artifactId}-${pom.currentVersion}.so" overwrite="true"/>
+ </goal>
+ <goal name="native:test" description="Install the lib in the local repository">
+ <ant:echo>
+ id = '${pom.artifactId}'
+ groupId = '${pom.groupId}'
+ artifactDirectory = '${pom.artifactDirectory}'
+ </ant:echo>
</goal>
-
<goal name="native:jniheader" description="make jniheaders for classes"
prereqs="java:compile">
<fileScanner var="classFiles">
<fileset dir="${maven.build.dest}">
@@ -24,8 +55,8 @@
</patternset>
</fileset>
</fileScanner>
- <mkdir dir="${maven.build.dir}/jni"/>
- <javah destdir="${maven.build.dir}/jni">
+ <mkdir dir="${maven.build.dir}/native/jni"/>
+ <javah destdir="${maven.build.dir}/native/jni">
<classpath>
<pathelement location="${maven.build.dest}"/>
</classpath>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
