From 7aab377e57fde5cfa0388b36813ad9b23477f8c8 Mon Sep 17 00:00:00 2001 From: Jakub Skoczen Date: Wed, 6 Jun 2012 16:00:26 +0200 Subject: [PATCH] Refactor win/unix build --- linux/pom.xml | 7 ++--- pom.xml | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/linux/pom.xml b/linux/pom.xml index bf46f40..ec77628 100644 --- a/linux/pom.xml +++ b/linux/pom.xml @@ -26,11 +26,11 @@ - + - + @@ -72,7 +72,8 @@ native-maven-plugin true - linux + ${javahOS} + ${jdkIncludePath} generic g++ diff --git a/pom.xml b/pom.xml index 80760cd..b5439c9 100644 --- a/pom.xml +++ b/pom.xml @@ -80,15 +80,12 @@ false - - - - + - + @@ -185,6 +182,8 @@ win32 + C:\Program Files\YAZ\include + C:\Program Files\YAZ\ win32 @@ -200,11 +199,80 @@ linux + + + linux + ${java.home}/../include + + + linux + + + + + maven-antrun-plugin + + + write-swig-include + initialize + + run + + + + + + + + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0-alpha-1 + + + read-swig-config + initialize + + read-project-properties + + + + ${basedir}/target/swig.properties + + + + + + + + + + + + osx + + + mac + + + + osx + mac + ${java.home}/../Headers linux - + -- 1.7.10.4