diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-10 15:08:09 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-10 15:08:09 -0400 |
| commit | 7d961f1f1a191378c683dcf04c74b8715563241a (patch) | |
| tree | 977bd256cebdb24f1cf5662893ca19909e356aa4 | |
| parent | ade6c745754cc984f06ff1fa2399f1eda2db6d64 (diff) | |
touch up jarfind/findjar
| -rw-r--r-- | rules/jflex/Makefile | 6 | ||||
| -rw-r--r-- | rules/qdox/generated-sources.mk | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/rules/jflex/Makefile b/rules/jflex/Makefile index 4db4db2..4935de7 100644 --- a/rules/jflex/Makefile +++ b/rules/jflex/Makefile @@ -19,9 +19,9 @@ artifactIds := jflex jflex-parent version := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:version -n parent.xml) groupId := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:groupId -n parent.xml) -jarfind = $(firstword $(foreach path,$(subst :, ,$(CLASSPATH)),$(if $(findstring $1,$(path)),$(path)))) -junit_jar := $(call jarfind,junit) -jflex_jar := $(call jarfind,jflex) +findjar = $(firstword $(foreach path,$(subst :, ,$(CLASSPATH)),$(if $(findstring $1,$(path)),$(path))) /notfound.jar) +junit_jar := $(call findjar,junit) +jflex_jar := $(call findjar,jflex) export CLASSPATH := antflags = -Dversion='$(version)' diff --git a/rules/qdox/generated-sources.mk b/rules/qdox/generated-sources.mk index 078e74d..5309529 100644 --- a/rules/qdox/generated-sources.mk +++ b/rules/qdox/generated-sources.mk @@ -1,8 +1,9 @@ +findjar = $(firstword $(foreach path,$(subst :, ,$(CLASSPATH)),$(if $(findstring $1,$(path)),$(path))) /notfound.jar) + BYACCJ = byaccj -JFLEX = $(JAVA) -jar $(call jarfind,jflex) +JFLEX = $(JAVA) -jar $(call findjar,jflex) qdox.javaparser.stack = 500 -jarfind = $(firstword $(foreach path,$(subst :, ,$(CLASSPATH)),$(if $(findstring $1,$(path)),$(path)))) parserpkg = com.thoughtworks.qdox.parser.impl parserdir = target/generated-sources/parser/$(subst .,/,$(parserpkg)) byaccj_flags = -Jnorun -Jnoconstruct -Jpackage=$(parserpkg) |