X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=pom.xml;h=97a9d395e728e10c893e5079d9d6099a74572cc2;hb=213b49397c03a2b079ee4ca51d3a3a30c3534629;hp=80760cd12dc0af160545b2852ad33beda1e1d56e;hpb=f0f373779c0f34fd095c9cd142c5f7f5ac57fecf;p=yaz4j-moved-to-github.git

diff --git a/pom.xml b/pom.xml
index 80760cd..97a9d39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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">
                   <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"/>
@@ -185,6 +182,9 @@
       </activation>
       <properties>
         <platform>win32</platform>
+        <yaz.path>C:\Program Files\YAZ\</yaz.path>
+        <!-- needed by swig -->
+        <yaz.include>-I${yaz.path}\include</yaz.include>
       </properties>
       <modules>
         <module>win32</module>
@@ -192,7 +192,7 @@
     </profile>
 
     <profile>
-      <id>linux</id>
+      <id>unix</id>
       <activation>
         <os>
           <family>unix</family>
@@ -200,11 +200,82 @@
       </activation>
       <properties>
         <platform>linux</platform>
+        <packaging>so</packaging>
+        <!-- yaz-config executable -->
+        <yaz.config>yaz-config</yaz.config>
+        <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>