Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 2 deletions .github/workflows/checkbashisms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ jobs:
sh_checker_shellcheck_disable: true
# Space-separated list of regexes matched against each file name.
# povray is third-party code that is not maintained here.
# checkbashisms cannot check zsh scripts.
sh_checker_exclude: >-
gradlew
tests/kvasir-tests/povray/
scripts/eps2png-mono-alpha[.]zsh
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ doc/developer.vr
doc/developer/
doc/developer_manual_html/
doc/images/daikon-logo.pdf
doc/images/dfepl-flow.eps
doc/images/dfepl-flow.jpg
doc/images/dfepl-flow.pdf
doc/invariants-doc.texinfo
doc/www/pubs

Expand Down
27 changes: 2 additions & 25 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ JAVA_RELEASE_NUMBER := $(shell java -version 2>&1 | head -1 | cut -d'"' -f2 | se

# note that for right now, we are only copying the html and texinfo
# versions of the developer manual (though the PDF version is also built)
IMAGE_FILES := daikon-logo.gif daikon-logo.png daikon-logo.eps dfepl-flow.dot
IMAGE_FILES := daikon-logo.gif daikon-logo.png daikon-logo.eps
IMAGE_PARTIAL_PATHS := $(addprefix images/,${IMAGE_FILES})
DOC_FILES_NO_IMAGES := Makefile index.html daikon.texinfo \
config-options.texinfo invariants-doc.texinfo \
Expand All @@ -52,7 +52,7 @@ README_PATHS := README doc/README fjalar/README
DIST_VERSION_FILES := ${README_PATHS} doc/daikon.texinfo doc/developer.texinfo \
doc/index.html doc/www/download/index.html

# Scripts, such as Perl programs, that are included in the Daikon distribution.
# Scripts that are included in the Daikon distribution.
# Why not just include all of them? (Maybe to avoid problems with
# accidentally including things in the user's checkout that are not needed
# by most users, but why not include everything that's in repository?)
Expand All @@ -61,7 +61,6 @@ DIST_VERSION_FILES := ${README_PATHS} doc/daikon.texinfo doc/developer.texinfo \
# from the 'Installation' section of the Daikon manual.
SCRIPT_FILES := Makefile \
daikon.bashrc \
dfepl dtrace-perl dtype-perl \
java-cpp \
kvasir-dtrace \
convertcsv.pl \
Expand Down Expand Up @@ -142,16 +141,6 @@ endif
# For deterministic sorting
export LC_ALL=C

## Examples of better ways to get the lists:
# PERL_MODULES := $(wildcard *.pm)
# PERL_SCRIPTS := $(wildcard *.pl)
# PERL_SCRIPTS += em_analyze em_reports cppp
# PERL_MODULE_TEXI := $(patsubst %.pm,%.texi,${PERL_MODULES})
# PERL_MODULE_INFO := $(patsubst %.pm,%.info,${PERL_MODULES})
# PERL_MODULE_MAN := $(patsubst %.pm,%.man,${PERL_MODULES})
# PERL_MODULE_HTML := $(patsubst %.pm,%.html,${PERL_MODULES})


###########################################################################
### Rules
###
Expand Down Expand Up @@ -660,10 +649,6 @@ daikon.tar daikon.zip: kvasir ${README_PATHS} ${DAIKON_JAVA_FILES} java/Makefile
# Keep .java files, delete everything else
(cd ${TMPDIR}/daikon && find examples/java-examples -name '*.java' -prune -o \( -type f -o -name daikon-output -o -name daikon-java -o -name daikon-instrumented \) -print0 | xargs -0 rm -rf)

# Perl example files
mkdir ${TMPDIR}/daikon/examples/perl-examples
(cd examples/perl-examples && cp -p Birthday.accessors Birthday.pm standalone.pl test_bday.pl ${TMPDIR}/daikon/examples/perl-examples)

# C example files for Kvasir
mkdir ${TMPDIR}/daikon/examples/c-examples
mkdir ${TMPDIR}/daikon/examples/c-examples/bzip2
Expand All @@ -686,14 +671,6 @@ daikon.tar daikon.zip: kvasir ${README_PATHS} ${DAIKON_JAVA_FILES} java/Makefile
# Don't do ${MAKE} clean which deletes .class files
(cd ${TMPDIR}/daikon/java; ${RM_TEMP_FILES})

## Front ends
mkdir ${TMPDIR}/daikon/front-end

# Perl front end
# mkdir ${TMPDIR}/daikon/front-end/perl
cp -pR front-end/perl ${TMPDIR}/daikon/front-end
(cd ${TMPDIR}/daikon/front-end/perl; ${RM_TEMP_FILES} )

# Kvasir C front end
# We use the --filter option twice with rsync to exclude unneeded files.
# The first attempts to ignore all files indicated by the contents
Expand Down
1 change: 1 addition & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Further documentation can be found in:
* Daikon and its tools now reject a malformed command-line option.
* `daikon.diff.Diff` no longer accepts the `-u` and `-z` options, which had
no effect.
* Removed the Perl front end, dfepl.

## Version 5.9.0 (September 1, 2026)

Expand Down
20 changes: 3 additions & 17 deletions doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,13 @@ invariants-doc.texinfo:
.PHONY : invariants-doc.texinfo
endif

images/%.eps: images/%.dot
dot -Tps $< >$@

# Create a jpg version of the dfepl flow, blow up by 4X to get cleaner
# output.
images/dfepl-flow.jpg: images/dfepl-flow.eps
pstopnm -portrait -stdout -xsize 2000 $< \
| pnmcrop \
| pnmscale 0.25 \
| pnmmargin -white 20 | pnmtojpeg > images/dfepl-flow.jpg

images/%.pdf: images/%.eps
epstopdf $< --outfile=$@

.PHONY: html
html: daikon.html developer.html

daikon.html: daikon.texinfo config-options.texinfo invariants-doc.texinfo images/dfepl-flow.jpg
daikon.html: daikon.texinfo config-options.texinfo invariants-doc.texinfo
${MAKE} daikon-html

# Just builds .html from .texinfo.
Expand Down Expand Up @@ -91,15 +80,14 @@ 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 ${CRONIC}
daikon/index.html: daikon.texinfo config-options.texinfo invariants-doc.texinfo ../.utils/html-tools ${CRONIC}
rm -rf daikon/*
${CRONIC} ${TEXI2HTML} --split=chapter -o daikon $<
# Fixup 'bad' href(s) inserted by makeinfo.
perl -pi -e 's|../dir/index.html|../index.html|;' daikon/index.html
perl -pi -e 's|href="CHANGELOG.md"|href="../CHANGELOG.md"|;' daikon/*.html
mkdir daikon/images
cp images/*.png daikon/images
cp images/*.jpg daikon/images
cd daikon && ../${HTMLTOOLS}/html-add-favicon . ../daikon-favicon.png

developer/index.html: developer.texinfo ../.utils/html-tools ${CRONIC}
Expand All @@ -109,10 +97,9 @@ developer/index.html: developer.texinfo ../.utils/html-tools ${CRONIC}
perl -pi -e 's|../dir/index.html|../index.html|;' developer/index.html
mkdir developer/images
cp images/*.png developer/images
cp images/*.jpg developer/images
cd developer && ../${HTMLTOOLS}/html-add-favicon . ../daikon-favicon.png

pdf: daikon.pdf images/dfepl-flow.eps developer.pdf
pdf: daikon.pdf developer.pdf

daikon.pdf: daikon.texinfo config-options.texinfo invariants-doc.texinfo ${CRONIC}
${CRONIC} makeinfo --pdf $<
Expand All @@ -132,7 +119,6 @@ clean: texi-clean
rm -f developer.tmp \
developer.info developer.info-[0-9] \
developer.log developer.dvi developer.pdf developer.html
rm -f images/dfepl-flow.{eps,pdf,jpg}
rm -f *.bak

texi-clean:
Expand Down
Loading
Loading