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

diff --git a/pom.xml b/pom.xml
index b5439c9..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,8 +182,11 @@
       </activation>
       <properties>
         <platform>win32</platform>
-        <yaz.include>C:\Program Files\YAZ\include</yaz.include>
-        <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.libs>"${yaz.path}\lib\yaz4.lib"</yaz.libs>
       </properties>
       <modules>
         <module>win32</module>
@@ -191,7 +194,7 @@
     </profile>
 
     <profile>
-      <id>linux</id>
+      <id>unix</id>
       <activation>
         <os>
           <family>unix</family>
@@ -199,13 +202,15 @@
       </activation>
       <properties>
         <platform>linux</platform>
-        <!-- must include trailing slash if specified-->
-        <yaz.path></yaz.path>
+        <packaging>so</packaging>
+        <!-- yaz-config executable -->
+        <yaz.config>yaz-config</yaz.config>
+	<swig>swig</swig>
         <javahOS>linux</javahOS>
         <jdkIncludePath>${java.home}/../include</jdkIncludePath>
       </properties>
       <modules>
-        <module>linux</module>
+        <module>unix</module>
       </modules>
       <build>
         <plugins>
@@ -220,7 +225,7 @@
                 </goals>
                 <configuration>
                   <tasks>
-                    <exec executable="${yaz.path}yaz-config" 
+                    <exec executable="${yaz.config}" 
                       outputproperty="yaz.include">
                       <arg value="--include" />
                     </exec>
@@ -266,11 +271,12 @@
       </activation>
       <properties>
         <platform>osx</platform>
+        <packaging>dylib</packaging>
         <javahOS>mac</javahOS>
         <jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
       </properties>
       <modules>
-        <module>linux</module>
+        <module>unix</module>
       </modules>
     </profile>
   </profiles>