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

Remove unused redirector variants #3714

Merged
merged 1 commit into from
Nov 17, 2018
Merged

Remove unused redirector variants #3714

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
112 changes: 0 additions & 112 deletions runtime/redirector/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,118 +53,6 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
</commands>
</artifact>

<artifact type="shared" name="jvm_b150" scope="redirector" loadgroup="top" buildlocal="true" appendrelease="false">
<include-if condition="spec.flags.module_j9vm"/>
<exclude-if condition="spec.java10 or not spec.java9"/>
<options>
<!-- Need this for compatibility with older UMA versions in ifix streams -->
<option name="linuxVersionName" data ="JVM_2.3"/>
</options>
<phase>core quick j2se</phase>
<dependencies>
<dependency name="generate_j9vm"/>
<dependency name="generate_redirector"/>
</dependencies>
<exports>
<group name="all"/>
<group name="j9vmnatives"/>
</exports>
<includes>
<include path="j9include"/>
<include path="j9oti"/>
<include path="jvm"/>
<include path="$(OMRPORT_SRCDIR)zos390" type="relativepath">
<include-if condition="spec.zos_390.*"/>
</include>
</includes>
<makefilestubs>
<makefilestub data="UMA_TREAT_WARNINGS_AS_ERRORS=1"/>
<makefilestub data="OMRPORT_SRCDIR=$(OMR_DIR)/port/"/>
</makefilestubs>
<objects>
<object name="generated"/>
<object name="redirector"/>
</objects>
<libraries>
<library name="omrutil" type="external"/>
</libraries>
</artifact>

<artifact type="shared" name="jvm_b156" scope="redirector" loadgroup="top" buildlocal="true" appendrelease="false">
<include-if condition="spec.flags.module_j9vm"/>
<exclude-if condition="spec.java11 or not spec.java9"/>
<options>
<!-- Need this for compatibility with older UMA versions in ifix streams -->
<option name="linuxVersionName" data ="JVM_2.3"/>
</options>
<phase>core quick j2se</phase>
<dependencies>
<dependency name="generate_j9vm"/>
<dependency name="generate_redirector"/>
</dependencies>
<exports>
<group name="all"/>
<group name="j9vmnatives"/>
</exports>
<includes>
<include path="j9include"/>
<include path="j9oti"/>
<include path="jvm"/>
<include path="$(OMRPORT_SRCDIR)zos390" type="relativepath">
<include-if condition="spec.zos_390.*"/>
</include>
</includes>
<makefilestubs>
<makefilestub data="UMA_TREAT_WARNINGS_AS_ERRORS=1"/>
<makefilestub data="OMRPORT_SRCDIR=$(OMR_DIR)/port/"/>
</makefilestubs>
<objects>
<object name="generated"/>
<object name="redirector"/>
</objects>
<libraries>
<library name="omrutil" type="external"/>
</libraries>
</artifact>

<artifact type="shared" name="jvm_jdk11" scope="redirector" loadgroup="top" buildlocal="true" appendrelease="false">
<include-if condition="spec.flags.module_j9vm"/>
<exclude-if condition="spec.java12 or not spec.java11"/>
<options>
<!-- Need this for compatibility with older UMA versions in ifix streams -->
<option name="linuxVersionName" data ="JVM_2.3"/>
</options>
<phase>core quick j2se</phase>
<dependencies>
<dependency name="generate_j9vm"/>
<dependency name="generate_redirector"/>
</dependencies>
<exports>
<group name="all"/>
<group name="j9vmnatives"/>
<group name="jdk11"/>
</exports>
<includes>
<include path="j9include"/>
<include path="j9oti"/>
<include path="jvm"/>
<include path="$(OMRPORT_SRCDIR)zos390" type="relativepath">
<include-if condition="spec.zos_390.*"/>
</include>
</includes>
<makefilestubs>
<makefilestub data="UMA_TREAT_WARNINGS_AS_ERRORS=1"/>
<makefilestub data="OMRPORT_SRCDIR=$(OMR_DIR)/port/"/>
</makefilestubs>
<objects>
<object name="generated"/>
<object name="redirector"/>
</objects>
<libraries>
<library name="omrutil" type="external"/>
</libraries>
</artifact>

<artifact type="shared" name="jvm" scope="redirector" loadgroup="top" buildlocal="true" appendrelease="false">
<include-if condition="spec.flags.module_j9vm"/>
<options>
Expand Down