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 | |
| parent | d285245c83c183d2771ce02e02df882625aa6044 (diff) | |
get maven closer to building
| -rw-r--r-- | conf/dependencies.mk | 11 | ||||
| -rw-r--r-- | conf/sources.mk | 1 | ||||
| -rw-r--r-- | rules/maven/Makefile | 11 | ||||
| -rw-r--r-- | rules/maven/fix-classpath.patch | 11 |
4 files changed, 33 insertions, 1 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index f8b99da..444b426 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -13,7 +13,8 @@ dep-jsr330 = build/packages/atinject-javax.inject build/packages/maven: \ $(dep-modello-cli) \ - build/packages/modello-plugins + build/packages/modello-plugins \ + build/packages/plexus-component-metadata build/packages/maven-artifact-bootstrap: \ build/packages/plexus-utils build/packages/maven-plugin-api-bootstrap: \ @@ -48,6 +49,14 @@ build/packages/plexus-build-api: \ build/packages/plexus-utils build/packages/plexus-cipher: \ $(dep-jsr330) +build/packages/plexus-component-metadata: \ + build/packages/jdom-bootstrap \ + build/packages/maven-plugin-api-bootstrap \ + build/packages/plexus-classworlds \ + build/packages/plexus-container-default \ + build/packages/plexus-component-annotations \ + build/packages/plexus-utils \ + /usr/share/java/asm-all-3.jar # FIXME: Does not include generated code? But signatures match? build/packages/plexus-container-default: \ build/packages/guava \ diff --git a/conf/sources.mk b/conf/sources.mk index 991250f..8bc9d48 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -16,6 +16,7 @@ plexus-build-api = git|git://github.com/sonatype/sis plexus-cipher = git|git://github.com/sonatype/plexus-cipher.git|plexus-cipher-1.7 plexus-classworlds = git|git://github.com/sonatype/plexus-classworlds.git|plexus-classworlds-2.5.1 plexus-component-annotations = git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-component-annotations +#plexus-component-metadata = git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-component-metadata plexus-container-default = git|git://github.com/sonatype/plexus-containers.git|plexus-containers-1.5.5/plexus-container-default plexus-interpolation = git|git://github.com/sonatype/plexus-interpolation.git|plexus-interpolation-1.19 plexus-utils = git|git://github.com/sonatype/plexus-utils.git|plexus-utils-3.0.17 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}" /> |