natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added skipbuildwithoutivy feature + review behaviour when there is no ivy file 

git-svn-id: https://svn.apache.org/repos/asf/incubator/ivy/trunk@484024 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Xavier Hanin 2005-08-25 12:15:15 +00:00
parent ae5029fff8
commit 2c16b2578a
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/java/fr/jayasoft/ivy/ant/IvyBuildList.java
View File

@ -29,6 +29,7 @@ public class IvyBuildList extends IvyTask {
private List _buildFiles = new ArrayList(); // List (FileSet)
private String _reference;
private boolean _haltOnError = true;
private boolean _skipBuildWithoutIvy = false;
private String _ivyFilePath;
@ -67,17 +68,28 @@ public class IvyBuildList extends IvyTask {
for (int i = 0; i < builds.length; i++) {
File buildFile = new File(ds.getBasedir(), builds[i]);
File ivyFile = getIvyFileFor(buildFile);
try {
ModuleDescriptor md = XmlModuleDescriptorParser.parseDescriptor(getIvyInstance(), ivyFile.toURL(), isValidate());
buildFiles.put(md, buildFile);
mds.add(md);
} catch (Exception ex) {
if (_haltOnError) {
throw new BuildException("impossible to parse ivy file for "+buildFile+": ivyfile="+ivyFile+" exception="+ex.getMessage(), ex);
if (!ivyFile.exists()) {
if (_skipBuildWithoutIvy) {
Message.debug("skipping "+buildFile+": ivy file "+ivyFile+" doesn't exist");
} else {
Message.warn("impossible to parse ivy file for "+buildFile+": ivyfile="+ivyFile+" exception="+ex.getMessage());
Message.verbose("no ivy file for "+buildFile+": ivyfile="+ivyFile+": adding it at the beginning of the path");
Message.verbose("\t(set skipbuildwithoutivy to true if you don't want this file to be added to the path)");
independent.add(buildFile);
}
} else {
try {
ModuleDescriptor md = XmlModuleDescriptorParser.parseDescriptor(getIvyInstance(), ivyFile.toURL(), isValidate());
buildFiles.put(md, buildFile);
mds.add(md);
} catch (Exception ex) {
if (_haltOnError) {
throw new BuildException("impossible to parse ivy file for "+buildFile+": ivyfile="+ivyFile+" exception="+ex.getMessage(), ex);
} else {
Message.warn("impossible to parse ivy file for "+buildFile+": ivyfile="+ivyFile+" exception="+ex.getMessage());
Message.info("\t=> adding it at the beginning of the path");
independent.add(buildFile);
}
}
}
}
}
@ -127,4 +139,12 @@ public class IvyBuildList extends IvyTask {
_ivyFilePath = ivyFilePath;
}
public boolean isSkipbuildwithoutivy() {
return _skipBuildWithoutIvy;
}
public void setSkipbuildwithoutivy(boolean skipBuildFilesWithoutIvy) {
_skipBuildWithoutIvy = skipBuildFilesWithoutIvy;
}
}