X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pom.xml;h=0406a8f30d82cdbfbeb210a49006aadc5bef203b;hb=6e15e119893a15cfe57b791dd065a027a4782919;hp=388fd957643da57836ff7f91069f674e6907a819;hpb=8145352ec69766d06756342ba4b85c6b66361849;p=yaz4j-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index 388fd95..0406a8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.yaz4j</groupId>
-  <artifactId>yaz4j</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <artifactId>yaz4j-lib</artifactId>
+  <version>1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- Project Information -->
@@ -80,15 +80,12 @@
             <inherited>false</inherited>
             <configuration>
               <tasks>
-                <exec executable="yaz-config" outputproperty="yaz.prefix">
-                  <arg value="--prefix" />              
-                </exec>
-                <echo message="Using yaz prefix: ${yaz.prefix}"/>
+                <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="-I${yaz.prefix}/include"/>
+                  <arg value="${yaz.include}"/>
                   <arg value="-outdir"/>
                   <arg value="${basedir}/target/generated-sources/java/org/yaz4j/jni"/>
                   <arg value="-package"/>
@@ -147,6 +144,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <chartset>UTF-8</chartset>
+          <excludePackageNames>org.yaz4j.jni</excludePackageNames>
         </configuration>
       </plugin>
     </plugins>
@@ -184,6 +182,11 @@
       </activation>
       <properties>
         <platform>win32</platform>
+        <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,11 +202,83 @@
       </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>
+      <modules>
+        <module>unix</module>
+      </modules>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>write-swig-include</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <exec executable="${yaz.config}" 
+                      outputproperty="yaz.include">
+                      <arg value="--include" />
+                    </exec>
+                    <echo message="YAZ INCLUDE=${yaz.include}"/>
+                    <mkdir dir="${basedir}/target"/>
+                    <echo file="${basedir}/target/swig.properties"
+                      message="yaz.include=${yaz.include}"/>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin> 
+            <groupId>org.codehaus.mojo</groupId> 
+            <artifactId>properties-maven-plugin</artifactId> 
+            <version>1.0-alpha-1</version> 
+            <executions> 
+              <execution> 
+                <id>read-swig-config</id> 
+                <phase>initialize</phase> 
+                <goals> 
+                  <goal>read-project-properties</goal> 
+                </goals> 
+                <configuration> 
+                  <files> 
+                    <file>${basedir}/target/swig.properties</file> 
+                  </files> 
+                </configuration> 
+              </execution> 
+            </executions> 
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <!-- osx is both 'unix' and 'mac' -->
+      <id>osx</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </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>
+  </profiles>
 </project>