diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-03 16:23:57 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-03 16:23:57 -0400 |
| commit | 1fe4c5597261e30e26d691b3554769507db9a865 (patch) | |
| tree | 73c4b881f0a055f510c321b76ab1e2a033629a9a | |
| parent | c5b5c909fc6095882bbb1fb8f2d16e38c921c0a5 (diff) | |
Hey, look: Modello works
| -rw-r--r-- | conf/dependencies.mk | 8 | ||||
| -rw-r--r-- | conf/sources.mk | 2 | ||||
| -rw-r--r-- | rules/maven/Makefile | 4 | ||||
| -rw-r--r-- | rules/plexus-build-api/fix-missing-components-xml.patch | 15 | ||||
| -rw-r--r-- | rules/plexus-build-api/subdir-deps.mk | 2 |
5 files changed, 27 insertions, 4 deletions
diff --git a/conf/dependencies.mk b/conf/dependencies.mk index 273ed69..94b1370 100644 --- a/conf/dependencies.mk +++ b/conf/dependencies.mk @@ -1,6 +1,3 @@ -build/packages/maven-bootstrap: \ - build/packages/modello-core - build/packages/modello-core: \ build/packages/plexus-build-api \ build/packages/plexus-container-default \ @@ -16,6 +13,10 @@ modello-cli = \ build/packages/plexus-utils \ build/packages/xbean +build/packages/maven: \ + $(modello-cli) \ + build/packages/modello-plugins + build/packages/modello-plugins: \ build/packages/modello-core \ build/packages/plexus-container-default \ @@ -51,6 +52,7 @@ build/packages/plexus-build-api: \ build/packages/plexus-cipher: \ build/packages/atinject-javax.inject +# FIXME: Does not include generated code? But signatures match? build/packages/plexus-container-default: \ build/packages/guava \ build/packages/plexus-classworlds \ diff --git a/conf/sources.mk b/conf/sources.mk index 5c79fe7..23b290d 100644 --- a/conf/sources.mk +++ b/conf/sources.mk @@ -26,5 +26,5 @@ guava = git|https://code.google.com/p/gua # Any other implementation of JSR-305 would probably be fine too. jsr305 = svn|http://jsr-305.googlecode.com/svn|trunk/ri -# An implementation of JSR-330. Perhaps use the one included in Google Guice if we include that anyway? +# An implementation of JSR-330. Google Guice also implements JSR-330. atinject-javax.inject = svn|http://atinject.googlecode.com/svn|trunk diff --git a/rules/maven/Makefile b/rules/maven/Makefile new file mode 100644 index 0000000..dedb607 --- /dev/null +++ b/rules/maven/Makefile @@ -0,0 +1,4 @@ +%: + # $@ + bash -i + false diff --git a/rules/plexus-build-api/fix-missing-components-xml.patch b/rules/plexus-build-api/fix-missing-components-xml.patch new file mode 100644 index 0000000..8ac1df5 --- /dev/null +++ b/rules/plexus-build-api/fix-missing-components-xml.patch @@ -0,0 +1,15 @@ +diff -ruN plexus-build-api.orig/src/main/resources/META-INF/plexus/components.xml plexus-build-api/src/main/resources/META-INF/plexus/components.xml +--- plexus-build-api.orig/src/main/resources/META-INF/plexus/components.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plexus-build-api/src/main/resources/META-INF/plexus/components.xml 2014-06-03 15:50:26.913843853 -0400 +@@ -0,0 +1,11 @@ ++<component-set> ++ <components> ++ <component> ++ <role>org.sonatype.plexus.build.incremental.BuildContext</role> ++ <role-hint>default</role-hint> ++ <implementation>org.sonatype.plexus.build.incremental.DefaultBuildContext</implementation> ++ <description>Filesystem based non-incremental build context implementation which behaves as if all files ++were just created.</description> ++ </component> ++ </components> ++</component-set> diff --git a/rules/plexus-build-api/subdir-deps.mk b/rules/plexus-build-api/subdir-deps.mk new file mode 100644 index 0000000..b625d2f --- /dev/null +++ b/rules/plexus-build-api/subdir-deps.mk @@ -0,0 +1,2 @@ +src/main/resources/org/sonatype/plexus/build/incremental/version.properties: FORCE + sed -i 's/^api\.version\s*=.*/api.version = $(version)/' $@ |