diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-31 13:35:41 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-31 13:35:41 -0400 |
| commit | aa0dd01db10ae53a1ff5c8275db99ca2f1d54310 (patch) | |
| tree | fca74689caecfa78a94017f60c9b7446a01991be | |
| parent | bc0392f64cd587d47daeb06c375a83e089f37712 (diff) | |
So my jar-merge work-around wasn't creating directories.
| -rw-r--r-- | rules/generic/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/rules/generic/Makefile b/rules/generic/Makefile index be090bd..dc0840b 100644 --- a/rules/generic/Makefile +++ b/rules/generic/Makefile @@ -12,6 +12,7 @@ INSTALL = install MKDIRS = mkdir -p RM = rm -f JAR = jar +CP = cp # Detect information from POMs artifact := $(shell $(XMLSTARLET) sel -T -t -c /_:project/_:artifactId -n pom.xml) @@ -38,13 +39,17 @@ all: PHONY \ target/$(artifact)-$(version).pom: pom.xml $(INSTALL) -Dm644 $< $@ -target/$(artifact)-$(version).jar: \ +target/$(artifact)-$(version).jar: %.jar: % + $(JAR) -cf $@ -C $< . + +target/$(artifact)-$(version): \ target/META-INF/maven/$(group)/$(artifact)/pom.properties \ target/META-INF/maven/$(group)/$(artifact)/pom.xml \ $(call dep_dir,target/classes) \ $(call dep_optdir,src/main/resources) - $(MKDIRS) $(@D) - $(JAR) -cf $@ -C target META-INF $$($(FIND) target/classes src/main/resources -type f -printf ' -C %H %P ') + $(RM) -r $@ + $(MKDIRS) $@ + $(CP) -r target/META-INF $(wildcard target/classes/* src/main/resources/*) $@ target/META-INF/maven/$(group)/$(artifact)/pom.xml: pom.xml install -Dm644 $< $@ |