diff options
| -rw-r--r-- | conf/sources.mk | 1 | ||||
| -rw-r--r-- | rules/generic/Makefile | 4 | ||||
| -rw-r--r-- | rules/guice/subdir-deps.mk | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/conf/sources.mk b/conf/sources.mk index 8603129..c36e310 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -81,6 +81,7 @@ cal10n = tar|https://github.com/qos-ch/cal cglib = tar|https://github.com/cglib/cglib/archive/RELEASE_3_1.tar.gz gradle = tar|https://services.gradle.org/distributions/gradle-1.12-src.zip groovy = tar|https://dl.bintray.com/groovy/maven/groovy-src-2.3.3.zip +guice = tar|https://google-guice.googlecode.com/files/guice-3.0-src.zip guice-core = tar|https://google-guice.googlecode.com/files/guice-3.0-src.zip|core #javacc = tar|https://java.net/projects/javacc/downloads/download/javacc-6.0src.zip javassist = tar|https://github.com/jboss-javassist/javassist/archive/rel_3_18_2_ga.tar.gz diff --git a/rules/generic/Makefile b/rules/generic/Makefile index 025523d..7549439 100644 --- a/rules/generic/Makefile +++ b/rules/generic/Makefile @@ -22,6 +22,9 @@ TOUCH = touch XMLSTARLET = xml # Detect information from POMs +basedir = . +project.basedir = $(basedir) + artifactId := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:artifactId -n pom.xml) version := $(firstword $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:version -n -c /_:project/_:parent/_:version pom.xml) $(version)) groupId := $(firstword $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:groupId -n -c /_:project/_:parent/_:groupId pom.xml)) @@ -30,7 +33,6 @@ sourceDirectory := $(firstword $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:b resources := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:build/_:resources -n pom.xml) resources := $(if $(resources),$(resources),src/main/resources) -basedir := $(shell pwd) subdirs = $(patsubst %/pom.xml,%,$(wildcard */pom.xml)) targets = pom $(if $(wildcard src/main/ $(sourceDirectory) $(resources)),jar) diff --git a/rules/guice/subdir-deps.mk b/rules/guice/subdir-deps.mk new file mode 100644 index 0000000..0b6d542 --- /dev/null +++ b/rules/guice/subdir-deps.mk @@ -0,0 +1 @@ +extensions_deps = core |