This is an automated email from the ASF dual-hosted git repository. eolivelli pushed a commit to branch pr/993 in repository https://gitbox.apache.org/repos/asf/zookeeper.git
commit 5e40f65a7e86488236ef61729fb899d66c0d816f Author: Enrico Olivelli <[email protected]> AuthorDate: Thu Jun 20 20:16:07 2019 +0200 Enhance Mavenized Make C client --- zookeeper-client/zookeeper-client-c/pom.xml | 118 ++++++++++++++-------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml index 8294810..d8f98b1 100755 --- a/zookeeper-client/zookeeper-client-c/pom.xml +++ b/zookeeper-client/zookeeper-client-c/pom.xml @@ -35,52 +35,13 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-sources</id> - <phase>generate-sources</phase> - <configuration> - <tasks> - <mkdir dir="target/c" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - <execution> - <id>test-cppunit</id> - <phase>test</phase> - <configuration> - <!-- do not run cpp tests if tests are globally skipped --> - <skip>${skipTests}</skip> - <tasks> - <exec dir="${basedir}/target/c" executable="make" failonerror="true"> - <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};/usr/lib" /> - <env key="PATH" path="${env.PATH};${basedir};" /> - <env key="CALLER" value="ANT" /> - <env key="CLOVER_HOME" value="${basedir}/../../zookeeper-server/target" /> - <env key="base_dir" value="${basedir}/../.." /> - <arg line="clean check" /> - </exec> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <executions> <execution> <id>autoreconf</id> - <phase>test-compile</phase> + <phase>process-sources</phase> <goals> <goal>exec</goal> </goals> @@ -97,7 +58,7 @@ </execution> <execution> <id>configure</id> - <phase>test-compile</phase> + <phase>process-sources</phase> <goals> <goal>exec</goal> </goals> @@ -114,30 +75,67 @@ </arguments> </configuration> </execution> - <!--execution> TODO: Why is this not working?! - <id>test-cppunit</id> - <phase>test</phase> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-sources</id> + <phase>generate-sources</phase> + <configuration> + <tasks> + <mkdir dir="target/c" /> + </tasks> + </configuration> <goals> - <goal>exec</goal> + <goal>run</goal> </goals> + </execution> + <execution> + <id>build-c-client</id> + <phase>compile</phase> <configuration> - <workingDirectory>${project.build.directory}/c</workingDirectory> - <executable>make</executable> - <environmentVariables> - <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH};/usr/lib</LD_LIBRARY_PATH> - <PATH>${env.PATH};${project.basedir};</PATH> - <CALLER>ANT</CALLER> - <CLOVER_HOME></CLOVER_HOME> - <base_dir>${project.basedir}/../..</base_dir> - </environmentVariables> - <arguments> - <argument>clean check</argument> - </arguments> + <tasks> + <exec dir="${basedir}/target/c" executable="make" failonerror="true"> + <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};/usr/lib" /> + <env key="PATH" path="${env.PATH};${basedir};" /> + <env key="CALLER" value="ANT" /> + <env key="CLOVER_HOME" value="${basedir}/../../zookeeper-server/target" /> + <env key="base_dir" value="${basedir}/../.." /> + <arg line="clean install" /> + </exec> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>test-cppunit</id> + <phase>test</phase> + <configuration> + <!-- do not run cpp tests if tests are globally skipped --> + <skip>${skipTests}</skip> + <tasks> + <exec dir="${basedir}/target/c" executable="make" failonerror="true"> + <env key="LD_LIBRARY_PATH" value="${env.LD_LIBRARY_PATH};/usr/lib" /> + <env key="PATH" path="${env.PATH};${basedir};" /> + <env key="CALLER" value="ANT" /> + <env key="CLOVER_HOME" value="${basedir}/../../zookeeper-server/target" /> + <env key="base_dir" value="${basedir}/../.." /> + <arg line="check" /> + </exec> + </tasks> </configuration> - </execution--> + <goals> + <goal>run</goal> + </goals> + </execution> </executions> </plugin> </plugins> </build> -</project> \ No newline at end of file +</project>
