deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

changed compileLibrary to accept output streams instead of message window

Browse source
This commit is contained in:
fros4943 2006-09-07 11:59:50 +00:00
parent ac57250e80
commit b06d4a9617
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteTypeDialog.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: ContikiMoteTypeDialog.java,v 1.10 2006/09/07 11:03:37 fros4943 Exp $ * $Id: ContikiMoteTypeDialog.java,v 1.11 2006/09/07 11:59:50 fros4943 Exp $
*/ */
package se.sics.cooja.contikimote; package se.sics.cooja.contikimote;
@ -950,7 +950,9 @@ public class ContikiMoteTypeDialog extends JDialog {
} }
compilationSucceded = ContikiMoteTypeDialog.compileLibrary(identifier, compilationSucceded = ContikiMoteTypeDialog.compileLibrary(identifier,
contikiDir, filesToCompile, taskOutput); contikiDir, filesToCompile,
taskOutput.getInputStream(MessageList.NORMAL),
taskOutput.getInputStream(MessageList.ERROR));
} }
}, "compilation thread"); }, "compilation thread");
compilationThread.start(); compilationThread.start();
@ -1156,12 +1158,15 @@ public class ContikiMoteTypeDialog extends JDialog {
* Contiki base directory * Contiki base directory
* @param sourceFiles * @param sourceFiles
* Source files and directories to include in compilation * Source files and directories to include in compilation
* @param appender * @param outputStream
* Component to append process output to (optional) * Output stream from compilation (optional)
* @param errorStream
* Error stream from compilation (optional)
* @return True if compilation succeded, false otherwise * @return True if compilation succeded, false otherwise
*/ */
public static boolean compileLibrary(String identifier, File contikiDir, public static boolean compileLibrary(String identifier, File contikiDir,
Vector<File> sourceFiles, final MessageList appender) { Vector<File> sourceFiles, final PrintStream outputStream,
final PrintStream errorStream) {
File libFile = new File(ContikiMoteType.tempOutputDirectory, File libFile = new File(ContikiMoteType.tempOutputDirectory,
identifier + ContikiMoteType.librarySuffix); identifier + ContikiMoteType.librarySuffix);
@ -1172,43 +1177,43 @@ public class ContikiMoteTypeDialog extends JDialog {
// Recheck that contiki path exists // Recheck that contiki path exists
if (!contikiDir.exists()) { if (!contikiDir.exists()) {
if (appender != null) if (errorStream != null)
appender.addMessage("Bad Contiki OS path", MessageList.ERROR); errorStream.println("Bad Contiki OS path");
logger.fatal("Contiki path does not exist"); logger.fatal("Contiki path does not exist");
return false; return false;
} }
if (!contikiDir.isDirectory()) { if (!contikiDir.isDirectory()) {
if (appender != null) if (errorStream != null)
appender.addMessage("Bad Contiki OS path", MessageList.ERROR); errorStream.println("Bad Contiki OS path");
logger.fatal("Contiki path is not a directory"); logger.fatal("Contiki path is not a directory");
return false; return false;
} }
if (libFile.exists()) { if (libFile.exists()) {
if (appender != null) if (errorStream != null)
appender.addMessage("Bad output filenames", MessageList.ERROR); errorStream.println("Bad output filenames");
logger.fatal("Could not overwrite already existing library"); logger.fatal("Could not overwrite already existing library");
return false; return false;
} }
if (CoreComm.hasLibraryFileBeenLoaded(libFile)) { if (CoreComm.hasLibraryFileBeenLoaded(libFile)) {
if (appender != null) if (errorStream != null)
appender.addMessage("Bad output filenames", MessageList.ERROR); errorStream.println("Bad output filenames");
logger logger
.fatal("A library has already been loaded with the same name before"); .fatal("A library has already been loaded with the same name before");
return false; return false;
} }
if (depFile.exists()) { if (depFile.exists()) {
if (appender != null) if (errorStream != null)
appender.addMessage("Bad output filenames", MessageList.ERROR); errorStream.println("Bad output filenames");
logger.fatal("Could not overwrite already existing dependency file"); logger.fatal("Could not overwrite already existing dependency file");
return false; return false;
} }
if (mapFile.exists()) { if (mapFile.exists()) {
if (appender != null) if (errorStream != null)
appender.addMessage("Bad output filenames", MessageList.ERROR); errorStream.println("Bad output filenames");
logger.fatal("Could not overwrite already existing map file"); logger.fatal("Could not overwrite already existing map file");
return false; return false;
} }
@ -1274,9 +1279,8 @@ public class ContikiMoteTypeDialog extends JDialog {
String readLine; String readLine;
try { try {
while ((readLine = input.readLine()) != null) { while ((readLine = input.readLine()) != null) {
if (appender != null && readLine != null) { if (outputStream != null && readLine != null)
appender.addMessage(readLine); outputStream.println(readLine);
}
} }
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error while reading from process"); logger.warn("Error while reading from process");
@ -1289,9 +1293,8 @@ public class ContikiMoteTypeDialog extends JDialog {
String readLine; String readLine;
try { try {
while ((readLine = err.readLine()) != null) { while ((readLine = err.readLine()) != null) {
if (appender != null && readLine != null) { if (errorStream != null && readLine != null)
appender.addMessage(readLine, MessageList.ERROR); errorStream.println(readLine);
}
} }
} catch (IOException e) { } catch (IOException e) {
logger.warn("Error while reading from process"); logger.warn("Error while reading from process");