Skip to content

7903856: apidiff: 7903837 breaks some builds #22

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

Closed
wants to merge 1 commit into from
Closed

7903856: apidiff: 7903837 breaks some builds #22

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions make/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -76,7 +76,7 @@ check-build-vars:
echo "DAISYDIFF_LICENSE not set (will not be included)" ; \
fi
@if [ -z "$(EQUINOX_JAR)" ]; then \
echo "EQUINOX_JAR not set" ; exit 1 ; \
echo "EQUINOX_JAR not set (will not be included)" ; \
fi
@if [ -z "$(EQUINOX_LICENSE)" ]; then \
echo "EQUINOX_LICENSE not set (will not be included)" ; \
Expand Down
11 changes: 8 additions & 3 deletions make/apidiff.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -38,9 +38,14 @@ else
DAISYDIFF_CLASSPATH_ELEMENT = $(DAISYDIFF_JAR)
endif

# include EQUINOX_JAR with DAISYDIFF if it is set
ifneq ($(EQUINOX_JAR),)
DAISYDIFF_CLASSPATH_ELEMENT := $(DAISYDIFF_CLASSPATH_ELEMENT):$(EQUINOX_JAR)
endif

$(BUILDDIR)/classes.jdk.codetools.apidiff.ok: $(JAVAFILES.jdk.codetools.apidiff)
$(JAVAC) $(JAVAC_OPTIONS) \
-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_CLASSPATH_ELEMENT):$(EQUINOX_JAR):$(HTMLCLEANER_JAR) \
-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_CLASSPATH_ELEMENT):$(HTMLCLEANER_JAR) \
-d $(CLASSDIR) \
$(JAVAFILES.jdk.codetools.apidiff)
echo "classes built at `date`" > $@
Expand Down Expand Up @@ -310,7 +315,7 @@ $(BUILDDIR)/api.jdk.codetools.apidiff.ok: \
$(JAVADOC) $(JAVADOC_OPTIONS) \
-Xdoclint:-missing \
-quiet \
-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_JAR):$(DAISYDIFF_SRC_JAVA):$(EQUINOX_JAR):$(HTMLCLEANER_JAR) \
-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_CLASSPATH_ELEMENT):$(HTMLCLEANER_JAR) \
-overview $(SRCDOCDIR)/overview.html \
-linkoffline \
https://docs.oracle.com/en/java/javase/17/docs/api/index.html \
Expand Down