Fallback on yaz-config --include error

[yaz4j-moved-to-github.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 9be33a2..3126e74 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.yaz4j</groupId>
   <artifactId>yaz4j-lib</artifactId>
-  <version>1.3</version>
+  <version>1.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- Project Information -->
@@ -276,9 +276,17 @@
                 <configuration>
                   <tasks>
                     <exec executable="${yaz.config}" 
-                      outputproperty="yaz.include">
+                      outputproperty="yaz-config.include"
+                      errorproperty="yaz-config.error">
                       <arg value="--include" />
                     </exec>
+                    <echo 
+                      message="yaz-config error (if any): ${yaz-config.error}"/>
+                    <condition property="yaz.include" 
+                      value="-I/usr/include"
+                      else="${yaz-config.include}">
+                      <equals arg1="${yaz-config.include}" arg2=""/>
+                    </condition>
                     <echo message="YAZ INCLUDE=${yaz.include}"/>
                     <mkdir dir="${basedir}/target"/>
                     <echo file="${basedir}/target/swig.properties"
@@ -315,6 +323,7 @@
       <!-- osx is both 'unix' and 'mac' -->
       <id>osx</id>
       <activation>
+        <jdk>1.6</jdk>
         <os>
           <family>mac</family>
         </os>
@@ -329,6 +338,27 @@
         <module>unix</module>
       </modules>
     </profile>
+
+    <profile>
+      <!-- osx is both 'unix' and 'mac', oracle JDK has different layout -->
+      <id>osx-oracle</id>
+      <activation>
+        <jdk>[1.7,)</jdk>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <properties>
+        <platform>osx</platform>
+        <packaging>dylib</packaging>
+        <javahOS>darwin</javahOS>
+        <jdkIncludePath>${java.home}/../include</jdkIncludePath>
+      </properties>
+      <modules>
+        <module>unix</module>
+      </modules>
+    </profile>
+
   </profiles>
 </project>