summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-11-16 03:36:40 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-11-16 03:36:40 -0500
commitc2fb9eec0a018b2dced5078904a77d6adf75c6ab (patch)
tree5573bd54221de13336768199be4c163d2f93aa85 /rules
parent4503e3cf26c00f856a1a5a4ed63a193d7800b7d0 (diff)
Support stubbing entry points without exposing the entire classpath
And use this for modello in maven.
Diffstat (limited to 'rules')
-rw-r--r--rules/maven/Makefile3
-rw-r--r--rules/maven/fix-build-xml.patch13
2 files changed, 12 insertions, 4 deletions
diff --git a/rules/maven/Makefile b/rules/maven/Makefile
index 199725b..3578d32 100644
--- a/rules/maven/Makefile
+++ b/rules/maven/Makefile
@@ -1,6 +1,9 @@
ANT = ant
FIND = find
+MODELLO_CLASSPATH := $(shell modello-classpath)
+export MODELLO_CLASSPATH
+
%:
# $@
bash -i
diff --git a/rules/maven/fix-build-xml.patch b/rules/maven/fix-build-xml.patch
index 06e6580..b2b9a2a 100644
--- a/rules/maven/fix-build-xml.patch
+++ b/rules/maven/fix-build-xml.patch
@@ -28,16 +28,21 @@
<!-- Pull the dependencies that Maven needs to build -->
<copy file="pom.xml" tofile="dependencies.xml" />
<replace file="${basedir}/dependencies.xml" token="&lt;!--bootstrap-start-comment--&gt;" value="&lt;!--" />
-@@ -125,10 +128,14 @@
+@@ -125,10 +128,19 @@
<localRepository path="${maven.repo.local}" />
<dependency groupId="org.codehaus.plexus" artifactId="plexus-component-metadata" version="${pom.properties.plexusVersion}" />
</artifact:dependencies>
-
+ </target>
+ <target name="pull-cached" depends="init" if="skip.pull">
-+ <path id="pom.pathid"><pathelement path="${env.CLASSPATH}"/></path>
-+ <path id="modello.pathid"><pathelement path="${env.CLASSPATH}"/></path>
-+ <path id="pmdg.pathid"><pathelement path="${env.CLASSPATH}"/></path>
++ <!-- Fall back to the global env.CLASSPATH if unset -->
++ <property name="env.POM_CLASSPATH" value="${env.CLASSPATH}"/>
++ <property name="env.MODELLO_CLASSPATH" value="${env.CLASSPATH}"/>
++ <property name="env.PMDG_CLASSPATH" value="${env.CLASSPATH}"/>
++ <!-- Import the various classpaths -->
++ <path id="pom.pathid" ><pathelement path="${env.POM_CLASSPATH}" /></path>
++ <path id="modello.pathid"><pathelement path="${env.MODELLO_CLASSPATH}"/></path>
++ <path id="pmdg.pathid" ><pathelement path="${env.PMDG_CLASSPATH}" /></path>
</target>
- <target name="process-classes" depends="pull" description="generates plexus component metadata.">