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.

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

Jump to bottom

CMake: Add support for NLS and CP tools #3675

Merged
merged 5 commits into from Dec 11, 2018
Merged

CMake: Add support for NLS and CP tools #3675

merged 5 commits into from Dec 11, 2018

Conversation

dnakamura
Copy link
Contributor

Signed-off-by: Devin Nakamura devinn@ca.ibm.com

@dnakamura dnakamura mentioned this pull request Nov 14, 2018
Open
14 tasks
DanHeidinga
DanHeidinga reviewed Nov 14, 2018
View reviewed changes
CMakeLists.txt Outdated Show resolved Hide resolved
@DanHeidinga
Copy link
Member

@keithc-ca Can you take a look at this as well?

@dnakamura
Copy link
Contributor Author

Updated to address comments, and fixed merge conflicts

keithc-ca
keithc-ca requested changes Nov 16, 2018
View reviewed changes
runtime/jcl/CMakeLists.txt Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
runtime/jcl/cl_se7_basic/CMakeLists.txt Show resolved Hide resolved
@dnakamura
Copy link
Contributor Author

Everything should be fixed up now

@dnakamura
Copy link
Contributor Author

@DanHeidinga can you take a look at this since @keithc-ca is out of the office

DanHeidinga
DanHeidinga reviewed Nov 23, 2018
View reviewed changes
CMakeLists.txt
set(Java_JAVA_EXECUTABLE ${JAVA_HOME}/bin/java)
else()
message(STATUS "BOOT_JDK is not set, default jdk will be used")
include(FindJava)
Copy link
Member

Choose a reason for hiding this comment

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

I would rather this errors out than pick a random java

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ultimately, this is the same behavior that we have in the makefiles, and in the openjdk autoconf

Copy link
Member

Choose a reason for hiding this comment

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

This code is downstream from the openjdk autoconf. We should never get here without having set the bootjdk

Copy link
Member

Choose a reason for hiding this comment

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

@dnakamura If this gets dealt with, I think it's ready to merge

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DanHeidinga How would you feel about wrapping this behavior up in a flag? ie J9VM_FORCE_JDK_SEARCH or something. I'm thinking of the case of the jit linter. To run properly it needs to generate all the various header files. The easiest way to do that is to just run cmake outside of the full openjdk build. Its not clear what the proper value of BOOT_JDK should be

Copy link
Member

Choose a reason for hiding this comment

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

You raise a good point. I hadn't thought of the jit linter.

I was about to say it's not unreasonable to force it to pick a JDK but it kind of is.... That extra barrier isn't needed.

runtime/jcl/cl_se11/CMakeLists.txt Outdated Show resolved Hide resolved
runtime/jcl/cl_se12/CMakeLists.txt Outdated Show resolved Hide resolved
@DanHeidinga DanHeidinga added this to In Progress in CMake build system Nov 26, 2018
@DanHeidinga DanHeidinga self-assigned this Nov 28, 2018
@DanHeidinga
Copy link
Member

I've restarted the travis build - will merge if it passes

DanHeidinga
DanHeidinga approved these changes Dec 6, 2018
View reviewed changes
Copy link
Member

@DanHeidinga DanHeidinga left a comment

Choose a reason for hiding this comment

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

lgtm

@DanHeidinga
Copy link
Member

@dnakamura The linter job in the travis build is failing with:

CMake Error at jcl/CMakeLists.txt:107 (add_library):
  Cannot find source file:
    ../j9vmconstantpool_se12.c

Can you take a look?

keithc-ca
keithc-ca reviewed Dec 10, 2018
View reviewed changes
runtime/CMakeLists.txt Outdated Show resolved Hide resolved
runtime/jcl/CMakeLists.txt Outdated Show resolved Hide resolved
@dnakamura
CMake: Add support for NLS and CP tools
66d010a 
Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>
@dnakamura
CMake: Add jclse11
ca4af8a 
Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>
@dnakamura
CMake: Add jclse12
8c7b64a 
Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>
@dnakamura
CMake: Allow user to specify BOOT_JDK
236ab86 
Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>
@dnakamura
Travis: Clean up linter job
073ec78 
Now that proper support for nls/cp tools are in cmake, the code is much simpler

Signed-off-by: Devin Nakamura <devinn@ca.ibm.com>
@DanHeidinga
Copy link
Member

@keithc-ca Any further comments on this?

@DanHeidinga
Copy link
Member

travis build has passed - merging

@DanHeidinga DanHeidinga merged commit 0df674b into eclipse-openj9:master Dec 11, 2018
CMake build system automation moved this from In Progress to Closed Dec 11, 2018
@dnakamura dnakamura deleted the cmake_tooling branch December 11, 2018 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanHeidinga DanHeidinga DanHeidinga approved these changes

@keithc-ca keithc-ca keithc-ca approved these changes

Assignees

@DanHeidinga DanHeidinga

Labels
comp:build
Projects
CMake build system
  
Closed
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dnakamura @DanHeidinga @keithc-ca