Skip to content

Rename utils/ to .utils/ #751

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

Merged
mernst merged 17 commits into from
Jan 12, 2026
Merged

Rename utils/ to .utils/ #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
da17c46
Rename `utils/` to `.utils/`
mernst Jan 10, 2026
6a4c852
Variables, and fix bad replacement
mernst Jan 11, 2026
b048a0f
Fixes
mernst Jan 11, 2026
8866c8e
Complete the removal of jobs
mernst Jan 11, 2026
b65ae0a
Merge ../daikon-fork-mernst-branch-circleci-validate into dot-utls
mernst Jan 11, 2026
5ff3632
Merge ../daikon-branch-master into dot-utls
mernst Jan 11, 2026
a645a93
Another renaming
mernst Jan 11, 2026
9213ec4
Support parallelism
mernst Jan 11, 2026
a719fb2
Update target name
mernst Jan 11, 2026
6edf69f
Rename target
mernst Jan 11, 2026
ac13e80
Merge ../daikon-branch-master into plume-scripts-in-utils
mernst Jan 11, 2026
037c2c0
Treat recursive `make` correctly`
mernst Jan 11, 2026
7ce2d52
Treat recursive `make` correctly
mernst Jan 11, 2026
029f8a2
Merge ../daikon-fork-mernst-branch-recursive-make into dot-utls
mernst Jan 11, 2026
f8e16ed
Merge ../daikon-branch-master into plume-scripts-in-utils
mernst Jan 12, 2026
9ea38a7
Merge ../daikon-branch-master into dot-utls
mernst Jan 12, 2026
028ce01
Merge ../daikon-fork-mernst-branch-plume-scripts-in-utils into dot-utls
mernst Jan 12, 2026
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ java/daikon/chicory/ChicoryTest.log
java/daikon/chicory/debug/

# Obtained via Git
utils
.plume-scripts
.utils

# Documentation (including WWW pages and the manual)
doc/.fix-dev-menu
Expand Down
68 changes: 35 additions & 33 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

DAIKONDIR := $(realpath $(dir $(lastword ${MAKEFILE_LIST})))

HTMLTOOLS ?= ${DAIKONDIR}/utils/html-tools
CHECKLINK ?= ${DAIKONDIR}/utils/checklink
HTMLTOOLS ?= ${DAIKONDIR}/.utils/html-tools
CHECKLINK ?= ${DAIKONDIR}/.utils/checklink

PLUMESCRIPTS ?= ${DAIKONDIR}/utils/plume-scripts
PLUMESCRIPTS ?= ${DAIKONDIR}/.utils/plume-scripts
SORT_DIRECTORY_ORDER = ${PLUMESCRIPTS}/sort-directory-order
ifneq "$(wildcard ${SORT_DIRECTORY_ORDER})" "${SORT_DIRECTORY_ORDER}"
# Until "make ../plume-scripts" has been run, sort-directory-order is not available.
Expand Down Expand Up @@ -190,6 +190,8 @@ very-clean:
-rm -rf examples/java-examples/StackAr/DataStructures/*.class
-rm -rf tests/sources/DataStructures/*.class
-rm -rf daikon-*.tar daikon-*.zip
-rm -rf .utils
# "utils/" is an old name for ".utils/".
-rm -rf utils

clean-java:
Expand Down Expand Up @@ -320,7 +322,7 @@ nightly-test-except-doc-pdf:
${MAKE} junit test

# Code style; defines `style-check` and `style-fix`.
CODE_STYLE_EXCLUSIONS_USER := --exclude-dir kvasir-tests --exclude-dir six170 --exclude-dir utils --exclude clustering.html
CODE_STYLE_EXCLUSIONS_USER := --exclude-dir kvasir-tests --exclude-dir six170 --exclude-dir .utils --exclude clustering.html
ifeq (,$(wildcard .plume-scripts))
dummy := $(shell git clone -q https://github.com/plume-lib/plume-scripts.git .plume-scripts)
endif
Expand Down Expand Up @@ -374,7 +376,7 @@ test-staged-dist: ${STAGING_DIR}
(cd ${DISTTESTDIR}; mv ${NEW_RELEASE_NAME} daikon)
cd ${MAKE} -C ${DISTTESTDIR}/daikon/java && junit
## Make sure that all of the class files are 1.8 (version 52) or earlier.
(cd ${DISTTESTDIRJAVA} && find . \( -name '*.class' \) -print0 | xargs -0 -n 1 ../utils/plume-scripts/classfile_check_version 52)
(cd ${DISTTESTDIRJAVA} && find . \( -name '*.class' \) -print0 | xargs -0 -n 1 ${PLUMESCRIPTS}/classfile_check_version 52)
Comment on lines 377 to +379
Copy link

@coderabbitai coderabbitai bot Jan 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Syntax error on line 377.

Line 377 appears malformed: cd ${MAKE} -C ${DISTTESTDIR}/daikon/java && junit. The cd command before ${MAKE} is incorrect and will cause the rule to fail.

It should likely be:

${MAKE} -C ${DISTTESTDIR}/daikon/java junit

The .utils path change on line 379 is correct.

🐛 Proposed fix 
-	cd  ${MAKE} -C ${DISTTESTDIR}/daikon/java && junit
+	${MAKE} -C ${DISTTESTDIR}/daikon/java junit
🤖 Prompt for AI Agents 
In @Makefile around lines 377 - 379, The Makefile rule contains a malformed
command where "cd" precedes the ${MAKE} invocation; replace the incorrect
fragment so the recipe runs make in the target directory and invokes the junit
target by calling ${MAKE} -C ${DISTTESTDIR}/daikon/java junit (using the
existing MAKE and DISTTESTDIR variables and the junit target), ensuring the
surrounding lines remain unchanged and the later .utils path change is kept
as-is.

## Test that we can rebuild the .class files from the .java files.
(cd ${DISTTESTDIRJAVA}/daikon; rm `find . -name '*.class'`; ${MAKE} all_javac)
## Test that these new .class files work properly.
Expand Down Expand Up @@ -644,8 +646,8 @@ daikon.tar daikon.zip: kvasir ${README_PATHS} ${DAIKON_JAVA_FILES} java/Makefile
cp -pR doc/www ${TMPDIR}/daikon/doc

# Utility libraries
mkdir ${TMPDIR}/daikon/utils
(cd utils/plume-scripts; git archive --prefix=plume-scripts/ HEAD | (cd ${TMPDIR}/daikon/utils/ && tar xf -))
mkdir ${TMPDIR}/daikon/.utils
(cd .utils/plume-scripts; git archive --prefix=plume-scripts/ HEAD | (cd ${TMPDIR}/daikon/.utils/ && tar xf -))

# Auxiliary programs
mkdir ${TMPDIR}/daikon/scripts
Expand Down Expand Up @@ -738,68 +740,68 @@ showvars::
@echo "NEW_RELEASE_NAME =" ${NEW_RELEASE_NAME}
${MAKE} -C java showvars

update-libs: update-bibtex2web update-checklink update-git-scripts update-html-tools update-plume-scripts update-plume-scripts-in-utils update-run-google-java-format
update-libs: update-bibtex2web update-checklink update-git-scripts update-html-tools update-plume-scripts-in-utils update-run-google-java-format
# If .git does not exist, then the directory was created from a Daikon archive file.
ifneq ($(shell ls ../.git 2>/dev/null),)
${MAKE} -C .. git-hooks
endif

.PHONY: update-libs update-bibtex2web update-checklink update-git-scripts update-html-tools update-plume-scripts update-plume-scripts-in-utils update-run-google-java-format
.PHONY: update-libs update-bibtex2web update-checklink update-git-scripts update-html-tools update-plume-scripts-in-utils update-run-google-java-format

# Unfortunately, I don't see a way for the below not to output lots of "remote:" lines to the log.
# But, I can avoid doing local output.

update-bibtex2web:
ifndef NONETWORK
if test -d utils/bibtex2web/.git ; then \
(cd utils/bibtex2web && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d utils/bibtex2web ; then \
(mkdir -p utils && (git clone -q --depth=1 https://github.com/mernst/bibtex2web.git utils/bibtex2web || (sleep 1m && git clone -q --depth=1 https://github.com/mernst/bibtex2web.git utils/bibtex2web))) \
if test -d .utils/bibtex2web/.git ; then \
(cd .utils/bibtex2web && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d .utils/bibtex2web ; then \
(mkdir -p .utils && (git clone -q --depth=1 https://github.com/mernst/bibtex2web.git .utils/bibtex2web || (sleep 1m && git clone -q --depth=1 https://github.com/mernst/bibtex2web.git .utils/bibtex2web))) \
fi
endif

update-checklink:
ifndef NONETWORK
if test -d utils/checklink/.git ; then \
(cd utils/checklink && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d utils/checklink ; then \
(mkdir -p utils && (git clone -q --depth=1 https://github.com/plume-lib/checklink.git utils/checklink || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/checklink.git utils/checklink))) \
if test -d .utils/checklink/.git ; then \
(cd .utils/checklink && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d .utils/checklink ; then \
(mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/checklink.git .utils/checklink || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/checklink.git .utils/checklink))) \
fi
endif

update-git-scripts:
ifndef NONETWORK
if test -d utils/git-scripts/.git ; then \
(cd utils/git-scripts && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d utils/git-scripts ; then \
(mkdir -p utils && (git clone -q --depth=1 https://github.com/plume-lib/git-scripts.git utils/git-scripts || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/git-scripts.git utils/git-scripts))) \
if test -d .utils/git-scripts/.git ; then \
(cd .utils/git-scripts && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d .utils/git-scripts ; then \
(mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/git-scripts.git .utils/git-scripts || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/git-scripts.git .utils/git-scripts))) \
fi
endif

update-html-tools:
ifndef NONETWORK
if test -d utils/html-tools/.git ; then \
(cd utils/html-tools && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d utils/html-tools ; then \
(mkdir -p utils && (git clone -q --depth=1 https://github.com/plume-lib/html-tools.git utils/html-tools || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/html-tools.git utils/html-tools))) \
if test -d ${HTMLTOOLS}/.git ; then \
(cd ${HTMLTOOLS} && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d ${HTMLTOOLS} ; then \
(mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/html-tools.git ${HTMLTOOLS} || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/html-tools.git ${HTMLTOOLS}))) \
fi
endif

update-plume-scripts-in-utils:
ifndef NONETWORK
if test -d utils/plume-scripts/.git ; then \
(cd utils/plume-scripts && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d utils/plume-scripts ; then \
mkdir -p utils && (git clone -q --depth=1 https://github.com/plume-lib/plume-scripts.git utils/plume-scripts || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/plume-scripts.git utils/plume-scripts)) \
if test -d ${PLUMESCRIPTS}/.git ; then \
(cd ${PLUMESCRIPTS} && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d ${PLUMESCRIPTS} ; then \
mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/plume-scripts.git ${PLUMESCRIPTS} || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/plume-scripts.git ${PLUMESCRIPTS})) \
fi
endif

update-run-google-java-format:
ifndef NONETWORK
if test -d utils/run-google-java-format/.git ; then \
(cd utils/run-google-java-format && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d utils/run-google-java-format ; then \
(mkdir -p utils && (git clone -q --depth=1 https://github.com/plume-lib/run-google-java-format.git utils/run-google-java-format || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/run-google-java-format.git utils/run-google-java-format))) \
if test -d .utils/run-google-java-format/.git ; then \
(cd .utils/run-google-java-format && (git pull -q || (sleep 1m && (git pull || true)))) \
elif ! test -d .utils/run-google-java-format ; then \
(mkdir -p .utils && (git clone -q --depth=1 https://github.com/plume-lib/run-google-java-format.git .utils/run-google-java-format || (sleep 1m && git clone -q --depth=1 https://github.com/plume-lib/run-google-java-format.git .utils/run-google-java-format))) \
fi
endif

Expand Down
16 changes: 8 additions & 8 deletions doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ all-except-pdf: config-options.texinfo invariants-doc.texinfo html-chap html

TEXI2HTML ?= makeinfo --html

HTMLTOOLS ?= ../utils/html-tools
HTMLTOOLS ?= ../.utils/html-tools

daikon.info: daikon.texinfo config-options.texinfo invariants-doc.texinfo
# Large split size fixes an apparent bug in makeinfo 4.11:
Expand Down Expand Up @@ -63,21 +63,21 @@ daikon-fast: daikon.texinfo
${MAKE} daikon-html

## These two rules create the directories if absent but don't update them.
../utils/html-tools:
../.utils/html-tools:
${MAKE} -C .. update-html-tools

../utils/plume-scripts:
${MAKE} -C .. update-plume-scripts
../.utils/plume-scripts:
${MAKE} -C .. update-plume-scripts-in-utils

.PHONY: daikon-html
# Does the actual work
daikon-html: ../utils/html-tools
daikon-html: ../.utils/html-tools
${TEXI2HTML} --no-split daikon.texinfo
# Fixup 'bad' href inserted by makeinfo.
perl -pi -e 's|dir.html#Top|index.html|;' daikon.html
${HTMLTOOLS}/html-add-favicon . daikon-favicon.png

developer.html: developer.texinfo ../utils/html-tools
developer.html: developer.texinfo ../.utils/html-tools
${TEXI2HTML} --no-split $<
# Fixup 'bad' href inserted by makeinfo.
perl -pi -e 's|dir.html#Top|index.html|;' $@
Expand All @@ -87,7 +87,7 @@ html-chap: daikon/index.html developer/index.html

# The "subdir" flag does not copy over images, so the
# pathnames become incorrect. We need to copy them over ourselves.
daikon/index.html: daikon.texinfo config-options.texinfo invariants-doc.texinfo images/dfepl-flow.jpg ../utils/html-tools
daikon/index.html: daikon.texinfo config-options.texinfo invariants-doc.texinfo images/dfepl-flow.jpg ../.utils/html-tools
rm -rf daikon/*
${TEXI2HTML} --split=chapter -o daikon $<
# Fixup 'bad' href(s) inserted by makeinfo.
Expand All @@ -98,7 +98,7 @@ daikon/index.html: daikon.texinfo config-options.texinfo invariants-doc.texinfo
cp images/*.jpg daikon/images
cd daikon && ../${HTMLTOOLS}/html-add-favicon . ../daikon-favicon.png

developer/index.html: developer.texinfo ../utils/html-tools
developer/index.html: developer.texinfo ../.utils/html-tools
rm -rf developer/*
${TEXI2HTML} --split=chapter -o developer $<
# Fixup 'bad' href inserted by makeinfo.
Expand Down
8 changes: 4 additions & 4 deletions doc/www/pubs-sources/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###########################################################################
DAIKONDIR := $(realpath $(dir $(lastword ${MAKEFILE_LIST}))../../..)
CHECKLINK ?= ${DAIKONDIR}/utils/checklink
HTMLTOOLS ?= ${DAIKONDIR}/utils/html-tools
PLUMESCRIPTS ?= ${DAIKONDIR}/utils/plume-scripts
BPHOME ?= ${DAIKONDIR}/utils/bibtex2web/lib
CHECKLINK ?= ${DAIKONDIR}/.utils/checklink
HTMLTOOLS ?= ${DAIKONDIR}/.utils/html-tools
PLUMESCRIPTS ?= ${DAIKONDIR}/.utils/plume-scripts
BPHOME ?= ${DAIKONDIR}/.utils/bibtex2web/lib
export BPHOME
BWBIN = ${BPHOME}/../bin
BIBDIR ?= ~/bib
Expand Down
50 changes: 25 additions & 25 deletions java/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ DAIKONDIR := $(realpath $(dir $(lastword ${MAKEFILE_LIST}))..)

DAIKONSCRIPTS ?= ${DAIKONDIR}/scripts

PLUMESCRIPTS ?= ${DAIKONDIR}/.plume-scripts
HTMLTOOLS ?= ${DAIKONDIR}/utils/html-tools
PLUMESCRIPTS ?= ${DAIKONDIR}/.utils/plume-scripts
HTMLTOOLS ?= ${DAIKONDIR}/.utils/html-tools

USER ?= daikonbuild

Expand Down Expand Up @@ -638,15 +638,15 @@ dyncomp-jdk-only dcomp-jdk-only :
fi

## These two rules create the directories if absent but don't update them.
../utils/plume-scripts:
${MAKE} -C .. update-plume-scripts
../.utils/plume-scripts:
${MAKE} -C .. update-plume-scripts-in-utils

../utils/html-tools:
../.utils/html-tools:
${MAKE} -C .. update-html-tools

.PHONY: update-plume-scripts
update-plume-scripts:
${MAKE} -C .. update-plume-scripts
.PHONY: update-plume-scripts-in-utils
update-plume-scripts-in-utils:
${MAKE} -C .. update-plume-scripts-in-utils

# Checks that daikon.plumelib, rather than plume, is imported by source files
# that do instrumentation. Should also check that daikon.plumelib is never
Expand All @@ -668,7 +668,7 @@ plume-import-check :

## Use this when you don't want $inv/tests makefiles to restart
JAVA_FILES_EXCEPT_DAIKON := $(subst ./daikon/Daikon.java,,${JAVA_FILES})
all_except_daikon: ../utils/plume-scripts ${AUTO_GENERATED_FILES}
all_except_daikon: ../.utils/plume-scripts ${AUTO_GENERATED_FILES}
@echo ${JAVAC_COMMAND} '*.java ... (except Daikon.java)'
@${JAVAC_COMMAND} ${JAVA_FILES_EXCEPT_DAIKON}
@chmod a-w ${AUTO_GENERATED_FILES}
Expand Down Expand Up @@ -733,7 +733,7 @@ endif
TAGS: tags
.PHONY: etags tags
etags: tags
tags: ../utils/plume-scripts
tags: ../.utils/plume-scripts
ifndef ETAGS
$(error etags is not available, please install it)
endif
Expand All @@ -749,7 +749,7 @@ tags-without-generated-files: clean-generated-files
${MAKE} compile

# A TAGS file that does not contain jtb-generated files.
tags-nojtb: ../utils/plume-scripts
tags-nojtb: ../.utils/plume-scripts
ifndef ETAGS
$(error etags is not available, please install it)
endif
Expand Down Expand Up @@ -836,7 +836,7 @@ findbugs-cat:

.PHONY: jar
jar: ../daikon.jar
../daikon.jar: ../utils/plume-scripts ${AUTO_GENERATED_FILES} compile
../daikon.jar: ../.utils/plume-scripts ${AUTO_GENERATED_FILES} compile
${MAKE} -C .. daikon.jar

jlint:
Expand All @@ -857,7 +857,7 @@ ifeq (${JAVA17}, 0)
echo "Formatting is not run under Java ${JAVA_VERSION_STRING}"
else
${MAKE} -C .. update-run-google-java-format
@../utils/run-google-java-format/run-google-java-format.py \
@../.utils/run-google-java-format/run-google-java-format.py \
${JAVA_FILES_FOR_FORMAT}
endif

Expand All @@ -866,7 +866,7 @@ ifeq (${JAVA17}, 0)
echo "Formatting is not run under Java ${JAVA_VERSION_STRING}"
else
${MAKE} -C .. update-run-google-java-format
@../utils/run-google-java-format/check-google-java-format.py \
@../.utils/run-google-java-format/check-google-java-format.py \
${JAVA_FILES_FOR_FORMAT} || (echo "Try running: make reformat" && /bin/false)
endif

Expand Down Expand Up @@ -1255,7 +1255,7 @@ endif
# Build javadoc using the daikon package and all subpackages of daikon.
javadoc: api
.PHONY: api
api: ../utils/plume-scripts ../utils/html-tools ${AUTO_GENERATED_FILES}
api: ../.utils/plume-scripts ../.utils/html-tools ${AUTO_GENERATED_FILES}
ifeq (${SKIP_JAVADOC},1)
java -version
@echo SKIP_JAVADOC=${SKIP_JAVADOC}
Expand All @@ -1274,7 +1274,7 @@ endif
# Run Javadoc on each file individually, to determine which one is crashing Javadoc.
# Search the *-javadoc-output.txt files to find out which one contains the crash log.
# Then, you need to do binary search on that file.
api-test-each: ../utils/plume-scripts ../utils/html-tools ${AUTO_GENERATED_FILES}
api-test-each: ../.utils/plume-scripts ../.utils/html-tools ${AUTO_GENERATED_FILES}
ifeq (${SKIP_JAVADOC},1)
java -version
@echo SKIP_JAVADOC=${SKIP_JAVADOC}
Expand All @@ -1288,7 +1288,7 @@ endif

## Make Javadoc with private fields for people working on source code.
## It is generated in the standard location, directory api/
api-private: ../utils/plume-scripts ${AUTO_GENERATED_FILES}
api-private: ../.utils/plume-scripts ${AUTO_GENERATED_FILES}
ifeq ($(shell test ${JAVA_RELEASE_NUMBER} -eq 8; echo $$?),0)
@echo "Skipping api-private target under Java 8"
else
Expand Down Expand Up @@ -1318,24 +1318,24 @@ requireJavadoc: ${JAVA_FILES}
${DAIKON_JAVA_FILES} ; \
fi

../doc/invariants-doc.texinfo: ../utils/plume-scripts daikon/config/InvariantDoclet.class daikon/config/HtmlToTexinfo.class
../doc/invariants-doc.texinfo: ../.utils/plume-scripts daikon/config/InvariantDoclet.class daikon/config/HtmlToTexinfo.class
@make javadoc-files.txt
${JAVADOC_COMMAND} ${extra-javadoc-args} -J-Xmx7g -J-ea -docletpath "${DOCLETPATH}" -classpath "${DAIKON_CLASSPATH}" -doclet daikon.config.InvariantDoclet ${DOCLET_FLAGS} \
--texinfo $@.tmpfile \
--texinfo $@.tmp \
@javadoc-files.txt
mv -f $@.tmpfile $@
mv -f $@.tmp $@
@rm -f javadoc-files.txt

# This fails if both . and pwd are on CLASSPATH: classes are found twice
# resulting in a duplicate class warning.

../doc/config-options.texinfo: ../utils/plume-scripts daikon/config/ParameterDoclet.class daikon/config/HtmlToTexinfo.class
../doc/config-options.texinfo: ../.utils/plume-scripts daikon/config/ParameterDoclet.class daikon/config/HtmlToTexinfo.class
@make javadoc-files.txt
${JAVADOC_COMMAND} ${extra-javadoc-args} -J-Xmx7g -J-ea -docletpath "${DOCLETPATH}" -classpath "${DAIKON_CLASSPATH}" -doclet daikon.config.ParameterDoclet ${DOCLET_FLAGS} \
--texinfo $@.tmpfile \
--texinfo $@.tmp \
@javadoc-files.txt
perl -pi -e 's/&#64;cindex/\@cindex/g' $@.tmpfile
mv -f $@.tmpfile $@
perl -pi -e 's/&#64;cindex/\@cindex/g' $@.tmp
mv -f $@.tmp $@
@rm -f javadoc-files.txt

daikon/config/InvariantDoclet.class: daikon/config/InvariantDoclet.java
Expand Down Expand Up @@ -1430,7 +1430,7 @@ ${AUTO_GENERATED_CLASSES_2}: ${AUTO_GENERATED_FILES_2}

# Create the auto-generated files with jpp
.PHONY: jpp
jpp: ../utils/plume-scripts ${AUTO_GENERATED_FILES}
jpp: ../.utils/plume-scripts ${AUTO_GENERATED_FILES}

# Use this rule if you do not have cpp or for some other reason do not want
# to refresh the automatically generated .java files. You should not do
Expand Down
Binary file modified java/lib/require-javadoc/require-javadoc-2.0.0-all.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion scripts/daikon-dev.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export LC_ALL=${LC_ALL:-en_US}
DAIKONDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )../" && pwd )"

export DAIKONSCRIPTS=${DAIKONDIR}/scripts
export PLUMESCRIPTS=${DAIKONDIR}/utils/plume-scripts
export PLUMESCRIPTS=${DAIKONDIR}/.utils/plume-scripts
export DAIKONCLASS_SOURCES=1
export PAG=/afs/csail.mit.edu/group/pag
export pag=${PAG}
Expand Down
2 changes: 1 addition & 1 deletion scripts/daikon.bashrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ if [ -z "$DAIKONSCRIPTS" ]; then
fi

if [ -z "$PLUMESCRIPTS" ]; then
export PLUMESCRIPTS=${DAIKONDIR}/utils/plume-scripts
export PLUMESCRIPTS=${DAIKONDIR}/.utils/plume-scripts
fi

DAIKON_CLASSPATH=${DAIKONDIR}/daikon.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/lib/tools.jar
Expand Down
Loading
Loading