diff options
Diffstat (limited to 'Tools/Source/GenBuild/org/tianocore/build')
| -rw-r--r-- | Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java | 3 | ||||
| -rw-r--r-- | Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java b/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java index 78cde75..af6590f 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java +++ b/Tools/Source/GenBuild/org/tianocore/build/global/DpFile.java @@ -15,6 +15,7 @@ package org.tianocore.build.global; import org.apache.tools.ant.types.DataType;
import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.BuildException;
import java.io.File;
import java.io.FileReader;
@@ -77,7 +78,7 @@ public class DpFile extends DataType { lineReader.close();
fileReader.close();
} catch (IOException e) {
- System.out.println (e.getMessage());
+ throw new BuildException(e.getMessage());
}
}
diff --git a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java index 6ad4d44..fa1fc23 100644 --- a/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java +++ b/Tools/Source/GenBuild/org/tianocore/build/toolchain/ConfigReader.java @@ -50,7 +50,7 @@ public class ConfigReader { @return String[][] The variables defined in the config file
- @throws EdkException
+ @throws GenBuildException
Config file's format is not valid
**/
public static synchronized String[][] parse(File configFile) throws GenBuildException {
@@ -78,7 +78,8 @@ public class ConfigReader { //
int index;
if ((index = str.indexOf('=')) <= 0) {
- throw new GenBuildException("ERROR Processing file [" + configFile.getAbsolutePath()
+ throw new GenBuildException("ERROR Processing file ["
+ + configFile.getAbsolutePath()
+ "] (line " + lines + ").\n");
}
@@ -88,9 +89,12 @@ public class ConfigReader { keyList.add(str.substring(0, index).trim());
valueList.add(str.substring(index + 1).trim());
}
- } catch (Exception e) {
- throw new GenBuildException("ERROR Processing file [" + configFile.getAbsolutePath()
- + "] (line " + lines + ").\n" + e.getMessage());
+ } catch (Exception ex) {
+ GenBuildException e = new GenBuildException("ERROR Processing file ["
+ + configFile.getAbsolutePath()
+ + "] (line " + lines + ").\n" + ex.getMessage());
+ e.setStackTrace(ex.getStackTrace());
+ throw e;
}
String[][] definitions = new String[2][keyList.size()];
|