X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pom.xml;h=0406a8f30d82cdbfbeb210a49006aadc5bef203b;hb=45fa8afc47499349a694bc1d68ccfd947dda90aa;hp=0db949fbd000d9e12d9eeb1e6e28c771c727129c;hpb=7326d120c3a80a27ae9b3a96a368d1a6c84785ad;p=yaz4j-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index 0db949f..0406a8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.yaz4j</groupId>
-  <artifactId>yaz4j</artifactId>
+  <artifactId>yaz4j-lib</artifactId>
   <version>1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
@@ -83,7 +83,7 @@
                 <echo message="Using include: ${yaz.include}"/>
                 <mkdir dir="target/generated-sources/java/org/yaz4j/jni"/>
                 <mkdir dir="target/generated-sources/native" />
-                <exec executable="swig">
+                <exec executable="${swig}">
                   <arg value="-Isrc/main/native" />
                   <arg value="${yaz.include}"/>
                   <arg value="-outdir"/>
@@ -182,9 +182,11 @@
       </activation>
       <properties>
         <platform>win32</platform>
-        <yaz.path>C:\Program Files\YAZ\</yaz.path>
+        <yaz.path>C:\Program Files\YAZ</yaz.path>
+        <swig>C:\Program Files\swigwin-2.0.7\swig</swig>
         <!-- needed by swig -->
-        <yaz.include>-I${yaz.path}\include</yaz.include>
+        <yaz.include>"-I${yaz.path}\include"</yaz.include>
+        <yaz.libs>"${yaz.path}\lib\yaz4.lib"</yaz.libs>
       </properties>
       <modules>
         <module>win32</module>
@@ -200,8 +202,10 @@
       </activation>
       <properties>
         <platform>linux</platform>
+        <packaging>so</packaging>
         <!-- yaz-config executable -->
         <yaz.config>yaz-config</yaz.config>
+	<swig>swig</swig>
         <javahOS>linux</javahOS>
         <jdkIncludePath>${java.home}/../include</jdkIncludePath>
       </properties>
@@ -267,6 +271,7 @@
       </activation>
       <properties>
         <platform>osx</platform>
+        <packaging>dylib</packaging>
         <javahOS>mac</javahOS>
         <jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
       </properties>