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

JCK-23 updates #5574

Merged
merged 5 commits into from
Sep 10, 2024
Merged

JCK-23 updates #5574

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f426a13
Remove jck native make of systemInfo for jck-23+
andrew-m-leonard Sep 10, 2024
d25a984
Remove jck native make of libjmxlibid for jck-23+
andrew-m-leonard Sep 10, 2024
aadf6c7
Remove jck native make of libgenrandom for jck-23+
andrew-m-leonard Sep 10, 2024
bc1eda6
Remove jck native make of libgenrandom for jck-23+
andrew-m-leonard Sep 10, 2024
3fe3844
Merge remote-tracking branch 'origin/master' into jcknatives
andrew-m-leonard Sep 10, 2024
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
14 changes: 12 additions & 2 deletions jck/jtrunner/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,14 @@ ifeq ($(OS),win)
RANDOMGEN=cd $(FULLOUTDIR) && $(LINK_CMD) $(LFLAGS)"$(FULLOUTDIR)$(D)$@" $(FULLOUTDIR)$(D)com_sun_management_mbeans_loading_RandomGen.obj
endif

ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0)
OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT)
ifeq ($(shell test $(JDK_VERSION) -ge 23; echo $$?),0)
OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT)
else
ifeq ($(shell test $(JDK_VERSION) -ge 19; echo $$?),0)
OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)jckforeign.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT)
else
OBJS=$(LIBPREF)jckjni.$(LIBEXT) $(LIBPREF)jckjvmti.$(LIBEXT) $(LIBPREF)systemInfo.$(LIBEXT) $(LIBPREF)jmxlibid.$(LIBEXT) $(LIBPREF)genrandom.$(LIBEXT)
endif
endif

CFLAGS := $(CFLAGS) -I"$(SRCDIR)" -I"$(JNI_INCLUDE_PATH)" -I"$(JVMTI_INCLUDE_PATH)"
Expand Down Expand Up @@ -315,6 +319,7 @@ $(LIBPREF)jckforeign.$(LIBEXT):SymbolLookup.c Linker.c
cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $^ $(OFLAG)$(FULLOUTDIR)$(VAR)
$(JCKFOREIGN)

ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0)
$(LIBPREF)systemInfo.$(LIBEXT):com_sun_management_mbeans_loading_SystemInfoUseNativeLib.c
cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(VAR)
$(SYSTEMINFOUSENATIVE)
Expand All @@ -326,12 +331,14 @@ $(LIBPREF)jmxlibid.$(LIBEXT):com_sun_management_mbeans_loading_GetLibIdFromNativ
$(LIBPREF)genrandom.$(LIBEXT):com_sun_management_mbeans_loading_RandomGen.c
cd $(FULLOUTDIR) && $(CC) $(CFLAGS) $(LDFLAGS) $< $(OFLAG)$(FULLOUTDIR)$(VAR)
$(RANDOMGEN)
endif

createdir:
$(CLEANDIR) $(FULLOUTDIR)
$(MKDIR) $(FULLOUTDIR)

installjmx:
ifeq ($(shell test $(JDK_VERSION) -lt 23; echo $$?),0)
ifneq ($(OS),win)
$(COPYDIR) $(SRCDIR)$(D)tests$(D)api$(D)javax_management$(D)loading$(D)data$(D)* $(FULLOUTDIR)$(D).
cd $(FULLOUTDIR) && $(JAR) uf $(FULLOUTDIR)/archives/MBeanUseNativeLib.jar $(LIBPREF)systemInfo.$(LIBEXT)
Expand All @@ -341,6 +348,9 @@ else
cd "$(FULLOUTDIR)" && $(JAR) uf "$(FULLOUTDIR)$(D)archives$(D)MBeanUseNativeLib.jar" $(LIBPREF)systemInfo.$(LIBEXT)
cd "$(FULLOUTDIR)" && $(JAR) cf "$(FULLOUTDIR)$(D)archives$(D)OnlyLibs.jar" $(LIBPREF)jmxlibid.$(LIBEXT)
endif
else
echo "JMX not required for jdk-23+"
endif

.PHONY clean:
ifneq ($(OS),win)
Expand Down