diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | conf/dependencies.mk | 10 | ||||
| -rw-r--r-- | conf/sources.mk | 6 | ||||
| -rw-r--r-- | rules/java_cup/Makefile (renamed from rules/cup/Makefile) | 0 | ||||
| -rw-r--r-- | rules/java_cup/delete.list (renamed from rules/cup/delete.list) | 0 | ||||
| -rw-r--r-- | rules/jflex/Makefile | 2 |
6 files changed, 14 insertions, 6 deletions
@@ -244,7 +244,7 @@ build/packages/%: $(MAKEFILE_LIST) $(ECHO) '#!/bin/sh' && \ $(ECHO) 'CLASSPATH=$(call deps2classpath,$^):$${CLASSPATH:+:$${CLASSPATH}}' && \ $(ECHO) 'export CLASSPATH' && \ - $(ECHO) 'exec $(JAVA) $(call name2,extra,$*)' ; \ + $(ECHO) 'exec $(JAVA) $(call name2,extra,$*) "$$@"' ; \ } | $(INSTALL) -Dm755 /dev/stdin '$@/$(bindir)/$(call name2,url,$*)' && \ { \ $(ECHO) '#!/bin/sh' && \ diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 9d8afd7..ea4c934 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -263,6 +263,12 @@ build/packages/jdom1-bootstrap: \ # JFlex build/packages/jflex: \ /usr/share/java/junit.jar \ - build/packages/jflex-bootstrap + build/packages/jflex-bootstrap \ + build/packages/java_cup-cli build/packages/jflex-bootstrap: \ - /usr/share/java/junit.jar + /usr/share/java/junit.jar \ + build/packages/java_cup-cli \ + build/packages/jlex-cli + +build/packages/java_cup-cli: build/packages/java_cup +build/packages/jlex-cli: build/packages/jlex diff --git a/conf/sources.mk b/conf/sources.mk index 2f86c2b..577e105 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -121,6 +121,8 @@ jflex = tar|http://jflex.de/jflex-1.5.1.t jflex-bootstrap = $(jflex) # This is the last version of CUP developed at Princeton; I have a low opinion of the maintainers at TUM. -#cup = tar|http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz -cup = tar|http://www2.cs.tum.edu/projects/cup/java_cup_v10k.tar.gz +#java_cup = tar|http://www.cs.princeton.edu/~appel/modern/java/CUP/java_cup_v10k.tar.gz +java_cup = tar|http://www2.cs.tum.edu/projects/cup/java_cup_v10k.tar.gz jlex = file|http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.6/Main.java +java_cup-cli = stub|java_cup|java_cup.Main +jlex-cli = stub|jlex|JLex.Main diff --git a/rules/cup/Makefile b/rules/java_cup/Makefile index 7d60a02..7d60a02 100644 --- a/rules/cup/Makefile +++ b/rules/java_cup/Makefile diff --git a/rules/cup/delete.list b/rules/java_cup/delete.list index a25c43d..a25c43d 100644 --- a/rules/cup/delete.list +++ b/rules/java_cup/delete.list diff --git a/rules/jflex/Makefile b/rules/jflex/Makefile index 845749f..64b3b0f 100644 --- a/rules/jflex/Makefile +++ b/rules/jflex/Makefile @@ -13,7 +13,7 @@ SED = sed TOUCH = touch XMLSTARLET = xml JLEX = jlex -JAVA_CUP = java-cup +JAVA_CUP = java_cup artifactIds := jflex jflex-parent version := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:version -n parent.xml) |