Skip to content

ZOOKEEPER-3436 Enhance Mavenized Make C client #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eolivelli wants to merge 2 commits into from
Closed

ZOOKEEPER-3436 Enhance Mavenized Make C client #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2046037
Enhance Mavenized Make C client
eolivelli Jun 20, 2019
44f6ba5
Better .gitignore
eolivelli Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ tags
.cproject
.project
obj
zookeeper-client/zookeeper-client-c/core.*
zookeeper-client/zookeeper-client-c/TEST-*.txt
zookeeper-client/zookeeper-client-c/*.la
zookeeper-client/zookeeper-client-c/*.lo
zookeeper-client/zookeeper-client-c/*.o
zookeeper-client/zookeeper-client-c/generated/
zookeeper-server/src/main/resources/lib/ant-eclipse-*
zookeeper-server/src/main/resources/lib/ivy-*
zookeeper-client/zookeeper-client-c/Makefile.in
zookeeper-client/zookeeper-client-c/aclocal.m4
zookeeper-client/zookeeper-client-c/autom4te.cache/
Expand All @@ -88,7 +80,12 @@ zookeeper-client/zookeeper-client-c/depcomp
zookeeper-client/zookeeper-client-c/install-sh
zookeeper-client/zookeeper-client-c/ltmain.sh
zookeeper-client/zookeeper-client-c/missing
zookeeper-server/src/test/resources/
zookeeper-client/zookeeper-client-c/TEST-*.txt
zookeeper-client/zookeeper-client-c/generated/
zookeeper-server/src/main/resources/lib/ant-eclipse-*
zookeeper-server/src/main/resources/lib/ivy-*
zookeeper-server/src/main/java/org/apache/zookeeper/version/Info.java
zookeeper-server/src/main/java/org/apache/zookeeper/version/VersionInfoMain.java

# Python
*.py[cod]
118 changes: 58 additions & 60 deletions zookeeper-client/zookeeper-client-c/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -97,7 +58,7 @@
</execution>
<execution>
<id>configure</id>
<phase>test-compile</phase>
<phase>process-sources</phase>
Copy link
Contributor

@nkalmar nkalmar Sep 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is where --enable-gcov is passed, the phase which this runs probably surfaced the problem for Patrick? If someone doesn't have the library it will always fail, with ant only if they run a c-coverege report.
Thanks @symat for finding this!

<goals>
<goal>exec</goal>
</goals>
Expand All @@ -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>
</project>