projects
/
yaz4j-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dylib on osx
[yaz4j-moved-to-github.git]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index
b5439c9
..
97a9d39
100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-182,8
+182,9
@@
</activation>
<properties>
<platform>win32</platform>
</activation>
<properties>
<platform>win32</platform>
- <yaz.include>C:\Program Files\YAZ\include</yaz.include>
<yaz.path>C:\Program Files\YAZ\</yaz.path>
<yaz.path>C:\Program Files\YAZ\</yaz.path>
+ <!-- needed by swig -->
+ <yaz.include>-I${yaz.path}\include</yaz.include>
</properties>
<modules>
<module>win32</module>
</properties>
<modules>
<module>win32</module>
@@
-191,7
+192,7
@@
</profile>
<profile>
</profile>
<profile>
- <id>linux</id>
+ <id>unix</id>
<activation>
<os>
<family>unix</family>
<activation>
<os>
<family>unix</family>
@@
-199,13
+200,14
@@
</activation>
<properties>
<platform>linux</platform>
</activation>
<properties>
<platform>linux</platform>
- <!-- must include trailing slash if specified-->
- <yaz.path></yaz.path>
+ <packaging>so</packaging>
+ <!-- yaz-config executable -->
+ <yaz.config>yaz-config</yaz.config>
<javahOS>linux</javahOS>
<jdkIncludePath>${java.home}/../include</jdkIncludePath>
</properties>
<modules>
<javahOS>linux</javahOS>
<jdkIncludePath>${java.home}/../include</jdkIncludePath>
</properties>
<modules>
- <module>linux</module>
+ <module>unix</module>
</modules>
<build>
<plugins>
</modules>
<build>
<plugins>
@@
-220,7
+222,7
@@
</goals>
<configuration>
<tasks>
</goals>
<configuration>
<tasks>
- <exec executable="${yaz.path}yaz-config"
+ <exec executable="${yaz.config}"
outputproperty="yaz.include">
<arg value="--include" />
</exec>
outputproperty="yaz.include">
<arg value="--include" />
</exec>
@@
-266,11
+268,12
@@
</activation>
<properties>
<platform>osx</platform>
</activation>
<properties>
<platform>osx</platform>
+ <packaging>dylib</packaging>
<javahOS>mac</javahOS>
<jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
</properties>
<modules>
<javahOS>mac</javahOS>
<jdkIncludePath>${java.home}/../Headers</jdkIncludePath>
</properties>
<modules>
- <module>linux</module>
+ <module>unix</module>
</modules>
</profile>
</profiles>
</modules>
</profile>
</profiles>