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

diff --git a/pom.xml b/pom.xml
index 0db949f..a225618 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.2-SNAPSHOT</version>
+  <artifactId>yaz4j-lib</artifactId>
+  <version>1.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- Project Information -->
@@ -17,6 +17,10 @@
   </licenses>
   <description>Java wrapper for the ZOOM API of YAZ</description>
 
+  <organization>
+    <name>Index Data</name>
+  </organization>
+
   <developers>
     <developer>
       <name>Rob Styles</name>
@@ -69,8 +73,40 @@
     </dependency>
   </dependencies>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
   <build>
+
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh</artifactId>
+        <version>1.0-beta-6</version>
+      </extension>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-ssh-external</artifactId>
+        <version>2.2</version>
+      </extension>
+    </extensions> 
+
     <plugins>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.2.2</version>
+        <configuration>
+          <preparationGoals>clean verify</preparationGoals>
+          <releaseProfiles>production</releaseProfiles>
+          <tagNameFormat>v@{project.version}</tagNameFormat>
+          <pushChanges>false</pushChanges>
+          <localCheckout>true</localCheckout>
+        </configuration>
+      </plugin>
+
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -83,7 +119,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"/>
@@ -105,6 +141,7 @@
         </executions>
       </plugin>
     </plugins>
+
   </build>
 
   <!-- Reporting -->
@@ -168,10 +205,23 @@
   </scm>
 
   <issueManagement>
-    <system>Bugzilla</system>
-    <url>http://bugzilla.indexdata.dk</url>
+    <system>JIRA</system>
+    <url>http://jira.indexdata.com</url>
   </issueManagement>
 
+  <distributionManagement>
+    <repository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>id-maven-repo</id>
+      <name>Index Data Maven Repository</name>
+      <url>scp://maven.indexdata.com:222/var/www/maven/repository</url>
+    </repository>
+    <site>
+      <id>id-website</id>
+      <url>scpexe://www.indexdata.com/var/www/software/yaz4j/site</url>
+    </site>
+  </distributionManagement>
+
   <profiles>
     <profile>
       <id>win32</id>
@@ -182,9 +232,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>
@@ -199,9 +251,11 @@
         </os>
       </activation>
       <properties>
-        <platform>linux</platform>
+        <platform>linux</platform> <!-- no solaris etc -->
+        <packaging>so</packaging>
         <!-- yaz-config executable -->
         <yaz.config>yaz-config</yaz.config>
+	<swig>swig</swig>
         <javahOS>linux</javahOS>
         <jdkIncludePath>${java.home}/../include</jdkIncludePath>
       </properties>
@@ -222,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"
@@ -258,7 +320,7 @@
     </profile>
 
     <profile>
-      <!-- osx is both 'unix' and 'mac' -->
+      <!-- osx family is both 'unix' and 'mac' -->
       <id>osx</id>
       <activation>
         <os>
@@ -267,13 +329,32 @@
       </activation>
       <properties>
         <platform>osx</platform>
-        <javahOS>mac</javahOS>
+        <packaging>dylib</packaging>
+        <javahOS>darwin</javahOS>
+        <jdkIncludePath>${java.home}/../include</jdkIncludePath>
+      </properties>
+      <modules>
+        <module>unix</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <!-- Apple JDK has a different include layout -->
+      <id>apple-jdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>Apple Inc.</value>
+        </property>
+      </activation>
+      <properties>
         <jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
       </properties>
       <modules>
         <module>unix</module>
       </modules>
     </profile>
+
   </profiles>
 </project>