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

Collapse JCL shared libraries into a single version #4748

Merged
merged 3 commits into from
Feb 15, 2019

Conversation

keithc-ca
Copy link
Contributor

@keithc-ca keithc-ca commented Feb 14, 2019

This will dramatically simplify working with multiple Java versions from the single openj9 code base.

Instead of trying to manage multiple JCL shared libraries and the complexities of adding a new version every six months, additions and removals can be conditional in C/C++ code based on JAVA_SPEC_VERSION or included in the constant pool for specific versions via the versions="..." attribute in vmconstantpool.xml.

This PR:

  • updates the constant pool generation tool to produce a single version
  • updates the build process to generate a single JCL library
  • collapses JCL versions

Must be merged together with:

See also: #4632.

* use StandardCharsets.UTF_8 to avoid IOException
* use a single StringBuilder in hex()
* use a single StringBuilder in JCLRuntimeFlag.cDefine()
* use a TreeMap to manage flag order
* improve error message for missing option values
* remove redundant casts
* fix incorrect javadoc

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
* remove version-specific JCLs & sunvmi_jdk11

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
* fix J9_DLL_NAME
* inline JCL validation
* remove references to 'jclscar'
* use VMOPT_XJCL_COLON instead of redundant OPT_XJCL_COLON

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
@keithc-ca
Copy link
Contributor Author

The travis failure is expected because it didn't build with ibmruntimes/openj9-openjdk-jdk11#137.

@pshipton
Copy link
Member

jenkins test sanity zlinux,win jdk8,jdk11

@pshipton
Copy link
Member

jenkins test sanity zlinux,win jdk8 depends ibmruntimes/openj9-openjdk-jdk8#272

@pshipton
Copy link
Member

jenkins test sanity zlinux,win jdk11 depends ibmruntimes/openj9-openjdk-jdk11#137

@keithc-ca keithc-ca changed the title Collapse JCL shared libraries into a version Collapse JCL shared libraries into a single version Feb 15, 2019
@pshipton pshipton merged commit f55dfa2 into eclipse-openj9:master Feb 15, 2019
@keithc-ca keithc-ca deleted the one-jcl branch February 15, 2019 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants