Skip to content

Commit

Permalink
Fiji Build (MiniMaven): make sure to exclude clojure from building
Browse files Browse the repository at this point in the history
Clojure requires antrun to build, which we do not support in MiniMaven.

While at it, make sure that the current pom is not re-parsed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Jul 4, 2012
1 parent 147693c commit 20771be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 0 additions & 4 deletions Fakefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ SUBMODULE_TARGETS=\
jars/VectorString.jar \
plugins/TrakEM2_.jar \
plugins/mpicbg_.jar \
jars/clojure.jar \
plugins/ij-ImageIO_.jar \
jars/jacl.jar \
jars/batik.jar \
Expand Down Expand Up @@ -302,7 +301,6 @@ CLASSPATH(jars/imglib2-scripting.jar)=jars/ij.jar:jars/imglib2.jar:jars/imglib2-
jars/imglib2-scripting.jar <- modules/imglib/
CLASSPATH(jars/imglib2-ops.jar)=jars/imglib2.jar
jars/imglib2-ops.jar <- modules/imglib/
jars/clojure.jar <- modules/clojure/
plugins/loci_tools.jar <- modules/bio-formats/
CLASSPATH(plugins/loci_tools.jar)=jars/imglib2.jar
CLASSPATH(jars/VectorString.jar)=jars/ij.jar:jars/Jama.jar:$JAVA3D_JARS
Expand Down Expand Up @@ -529,7 +527,6 @@ precompile-submodules[] <- \
precompiled/TrakEM2_.jar \
precompiled/mpicbg_.jar \
precompiled/mpicbg.jar \
precompiled/clojure.jar \
precompiled/ij-ImageIO_.jar \
precompiled/jacl.jar \
precompiled/batik.jar \
Expand All @@ -545,7 +542,6 @@ precompile-submodules[] <- \
precompiled/jsch.jar \

precompiled/ij.jar <- jars/ij.jar
precompiled/clojure.jar <- jars/clojure.jar
precompiled/jacl.jar <- jars/jacl.jar
precompiled/batik.jar <- jars/batik.jar
precompiled/junit.jar <- jars/junit.jar
Expand Down
6 changes: 4 additions & 2 deletions src-plugins/fake/src/main/java/fiji/build/SubFake.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,17 @@ public POM getPOM() {
String ijDir = System.getProperty("ij.dir");
File submodules = new File(ijDir, "modules");
File srcPlugins = new File(ijDir, "src-plugins");
if (submodules.exists())
miniMaven.excludeFromMultiProjects(file.getParentFile());
if (submodules.exists()) {
miniMaven.excludeFromMultiProjects(new File(submodules, "clojure"));
miniMaven.addMultiProjectRoot(submodules);
}
if (srcPlugins.exists()) {
miniMaven.addMultiProjectRoot(srcPlugins);
File pom = new File(srcPlugins, "pom.xml");
if (pom.exists())
miniMaven.parse(pom);
}
miniMaven.excludeFromMultiProjects(file.getParentFile());
pom = miniMaven.parse(file);
if (!targetBasename.equals(pom.getArtifact()))
pom = pom.findPOM(new Coordinate(null, targetBasename, null), miniMaven.verbose, miniMaven.downloadAutomatically);
Expand Down

0 comments on commit 20771be

Please sign in to comment.