Skip to content
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.

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

JAVA/BUILD: Fix make dist and jar install #4640

Merged

Conversation

yosefe
Copy link
Contributor

@yosefe yosefe commented Jan 2, 2020

Why

  • Fix recent build issues on fedora30 VM
  • Clean up dist tarball
  • Install JAR file via generic (rather than custom) method

How

  • Make sure EXTRA_DIST includes only source files
  • Install JAR by defining jardir and jardir_DATA variables

- Make sure temp files are not part of dist tarball (by including more
  specific paths in EXTRA_DIST)
- Install JAR file by jardir_DATA instead of custom install rule; this
  way, uninstall also works.
- Add "resources" to make clean
@yosefe yosefe force-pushed the topic/java-build-fix-make-dist-and-jar branch from 7894b75 to 0696876 Compare January 2, 2020 17:36
@mellanox-github
Copy link
Contributor

Mellanox CI: UNKNOWN on 25 workers (click for details)

Note: the logs will be deleted after 09-Jan-2020

Agent/Stage Status
_main ❓ ABORTED
hpc-arm-cavium-jenkins_W0 ❓ UNKNOWN
hpc-arm-cavium-jenkins_W1 ❓ UNKNOWN
hpc-arm-cavium-jenkins_W2 ❓ UNKNOWN
hpc-arm-cavium-jenkins_W3 ❓ UNKNOWN
hpc-arm-hwi-jenkins_W0 ❓ UNKNOWN
hpc-arm-hwi-jenkins_W1 ❓ UNKNOWN
hpc-arm-hwi-jenkins_W2 ❓ UNKNOWN
hpc-arm-hwi-jenkins_W3 ❓ UNKNOWN
hpc-test-node-gpu_W0 ❓ UNKNOWN
hpc-test-node-gpu_W1 ❓ UNKNOWN
hpc-test-node-gpu_W2 ❓ UNKNOWN
hpc-test-node-gpu_W3 ❓ UNKNOWN
hpc-test-node-legacy_W0 ❓ UNKNOWN
hpc-test-node-legacy_W1 ❓ UNKNOWN
hpc-test-node-legacy_W2 ❓ UNKNOWN
hpc-test-node-legacy_W3 ❓ UNKNOWN
hpc-test-node-new_W0 ❓ UNKNOWN
hpc-test-node-new_W1 ❓ UNKNOWN
hpc-test-node-new_W2 ❓ UNKNOWN
hpc-test-node-new_W3 ❓ UNKNOWN
r-vmb-ppc-jenkins_W0 ❓ UNKNOWN
r-vmb-ppc-jenkins_W1 ❓ UNKNOWN
r-vmb-ppc-jenkins_W2 ❓ UNKNOWN
r-vmb-ppc-jenkins_W3 ❓ UNKNOWN

@petro-rudenko
Copy link
Member

petro-rudenko commented Jan 2, 2020

Looks good, i thought to just use:

dist-hook:
	find $(distdir) -not -name "*.cc" -not -name "Makefile.am" -not -name "jucx_common_def.h" -mindepth 1 -delete

to remove all crap in native directory, but this more robust.

src/main/native

clean-local:
-rm -rf resources
Copy link
Member

Choose a reason for hiding this comment

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

minor: new line

@mellanox-github
Copy link
Contributor

Mellanox CI: PASSED on 25 workers (click for details)

Note: the logs will be deleted after 09-Jan-2020

Agent/Stage Status
_main ✔️ SUCCESS
hpc-arm-cavium-jenkins_W0 ✔️ SUCCESS
hpc-arm-cavium-jenkins_W1 ✔️ SUCCESS
hpc-arm-cavium-jenkins_W2 ✔️ SUCCESS
hpc-arm-cavium-jenkins_W3 ✔️ SUCCESS
hpc-arm-hwi-jenkins_W0 ✔️ SUCCESS
hpc-arm-hwi-jenkins_W1 ✔️ SUCCESS
hpc-arm-hwi-jenkins_W2 ✔️ SUCCESS
hpc-arm-hwi-jenkins_W3 ✔️ SUCCESS
hpc-test-node-gpu_W0 ✔️ SUCCESS
hpc-test-node-gpu_W1 ✔️ SUCCESS
hpc-test-node-gpu_W2 ✔️ SUCCESS
hpc-test-node-gpu_W3 ✔️ SUCCESS
hpc-test-node-legacy_W0 ✔️ SUCCESS
hpc-test-node-legacy_W1 ✔️ SUCCESS
hpc-test-node-legacy_W2 ✔️ SUCCESS
hpc-test-node-legacy_W3 ✔️ SUCCESS
hpc-test-node-new_W0 ✔️ SUCCESS
hpc-test-node-new_W1 ✔️ SUCCESS
hpc-test-node-new_W2 ✔️ SUCCESS
hpc-test-node-new_W3 ✔️ SUCCESS
r-vmb-ppc-jenkins_W0 ✔️ SUCCESS
r-vmb-ppc-jenkins_W1 ✔️ SUCCESS
r-vmb-ppc-jenkins_W2 ✔️ SUCCESS
r-vmb-ppc-jenkins_W3 ✔️ SUCCESS

@yosefe yosefe merged commit 65a1310 into openucx:master Jan 3, 2020
@yosefe yosefe deleted the topic/java-build-fix-make-dist-and-jar branch January 3, 2020 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants