diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-03 20:50:58 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-03 21:41:21 -0400 |
| commit | eb886d4428917e53d8e3a43e0d6be28d64738921 (patch) | |
| tree | 8399837cffed4e3194b5c1846000bf1863cffac0 /rules | |
| parent | d285245c83c183d2771ce02e02df882625aa6044 (diff) | |
get maven closer to building
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/maven/Makefile | 11 | ||||
| -rw-r--r-- | rules/maven/fix-classpath.patch | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/rules/maven/Makefile b/rules/maven/Makefile index dedb607..2619ad8 100644 --- a/rules/maven/Makefile +++ b/rules/maven/Makefile @@ -2,3 +2,14 @@ # $@ bash -i false + +export M2_HOME=$(DESTDIR)/opt/maven + +dep_dir = $1 $(shell $(FIND) $1 2>/dev/null) +dep_optdir = $(shell $(FIND) $1 2>/dev/null) + +bootstrap/target/generated-sources: $(call dep_dir,$(wildcard */src/main/mdo)) + ant -Dskip.pull generate-sources + +bootstrap/target/classes: $(call dep_dir,bootstrap/target/generated-sources $(wildcard */src/main/java)) + ant -Dskip.pull compile-boot diff --git a/rules/maven/fix-classpath.patch b/rules/maven/fix-classpath.patch new file mode 100644 index 0000000..b40a4d1 --- /dev/null +++ b/rules/maven/fix-classpath.patch @@ -0,0 +1,11 @@ +diff -ruN maven.orig/build.xml maven/build.xml +--- maven.orig/build.xml 2014-06-03 16:09:48.457817856 -0400 ++++ maven/build.xml 2014-06-03 16:41:03.871179314 -0400 +@@ -165,7 +165,6 @@ + <attribute name="version" /> + <sequential> + <java fork="true" classname="org.codehaus.modello.ModelloCli" failonerror="true"> +- <classpath refid="modello.pathid" /> + <arg file="@{file}" /> + <!-- model file --> + <arg value="@{mode}" /> |