Skip to content

7903837: apidiff: build.sh issues on Windows #12

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 4 commits into from
Closed

7903837: apidiff: build.sh issues on Windows #12

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61a3c05
CODETOOLS-7903837: apidiff: build.sh issues on Windows
jonathan-gibbons Sep 25, 2024
2576598
address review feedback
jonathan-gibbons Sep 25, 2024
afc38f7
fix test classpath when DAISYDIFF_JAR is empty (for Windows)
jonathan-gibbons Sep 25, 2024
6d3c894
add EQUINOX_JAR, per suggestion in review
jonathan-gibbons Sep 30, 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
5 changes: 4 additions & 1 deletion make/apidiff.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@ JAVAFILES.jdk.codetools.apidiff := \
ifneq ($(DAISYDIFF_SRC),)
DAISYDIFF_SRC_JAVA = $(DAISYDIFF_SRC)/main/java
DAISYDIFF_SRC_RESOURCES = $(DAISYDIFF_SRC)/main/resources
DAISYDIFF_CLASSPATH_ELEMENT = $(DAISYDIFF_SRC_JAVA)
else
DAISYDIFF_CLASSPATH_ELEMENT = $(DAISYDIFF_JAR)
endif

$(BUILDDIR)/classes.jdk.codetools.apidiff.ok: $(JAVAFILES.jdk.codetools.apidiff)
$(JAVAC) $(JAVAC_OPTIONS) \
-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_JAR):$(DAISYDIFF_SRC_JAVA):$(EQUINOX_JAR):$(HTMLCLEANER_JAR) \
-cp $(JAVADIFFUTILS_JAR):$(DAISYDIFF_CLASSPATH_ELEMENT):$(EQUINOX_JAR):$(HTMLCLEANER_JAR) \
-d $(CLASSDIR) \
$(JAVAFILES.jdk.codetools.apidiff)
echo "classes built at `date`" > $@
Expand Down