Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9

This commit is contained in:
Joakim Erdfelt 2012-09-14 15:11:14 -07:00
commit 4936f12fbd
1 changed files with 4 additions and 25 deletions

View File

@ -10,13 +10,13 @@
<name>Jetty :: SetUID OSX Native</name>
<packaging>so</packaging>
<properties>
<native-source-dir>target/native</native-source-dir>
<native-source-dir>target/generated</native-source-dir>
<jetty-setuid-linkerStartOption>-lc -ldl -dynamiclib -undefined
dynamic_lookup -single_module</jetty-setuid-linkerStartOption>
<jetty-setuid-linkerEndOption>target/libsetuid.so</jetty-setuid-linkerEndOption>
<jetty-setuid-linkerEndOption>target/libsetuid_osx.so</jetty-setuid-linkerEndOption>
</properties>
<build>
<finalName>libsetuid</finalName>
<finalName>libsetuid_osx</finalName>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@ -41,27 +41,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>copy-jni-implementation</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<copy failonerror="false"
file="${native-source-dir}/org_eclipse_jetty_setuid_SetUID.c"
todir="target/generated" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native-maven-plugin</artifactId>
@ -85,7 +64,7 @@
</linkerStartOptions>
<linkerEndOptions>
<linkerEndOptions>-o
${project.build.directory}/libsetuid.so</linkerEndOptions>
${project.build.directory}/libsetuid_osx.so</linkerEndOptions>
</linkerEndOptions>
</configuration>
<executions>